projects / openssl.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
smime man page: add missing options in SYNOPSIS
[openssl.git] / apps / speed.c
diff --git a/apps/speed.c b/apps/speed.c
index 5af95dfc0cb3094408256420cf97d5abb291b309..619269bc694644e1259486a6347cf45c8124cdad 100644 (file)
--- a/apps/speed.c
+++ b/apps/speed.c
@@ -74,9 +74,10 @@
 #ifndef OPENSSL_NO_SPEED
 
 #undef SECONDS
-#define SECONDS                3       
-#define RSA_SECONDS    10
-#define DSA_SECONDS    10
+#define SECONDS                        3       
+#define PRIME_SECONDS  10      
+#define RSA_SECONDS            10
+#define DSA_SECONDS            10
 #define ECDSA_SECONDS   10
 #define ECDH_SECONDS    10
 
@@ -220,13 +221,14 @@ static void prime_print_message(const char *s, long num);
 static void pkey_print_message(const char *str, const char *str2,
        long num, int bits, int sec);
 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);
 #ifndef NO_FORK
 static int do_multi(int multi);
 #endif
 
 #define ALGOR_NUM      30
 #define SIZE_NUM       5
-#define PRIME_NUM      2
+#define PRIME_NUM      3
 #define RSA_NUM                4
 #define DSA_NUM                3
 
@@ -244,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
@@ -499,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
@@ -697,6 +700,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;
@@ -1009,8 +1014,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");
@@ -1348,6 +1362,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
@@ -2016,31 +2031,64 @@ int MAIN(int argc, char **argv)
                        print_result(D_EVP,j,count,d);
                        }
                }
-               
-       for (j=0; j<PRIME_NUM; j++)
+       
+       if (prime_doit[D_PRIME_TRIAL_DIVISION])
                {
                BIGNUM *rnd = BN_new();
                BIGNUM *add = BN_new();
                BN_CTX *ctx = BN_CTX_new();
                
-               if(prime_doit[j])
-                       {
-                       BN_set_word(add, 2);
+               BN_set_word(add, 2);
+               prime_print_message(prime_names[D_PRIME_TRIAL_DIVISION],
+                                                       prime_c[D_PRIME_TRIAL_DIVISION]);
                        
-                       prime_print_message(prime_names[j], prime_c[j]);
+               Time_F(START);
+               for (count=0, run=1; COND(prime_c[D_PRIME_TRIAL_DIVISION]); count++)
+                       if (!bn_probable_prime_dh(rnd, 1024, add, NULL, ctx)) count--;
+               
+               d=Time_F(STOP);
+               prime_print_result(D_PRIME_TRIAL_DIVISION, count, d);
+               
+               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[j]); count++)
-                               bn_probable_prime_dh(rnd, 1024, add, NULL, ctx);
+               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]);
                        
-                       d=Time_F(STOP);
-                       BIO_printf(bio_err,
-                                          mr ? "+R:%ld:%s:%f\n" : "%ld %s's in %.2fs\n",
-                                          count, prime_names[j], d);
-                       }
+               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(add);
                BN_free(rnd);
                }
 
@@ -2638,9 +2686,9 @@ static void prime_print_message(const char *s, long num)
        {
 #ifdef SIGALRM
        BIO_printf(bio_err,mr ? "+DT:%s:%d\n"
-                  : "Doing %s for %ds: ", s, SECONDS);
+                  : "Doing %s for %ds: ", s, PRIME_SECONDS);
        (void)BIO_flush(bio_err);
-       alarm(SECONDS);
+       alarm(PRIME_SECONDS);
 #else
        BIO_printf(bio_err,mr ? "+DN:%s:%ld\n"
                   : "Doing %s %ld times: ", s, num);
@@ -2676,6 +2724,14 @@ static void print_result(int alg,int run_no,int count,double time_used)
        results[alg][run_no]=((double)count)/time_used*lengths[run_no];
        }
 
+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 (%.2f microseconds / run)\n",
+                          count, prime_names[alg], time_used,
+                          time_used / ((double)count) * 1000000);
+       }
+
 #ifndef NO_FORK
 static char *sstrsep(char **string, const char *delim)
     {
Unnamed repository; edit this file 'description' to name the repository.