ims-volte-vowifi
/
strongswan
9
0
Fork 0
Code Pull Requests Releases Activity

accept PEM encoded keys in keyid scripts

This commit is contained in:
Martin Willi 2009-08-25 11:30:42 +02:00
parent 94dde8a0ab
commit 500aa2607f
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
scripts/key2keyid.c
View File

@ -30,7 +30,7 @@ int main(int argc, char *argv[])
chunk = chunk_create(buf, read); chunk = chunk_create(buf, read);
private = lib->creds->create(lib->creds, CRED_PRIVATE_KEY, KEY_RSA, private = lib->creds->create(lib->creds, CRED_PRIVATE_KEY, KEY_RSA,
BUILD_BLOB_ASN1_DER, chunk_clone(chunk), BUILD_BLOB_PEM, chunk_clone(chunk),
BUILD_END); BUILD_END);
if (private) if (private)
{ {
@ -54,12 +54,12 @@ int main(int argc, char *argv[])
} }
public = lib->creds->create(lib->creds, CRED_PUBLIC_KEY, KEY_ANY, public = lib->creds->create(lib->creds, CRED_PUBLIC_KEY, KEY_ANY,
BUILD_BLOB_ASN1_DER, chunk_clone(chunk), BUILD_BLOB_PEM, chunk_clone(chunk),
BUILD_END); BUILD_END);
if (!public) if (!public)
{ {
public = lib->creds->create(lib->creds, CRED_PUBLIC_KEY, KEY_RSA, public = lib->creds->create(lib->creds, CRED_PUBLIC_KEY, KEY_RSA,
BUILD_BLOB_ASN1_DER, chunk_clone(chunk), BUILD_BLOB_PEM, chunk_clone(chunk),
BUILD_END); BUILD_END);
} }
if (public) if (public)

6
scripts/keyid2sql.c
View File

@ -30,7 +30,7 @@ int main(int argc, char *argv[])
chunk = chunk_create(buf, read); chunk = chunk_create(buf, read);
private = lib->creds->create(lib->creds, CRED_PRIVATE_KEY, KEY_RSA, private = lib->creds->create(lib->creds, CRED_PRIVATE_KEY, KEY_RSA,
BUILD_BLOB_ASN1_DER, chunk_clone(chunk), BUILD_BLOB_PEM, chunk_clone(chunk),
BUILD_END); BUILD_END);
if (private) if (private)
{ {
@ -48,12 +48,12 @@ int main(int argc, char *argv[])
} }
public = lib->creds->create(lib->creds, CRED_PUBLIC_KEY, KEY_ANY, public = lib->creds->create(lib->creds, CRED_PUBLIC_KEY, KEY_ANY,
BUILD_BLOB_ASN1_DER, chunk_clone(chunk), BUILD_BLOB_PEM, chunk_clone(chunk),
BUILD_END); BUILD_END);
if (!public) if (!public)
{ {
public = lib->creds->create(lib->creds, CRED_PUBLIC_KEY, KEY_RSA, public = lib->creds->create(lib->creds, CRED_PUBLIC_KEY, KEY_RSA,
BUILD_BLOB_ASN1_DER, chunk_clone(chunk), BUILD_BLOB_PEM, chunk_clone(chunk),
BUILD_END); BUILD_END);
} }
if (public) if (public)