-elapsed is also useful when using gettimeofday

[openssl.git] / apps / speed.c

diff --git a/apps/speed.c b/apps/speed.c
index 05d2b3164dcbfb54ba0f13c1466ae923dad4c1bc..a8a375ff2d49302a7f09dbe92a745258cee09eaa 100644 (file)
--- a/apps/speed.c
+++ b/apps/speed.c
@@ -559,22 +559,22 @@ int MAIN(int argc, char **argv)
        static unsigned int test_curves[EC_NUM] = 
        {       
        /* Prime Curves */
-       EC_GROUP_SECG_PRIME_160R1,
-       EC_GROUP_NIST_PRIME_224,
-       EC_GROUP_NIST_PRIME_256,
-       EC_GROUP_NIST_PRIME_384,
-       EC_GROUP_NIST_PRIME_521,
+       NID_secp160r1,
+       NID_secp224r1,
+       NID_X9_62_prime256v1,
+       NID_secp384r1,
+       NID_secp521r1,
        /* Binary Curves */
-       EC_GROUP_NIST_CHAR2_K163,
-       EC_GROUP_NIST_CHAR2_K233,
-       EC_GROUP_NIST_CHAR2_K283,
-       EC_GROUP_NIST_CHAR2_K409,
-       EC_GROUP_NIST_CHAR2_K571,
-       EC_GROUP_NIST_CHAR2_B163,
-       EC_GROUP_NIST_CHAR2_B233,
-       EC_GROUP_NIST_CHAR2_B283,
-       EC_GROUP_NIST_CHAR2_B409,
-       EC_GROUP_NIST_CHAR2_B571
+       NID_sect163k1,
+       NID_sect233k1,
+       NID_sect283k1,
+       NID_sect409k1,
+       NID_sect571k1,
+       NID_sect163r2,
+       NID_sect233r1,
+       NID_sect283r1,
+       NID_sect409r1,
+       NID_sect571r1
        }; 
        static char * test_curves_names[EC_NUM] = 
        {
@@ -616,7 +616,7 @@ int MAIN(int argc, char **argv)
         EC_KEY *ecdh_a[EC_NUM], *ecdh_b[EC_NUM];
         unsigned char secret_a[MAX_ECDH_SIZE], secret_b[MAX_ECDH_SIZE];
         int secret_size_a, secret_size_b;
-        int ecdh_check = 0;
+        int ecdh_checks = 0;
         int secret_idx = 0;
         long ecdh_c[EC_NUM][2];
 #endif
@@ -1070,7 +1070,7 @@ int MAIN(int argc, char **argv)
 
                        BIO_printf(bio_err,"\n");
                        BIO_printf(bio_err,"Available options:\n");
-#ifdef TIMES
+#if defined(TIMES) || defined(USE_TOD)
                        BIO_printf(bio_err,"-elapsed        measure time in real time instead of CPU user time.\n");
 #endif
                        BIO_printf(bio_err,"-engine e       use engine e, possibly a hardware device.\n");
@@ -1937,7 +1937,7 @@ int MAIN(int argc, char **argv)
                                {
                                /* Perform ECDSA signature test */
                                EC_KEY_generate_key(ecdsa[j]);
-                               ret = ECDSA_sign(EVP_PKEY_ECDSA, buf, 20, ecdsasig, 
+                               ret = ECDSA_sign(0, buf, 20, ecdsasig, 
                                        &ecdsasiglen, ecdsa[j]);
                                if (ret == 0) 
                                        {
@@ -1953,9 +1953,12 @@ int MAIN(int argc, char **argv)
                                                ECDSA_SECONDS);
 
                                        Time_F(START);
-                                       for (count=0,run=1; COND(ecdsa_c[j][0]); count++) 
+                                       for (count=0,run=1; COND(ecdsa_c[j][0]);
+                                               count++) 
                                                {
-                                               ret=ECDSA_sign(EVP_PKEY_ECDSA, buf, 20, ecdsasig, &ecdsasiglen, ecdsa[j]);
+                                               ret=ECDSA_sign(0, buf, 20, 
+                                                       ecdsasig, &ecdsasiglen,
+                                                       ecdsa[j]);
                                                if (ret == 0) 
                                                        {
                                                        BIO_printf(bio_err, "ECDSA sign failure\n");
@@ -1974,7 +1977,8 @@ int MAIN(int argc, char **argv)
                                        }
 
                                /* Perform ECDSA verification test */
-                               ret=ECDSA_verify(EVP_PKEY_ECDSA, buf, 20, ecdsasig, ecdsasiglen, ecdsa[j]);
+                               ret=ECDSA_verify(0, buf, 20, ecdsasig, 
+                                       ecdsasiglen, ecdsa[j]);
                                if (ret != 1) 
                                        {
                                        BIO_printf(bio_err,"ECDSA verify failure.  No ECDSA verify will be done.\n");
@@ -2065,19 +2069,20 @@ int MAIN(int argc, char **argv)
                                                ecdh_a[j]->pub_key,
                                                ecdh_b[j]);
                                        if (secret_size_a != secret_size_b) 
-                                               ecdh_check = 0;
+                                               ecdh_checks = 0;
                                        else
-                                               ecdh_check = 1;
+                                               ecdh_checks = 1;
 
                                        for (secret_idx = 0; 
-                                           (secret_idx < secret_size_a) && (ecdh_check == 1);
+                                           (secret_idx < secret_size_a)
+                                               && (ecdh_checks == 1);
                                            secret_idx++)
                                                {
                                                if (secret_a[secret_idx] != secret_b[secret_idx])
-                                               ecdh_check = 0;
+                                               ecdh_checks = 0;
                                                }
 
-                                       if (ecdh_check == 0)
+                                       if (ecdh_checks == 0)
                                                {
                                                BIO_printf(bio_err,"ECDH computations don't match.\n");
                                                ERR_print_errors(bio_err);