projects / openssl.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Add 3072, 7680 and 15360 bit RSA tests to openssl speed
[openssl.git] / apps / speed.c
diff --git a/apps/speed.c b/apps/speed.c
index 885784ee1d2318c5d47ce620aef527a82cf829ae..b5b7d50b06cdf311ccf343a2053ddff2c18fd039 100644 (file)
--- a/apps/speed.c
+++ b/apps/speed.c
@@ -228,8 +228,8 @@ static int do_multi(int multi);
 
 #define ALGOR_NUM      30
 #define SIZE_NUM       5
-#define PRIME_NUM      2
-#define RSA_NUM                4
+#define PRIME_NUM      3
+#define RSA_NUM                7
 #define DSA_NUM                3
 
 #define EC_NUM       16
@@ -246,7 +246,7 @@ static const char *names[ALGOR_NUM]={
 static double results[ALGOR_NUM][SIZE_NUM];
 static int lengths[SIZE_NUM]={16,64,256,1024,8*1024};
 static const char *prime_names[PRIME_NUM]={
-  "prime trial division", "prime coprime" };
+  "prime trial division", "prime trial division retry", "prime coprime" };
 #ifndef OPENSSL_NO_RSA
 static double rsa_results[RSA_NUM][2];
 #endif
@@ -501,8 +501,9 @@ int MAIN(int argc, char **argv)
        double d=0.0;
        long c[ALGOR_NUM][SIZE_NUM];
 
-#define D_PRIME_TRIAL_DIVISION 0
-#define D_PRIME_COPRIME                        1
+#define D_PRIME_TRIAL_DIVISION                 0
+#define D_PRIME_TRIAL_DIVISION_RETRY   1
+#define D_PRIME_COPRIME                                        2
        long prime_c[PRIME_NUM];
 
 #define        R_DSA_512       0
@@ -511,7 +512,10 @@ int MAIN(int argc, char **argv)
 #define        R_RSA_512       0
 #define        R_RSA_1024      1
 #define        R_RSA_2048      2
-#define        R_RSA_4096      3
+#define        R_RSA_3072      3
+#define        R_RSA_4096      4
+#define        R_RSA_7680      5
+#define        R_RSA_15360     6
 
 #define R_EC_P160    0
 #define R_EC_P192    1 
@@ -533,12 +537,14 @@ int MAIN(int argc, char **argv)
 #ifndef OPENSSL_NO_RSA
        RSA *rsa_key[RSA_NUM];
        long rsa_c[RSA_NUM][2];
-       static unsigned int rsa_bits[RSA_NUM]={512,1024,2048,4096};
+       static unsigned int rsa_bits[RSA_NUM]={512,1024,2048,3072,4096,7680,15360};
        static unsigned char *rsa_data[RSA_NUM]=
-               {test512,test1024,test2048,test4096};
+               {test512,test1024,test2048,test3072,test4096,test7680,test15360};
        static int rsa_data_length[RSA_NUM]={
                sizeof(test512),sizeof(test1024),
-               sizeof(test2048),sizeof(test4096)};
+               sizeof(test2048),sizeof(test3072),
+               sizeof(test4096),sizeof(test7680),
+               sizeof(test15360)};
 #endif
 #ifndef OPENSSL_NO_DSA
        DSA *dsa_key[DSA_NUM];
@@ -699,6 +705,8 @@ int MAIN(int argc, char **argv)
        for (i=0; i<EC_NUM; i++)
                ecdh_doit[i]=0;
 #endif
+       for (i=0; i<PRIME_NUM; i++)
+               prime_doit[i]=0;
 
        
        j=0;
@@ -880,7 +888,10 @@ int MAIN(int argc, char **argv)
                else if (strcmp(*argv,"rsa512") == 0) rsa_doit[R_RSA_512]=2;
                else if (strcmp(*argv,"rsa1024") == 0) rsa_doit[R_RSA_1024]=2;
                else if (strcmp(*argv,"rsa2048") == 0) rsa_doit[R_RSA_2048]=2;
+               else if (strcmp(*argv,"rsa3072") == 0) rsa_doit[R_RSA_3072]=2;
                else if (strcmp(*argv,"rsa4096") == 0) rsa_doit[R_RSA_4096]=2;
+               else if (strcmp(*argv,"rsa7680") == 0) rsa_doit[R_RSA_7680]=2;
+               else if (strcmp(*argv,"rsa15360") == 0) rsa_doit[R_RSA_15360]=2;
                else
 #ifndef OPENSSL_NO_RC2
                     if (strcmp(*argv,"rc2-cbc") == 0) doit[D_CBC_RC2]=1;
@@ -950,7 +961,10 @@ int MAIN(int argc, char **argv)
                        rsa_doit[R_RSA_512]=1;
                        rsa_doit[R_RSA_1024]=1;
                        rsa_doit[R_RSA_2048]=1;
+                       rsa_doit[R_RSA_3072]=1;
                        rsa_doit[R_RSA_4096]=1;
+                       rsa_doit[R_RSA_7680]=1;
+                       rsa_doit[R_RSA_15360]=1;
                        }
                else
 #endif
