updated pubkey_speed test to use pem plugin
authorMartin Willi <martin@strongswan.org>
Thu, 13 Aug 2009 13:39:29 +0000 (15:39 +0200)
committerMartin Willi <martin@strongswan.org>
Wed, 26 Aug 2009 09:23:49 +0000 (11:23 +0200)
scripts/pubkey_speed.c
scripts/pubkey_speed.sh

index 86a4e10..120ca85 100644 (file)
@@ -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)
 {
@@ -70,14 +69,9 @@ int main(int argc, char *argv[])
                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");
index cbdfde5..3076774 100755 (executable)
@@ -30,7 +30,7 @@ function ecdsatestall {
   ecdsatest secp521r1 "$1" 500 
 }
 
-rsatestall "gmp gcrypt"
-rsatestall "gcrypt"
+rsatestall "gmp gcrypt pem"
+rsatestall "gcrypt pem"
 rsatestall "openssl"
 ecdsatestall "openssl"