[svn-upgrade] Integrating new upstream version, strongswan (4.3.6)

1 files changed, 18 insertions, 25 deletions

diff --git a/scripts/pubkey_speed.c b/scripts/pubkey_speed.c
index 86a4e105b..255f650f5 100644
--- a/scripts/pubkey_speed.c
+++ b/scripts/pubkey_speed.c
@@ -4,7 +4,6 @@
 #include <library.h>
 #include <debug.h>
 #include <credentials/keys/private_key.h>
-#include <asn1/pem.h>
 
 void start_timing(struct timespec *start)
 {
@@ -14,7 +13,7 @@ void start_timing(struct timespec *start)
 double end_timing(struct timespec *start)
 {
 	struct timespec end;
-	
+
 	clock_gettime(CLOCK_THREAD_CPUTIME_ID, &end);
 	return (end.tv_nsec - start->tv_nsec) / 1000000000.0 +
 			(end.tv_sec - start->tv_sec) * 1.0;
@@ -26,8 +25,6 @@ static void usage()
 	exit(1);
 }
 
-static char data_buf[] = {0x01,0x02,0x03,0x04,0x05,0x06,0x07};
-
 int main(int argc, char *argv[])
 {
 	private_key_t *private;
@@ -37,15 +34,15 @@ int main(int argc, char *argv[])
 	char buf[8096], *pos = buf;
 	key_type_t type = KEY_ANY;
 	signature_scheme_t scheme = SIGN_UNKNOWN;
-	chunk_t keydata, *sigs, data = chunk_from_buf(data_buf);
-	
+	chunk_t keydata, *sigs, data;
+
 	if (argc < 4)
 	{
 		usage();
 	}
-	
+
 	rounds = atoi(argv[3]);
-	
+
 	if (streq(argv[2], "rsa"))
 	{
 		type = KEY_RSA;
@@ -59,25 +56,20 @@ int main(int argc, char *argv[])
 	{
 		usage();
 	}
-	
-	library_init(STRONGSWAN_CONF);
-	lib->plugins->load(lib->plugins, IPSEC_PLUGINDIR, argv[1]);
+
+	library_init(NULL);
+	lib->plugins->load(lib->plugins, NULL, argv[1]);
 	atexit(library_deinit);
-	
+
 	keydata = chunk_create(buf, 0);
 	while ((read = fread(pos, 1, sizeof(buf) - (pos - buf), stdin)))
 	{
 		pos += read;
 		keydata.len += read;
 	}
-	if (pem_to_bin(&keydata, chunk_empty, NULL) != SUCCESS)
-	{
-		printf("converting PEM private key failed.\n");
-		exit(1);
-	}
-	
+
 	private = lib->creds->create(lib->creds, CRED_PRIVATE_KEY, type,
-								 BUILD_BLOB_ASN1_DER, keydata, BUILD_END);
+								 BUILD_BLOB_PEM, keydata, BUILD_END);
 	if (!private)
 	{
 		printf("parsing private key failed.\n");
@@ -88,7 +80,7 @@ int main(int argc, char *argv[])
 		switch (private->get_keysize(private))
 		{
 			case 32:
-				scheme = SIGN_ECDSA_256; 
+				scheme = SIGN_ECDSA_256;
 				break;
 			case 48:
 				scheme = SIGN_ECDSA_384;
@@ -102,12 +94,13 @@ int main(int argc, char *argv[])
 				exit(1);
 		}
 	}
-	
+
 	printf("%4d bit %N: ", private->get_keysize(private)*8,
 		key_type_names, type);
-	
+
 	sigs = malloc(sizeof(chunk_t) * rounds);
-	
+
+	data = chunk_from_chars(0x01,0x02,0x03,0x04,0x05,0x06,0x07);
 	start_timing(&timing);
 	for (round = 0; round < rounds; round++)
 	{
@@ -118,7 +111,7 @@ int main(int argc, char *argv[])
 		}
 	};
 	printf("sign()/s: %8.1f   ", rounds / end_timing(&timing));
-	
+
 	public = private->get_public_key(private);
 	if (!public)
 	{
@@ -137,7 +130,7 @@ int main(int argc, char *argv[])
 	printf("verify()/s: %8.1f\n", rounds / end_timing(&timing));
 	public->destroy(public);
 	private->destroy(private);
-	
+
 	for (round = 0; round < rounds; round++)
 	{
 		free(sigs[round].ptr);