X-Git-Url: https://git.strongswan.org/?p=strongswan.git;a=blobdiff_plain;f=scripts%2Fkeyid2sql.c;h=bf952170d6e7fc4f8cfafd22294dcabf1b338205;hp=094e1afed9057243b7f0f72bc3ce6ef8c6c36753;hb=8ab900dee9b6731144b2e05ac05f942cf79a9039;hpb=94dde8a0ab2ff82cfd8e61e3fac5a9a69cabdace

diff --git a/scripts/keyid2sql.c b/scripts/keyid2sql.c
index 094e1af..bf95217 100644
--- a/scripts/keyid2sql.c
+++ b/scripts/keyid2sql.c
@@ -15,9 +15,9 @@ int main(int argc, char *argv[])
 	chunk_t chunk;
 	char buf[8096];
 	int read, n;
-	
+
 	library_init(NULL);
-	lib->plugins->load(lib->plugins, IPSEC_PLUGINDIR, "gmp pubkey sha1");
+	lib->plugins->load(lib->plugins, IPSEC_PLUGINDIR, PLUGINS);
 	atexit(library_deinit);
 
 	read = fread(buf, 1, sizeof(buf), stdin);
@@ -26,11 +26,11 @@ int main(int argc, char *argv[])
 		fprintf(stderr, "reading key failed.\n");
 		return -1;
 	}
-	
+
 	chunk = chunk_create(buf, read);
-	
+
 	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);
 	if (private)
 	{
@@ -46,14 +46,14 @@ int main(int argc, char *argv[])
 		private->destroy(private);
 		return 0;
 	}
-	
+
 	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);
 	if (!public)
 	{
 		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);
 	}
 	if (public)
@@ -70,7 +70,7 @@ int main(int argc, char *argv[])
 		public->destroy(public);
 		return 0;
 	}
-	
+
 	fprintf(stderr, "unable to parse input key.\n");
 	return -1;
 }