generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Run the prime speed tests for 10 seconds.

Browse Source
This commit is contained in:
Felix Laurie von Massenbach 2014-05-27 00:33:42 +01:00 committed by Ben Laurie
parent 8c9336ce2b
commit b359642ffd
1 changed files with 27 additions and 21 deletions

48
apps/speed.c

@ -74,9 +74,10 @@
#ifndef OPENSSL_NO_SPEED #ifndef OPENSSL_NO_SPEED
#undef SECONDS #undef SECONDS
#define SECONDS 3 #define SECONDS 3
#define RSA_SECONDS 10 #define PRIME_SECONDS 10
#define DSA_SECONDS 10 #define RSA_SECONDS 10
#define DSA_SECONDS 10
#define ECDSA_SECONDS 10 #define ECDSA_SECONDS 10
#define ECDH_SECONDS 10 #define ECDH_SECONDS 10
@ -220,6 +221,7 @@ static void prime_print_message(const char *s, long num);
static void pkey_print_message(const char *str, const char *str2, static void pkey_print_message(const char *str, const char *str2,
long num, int bits, int sec); long num, int bits, int sec);
static void print_result(int alg,int run_no,int count,double time_used); 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 #ifndef NO_FORK
static int do_multi(int multi); static int do_multi(int multi);
#endif #endif
@ -2016,32 +2018,28 @@ int MAIN(int argc, char **argv)
print_result(D_EVP,j,count,d); 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 *rnd = BN_new();
BIGNUM *add = BN_new(); BIGNUM *add = BN_new();
BN_CTX *ctx = BN_CTX_new(); BN_CTX *ctx = BN_CTX_new();
if(prime_doit[j]) BN_set_word(add, 2);
{ prime_print_message(prime_names[D_PRIME_TRIAL_DIVISION],
BN_set_word(add, 2); 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++)
Time_F(START); bn_probable_prime_dh(rnd, 1024, add, NULL, ctx);
for (count=0, run=1; COND(prime_c[j]); count++)
bn_probable_prime_dh(rnd, 1024, add, NULL, ctx); d=Time_F(STOP);
prime_print_result(D_PRIME_TRIAL_DIVISION, count, d);
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);
}
BN_CTX_free(ctx); BN_CTX_free(ctx);
BN_free(add); BN_free(add);
BN_free(rnd); BN_free(rnd);
} }
RAND_pseudo_bytes(buf,36); RAND_pseudo_bytes(buf,36);
@ -2638,9 +2636,9 @@ static void prime_print_message(const char *s, long num)
{ {
#ifdef SIGALRM #ifdef SIGALRM
BIO_printf(bio_err,mr ? "+DT:%s:%d\n" 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); (void)BIO_flush(bio_err);
alarm(SECONDS); alarm(PRIME_SECONDS);
#else #else
BIO_printf(bio_err,mr ? "+DN:%s:%ld\n" BIO_printf(bio_err,mr ? "+DN:%s:%ld\n"
: "Doing %s %ld times: ", s, num); : "Doing %s %ld times: ", s, num);
@ -2676,6 +2674,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]; 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 (%.2fms/run)\n",
count, prime_names[alg], time_used,
time_used / ((double)count) * 1000);
}
#ifndef NO_FORK #ifndef NO_FORK
static char *sstrsep(char **string, const char *delim) static char *sstrsep(char **string, const char *delim)
{ {