@@ -1011,8 +1025,17 @@ int MAIN(int argc, char **argv)
                        }
                else
 #endif
-                        if (strcmp(*argv,"prime-trial-division") == 0) prime_doit[D_PRIME_TRIAL_DIVISION]=1;
-               else if (strcmp(*argv,"prime-coprime") == 0)            prime_doit[D_PRIME_COPRIME]=1;
+                        if (strcmp(*argv,"prime-trial-division") == 0)
+                       prime_doit[D_PRIME_TRIAL_DIVISION] = 1;
+               else if (strcmp(*argv,"prime-trial-division-retry") == 0)
+                       prime_doit[D_PRIME_TRIAL_DIVISION_RETRY] = 1;
+               else if (strcmp(*argv,"prime-coprime") == 0)
+                       prime_doit[D_PRIME_COPRIME] = 1;
+               else if (strcmp(*argv,"prime") == 0)
+                       {
+                       for (i=0; i < PRIME_NUM; i++)
+                               prime_doit[i]=1;
+                       }
                else
                        {
                        BIO_printf(bio_err,"Error: bad option or value\n");
@@ -1091,7 +1114,8 @@ int MAIN(int argc, char **argv)
                        BIO_printf(bio_err,"\n");
 
 #ifndef OPENSSL_NO_RSA
-                       BIO_printf(bio_err,"rsa512   rsa1024  rsa2048  rsa4096\n");
+                       BIO_printf(bio_err,"rsa512   rsa1024  rsa2048  rsa3072  rsa4096\n");
+                       BIO_printf(bio_err,"rsa7680  rsa15360\n");
 #endif
 
 #ifndef OPENSSL_NO_DSA
@@ -1350,6 +1374,7 @@ int MAIN(int argc, char **argv)
                }
                
        prime_c[D_PRIME_TRIAL_DIVISION]=count;
+       prime_c[D_PRIME_TRIAL_DIVISION_RETRY]=count;
        prime_c[D_PRIME_COPRIME]=count;
        
 #ifndef OPENSSL_NO_RSA
@@ -2031,7 +2056,7 @@ int MAIN(int argc, char **argv)
                        
                Time_F(START);
                for (count=0, run=1; COND(prime_c[D_PRIME_TRIAL_DIVISION]); count++)
-                       bn_probable_prime_dh(rnd, 1024, add, NULL, ctx);
+                       if (!bn_probable_prime_dh(rnd, 1024, add, NULL, ctx)) count--;
                
                d=Time_F(STOP);
                prime_print_result(D_PRIME_TRIAL_DIVISION, count, d);
@@ -2039,7 +2064,44 @@ int MAIN(int argc, char **argv)
                BN_CTX_free(ctx);
                BN_free(add);
                BN_free(rnd);
+               }
+       
+       if (prime_doit[D_PRIME_TRIAL_DIVISION_RETRY])
+               {
+               BIGNUM *rnd = BN_new();
+               BN_CTX *ctx = BN_CTX_new();
                
+               prime_print_message(prime_names[D_PRIME_TRIAL_DIVISION_RETRY],
+                                                       prime_c[D_PRIME_TRIAL_DIVISION_RETRY]);
+                       
+               Time_F(START);
+               for (count=0, run=1; COND(prime_c[D_PRIME_TRIAL_DIVISION_RETRY]); count++)
+                       if (!bn_probable_prime_dh_retry(rnd, 1024, ctx)) count--;
+               
+               d=Time_F(STOP);
+               prime_print_result(D_PRIME_TRIAL_DIVISION_RETRY, count, d);
+               
+               BN_CTX_free(ctx);
+               BN_free(rnd);
+               }
+       
+       if (prime_doit[D_PRIME_COPRIME])
+               {
+               BIGNUM *rnd = BN_new();
+               BN_CTX *ctx = BN_CTX_new();
+               
+               prime_print_message(prime_names[D_PRIME_COPRIME],
+                                                       prime_c[D_PRIME_COPRIME]);
+                       
+               Time_F(START);
+               for (count=0, run=1; COND(prime_c[D_PRIME_COPRIME]); count++)
+                       if (!bn_probable_prime_dh_coprime(rnd, 1024, ctx)) count--;
+               
+               d=Time_F(STOP);
+               prime_print_result(D_PRIME_COPRIME, count, d);
+               
+               BN_CTX_free(ctx);
+               BN_free(rnd);
                }
 
        RAND_pseudo_bytes(buf,36);
@@ -2677,9 +2739,9 @@ static void print_result(int alg,int run_no,int count,double time_used)
 static void prime_print_result(int alg, int count, double time_used)
        {
        BIO_printf(bio_err,
-                          mr ? "+R:%d:%s:%f:%f\n" : "%d %s's in %.2fs (%.2fms/run)\n",
+                          mr ? "+R:%d:%s:%f:%f\n" : "%d %s's in %.2fs (%.2f microseconds / run)\n",
                           count, prime_names[alg], time_used,
-                          time_used / ((double)count) * 1000);
+                          time_used / ((double)count) * 1000000);
        }
 
 #ifndef NO_FORK
Unnamed repository; edit this file 'description' to name the repository.