X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=blobdiff_plain;f=apps%2Fspeed.c;h=5a882041fedb3722468c23f9b25c07520c4d2a49;hp=2024c38c5ef1efd7942665d2698ed90f3aecea87;hb=f559f31bef538a29a0feab25fecd65ab3460adf6;hpb=7876e4488ffee77940ead9f4e88e5293d63f8dcc diff --git a/apps/speed.c b/apps/speed.c index 2024c38c5e..5a882041fe 100644 --- a/apps/speed.c +++ b/apps/speed.c @@ -83,6 +83,9 @@ #include #include #include +#if !defined(OPENSSL_SYS_MSDOS) +#include OPENSSL_UNISTD +#endif #if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(OPENSSL_SYS_MACOSX) # define USE_TOD @@ -128,7 +131,7 @@ #endif #ifndef OPENSSL_NO_DES -#include +#include #endif #ifndef OPENSSL_NO_MD2 #include @@ -181,31 +184,40 @@ /* The following if from times(3) man page. It may need to be changed */ #ifndef HZ -# ifndef CLK_TCK -# ifndef _BSD_CLK_TCK_ /* FreeBSD hack */ -# define HZ 100.0 -# else /* _BSD_CLK_TCK_ */ -# define HZ ((double)_BSD_CLK_TCK_) -# endif -# else /* CLK_TCK */ -# ifdef OPENSSL_SYS_LINUX /* Because it seems like some Linuxen - have weird values here... */ -# define HZ 100.0 -# else +# ifdef _SC_CLK_TCK +# define HZ ((double)sysconf(_SC_CLK_TCK)) +# else +# ifndef CLK_TCK +# ifndef _BSD_CLK_TCK_ /* FreeBSD hack */ +# define HZ 100.0 +# else /* _BSD_CLK_TCK_ */ +# define HZ ((double)_BSD_CLK_TCK_) +# endif +# else /* CLK_TCK */ # define HZ ((double)CLK_TCK) # endif # endif #endif +#if !defined(OPENSSL_SYS_VMS) && !defined(OPENSSL_SYS_WINDOWS) && !defined(OPENSSL_SYS_MACINTOSH_CLASSIC) && !defined(OPENSSL_SYS_OS2) +# define HAVE_FORK 1 +#endif + #undef BUFSIZE #define BUFSIZE ((long)1024*8+1) int run=0; static char ftime_used = 0, times_used = 0, gettimeofday_used = 0, getrusage_used = 0; +static int mr=0; +static int usertime=1; -static double Time_F(int s, int usertime); +static double Time_F(int s); static void print_message(const char *s,long num,int length); static void pkey_print_message(char *str,char *str2,long num,int bits,int sec); +static void print_result(int alg,int run_no,int count,double time_used); +#ifdef HAVE_FORK +static int do_multi(int multi); +#endif #ifdef SIGALRM #if defined(__STDC__) || defined(sgi) || defined(_AIX) #define SIGRETTYPE void @@ -213,6 +225,19 @@ static void pkey_print_message(char *str,char *str2,long num,int bits,int sec); #define SIGRETTYPE int #endif +#define ALGOR_NUM 16 +#define SIZE_NUM 5 +#define RSA_NUM 4 +#define DSA_NUM 3 +static const char *names[ALGOR_NUM]={ + "md2","mdc2","md4","md5","hmac(md5)","sha1","rmd160","rc4", + "des cbc","des ede3","idea cbc", + "rc2 cbc","rc5-32/12 cbc","blowfish cbc","cast cbc"}; +static double results[ALGOR_NUM][SIZE_NUM]; +static int lengths[SIZE_NUM]={8,64,256,1024,8*1024}; +static double rsa_results[RSA_NUM][2]; +static double dsa_results[DSA_NUM][2]; + static SIGRETTYPE sig_done(int sig); static SIGRETTYPE sig_done(int sig) { @@ -227,7 +252,7 @@ static SIGRETTYPE sig_done(int sig) #define START 0 #define STOP 1 -static double Time_F(int s, int usertime) +static double Time_F(int s) { double ret; @@ -326,10 +351,6 @@ int MAIN(int argc, char **argv) ENGINE *e; unsigned char *buf=NULL,*buf2=NULL; int mret=1; -#define ALGOR_NUM 16 -#define SIZE_NUM 5 -#define RSA_NUM 4 -#define DSA_NUM 3 long count,rsa_count,save_count=0; int i,j,k; #ifndef OPENSSL_NO_RSA @@ -377,11 +398,13 @@ int MAIN(int argc, char **argv) 0x34,0x56,0x78,0x9a,0xbc,0xde,0xf0,0x12}; unsigned char iv[8]; #ifndef OPENSSL_NO_DES - des_cblock *buf_as_des_cblock = NULL; + DES_cblock *buf_as_des_cblock = NULL; static des_cblock key ={0x12,0x34,0x56,0x78,0x9a,0xbc,0xde,0xf0}; static des_cblock key2={0x34,0x56,0x78,0x9a,0xbc,0xde,0xf0,0x12}; static des_cblock key3={0x56,0x78,0x9a,0xbc,0xde,0xf0,0x12,0x34}; - des_key_schedule sch,sch2,sch3; + DES_key_schedule sch; + DES_key_schedule sch2; + DES_key_schedule sch3; #endif #define D_MD2 0 #define D_MDC2 1 @@ -399,13 +422,8 @@ int MAIN(int argc, char **argv) #define D_CBC_BF 13 #define D_CBC_CAST 14 #define D_EVP 15 - double d,results[ALGOR_NUM][SIZE_NUM]; - static int lengths[SIZE_NUM]={8,64,256,1024,8*1024}; + double d; long c[ALGOR_NUM][SIZE_NUM]; - static const char *names[ALGOR_NUM]={ - "md2","mdc2","md4","md5","hmac(md5)","sha1","rmd160","rc4", - "des cbc","des ede3","idea cbc", - "rc2 cbc","rc5-32/12 cbc","blowfish cbc","cast cbc"}; #define R_DSA_512 0 #define R_DSA_1024 1 #define R_DSA_2048 2 @@ -416,7 +434,6 @@ int MAIN(int argc, char **argv) #ifndef OPENSSL_NO_RSA RSA *rsa_key[RSA_NUM]; long rsa_c[RSA_NUM][2]; - double rsa_results[RSA_NUM][2]; static unsigned int rsa_bits[RSA_NUM]={512,1024,2048,4096}; static unsigned char *rsa_data[RSA_NUM]= {test512,test1024,test2048,test4096}; @@ -427,16 +444,17 @@ int MAIN(int argc, char **argv) #ifndef OPENSSL_NO_DSA DSA *dsa_key[DSA_NUM]; long dsa_c[DSA_NUM][2]; - double dsa_results[DSA_NUM][2]; static unsigned int dsa_bits[DSA_NUM]={512,1024,2048}; #endif int rsa_doit[RSA_NUM]; int dsa_doit[DSA_NUM]; int doit[ALGOR_NUM]; int pr_header=0; - int usertime=1; const EVP_CIPHER *evp=NULL; int decrypt=0; +#ifdef HAVE_FORK + int multi=0; +#endif #ifndef TIMES usertime=-1; @@ -532,6 +550,32 @@ int MAIN(int argc, char **argv) means all of them should be run) */ j--; } +#ifdef HAVE_FORK + else if ((argc > 0) && (strcmp(*argv,"-multi") == 0)) + { + argc--; + argv++; + if(argc == 0) + { + BIO_printf(bio_err,"no multi count given\n"); + goto end; + } + multi=atoi(argv[0]); + if(multi <= 0) + { + BIO_printf(bio_err,"bad multi count\n"); + goto end; + } + j--; /* Otherwise, -mr gets confused with + an algorithm. */ + } +#endif + else if (argc > 0 && !strcmp(*argv,"-mr")) + { + mr=1; + j--; /* Otherwise, -mr gets confused with + an algorithm. */ + } else #ifndef OPENSSL_NO_MD2 if (strcmp(*argv,"md2") == 0) doit[D_MD2]=1; @@ -744,6 +788,12 @@ int MAIN(int argc, char **argv) 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"); + BIO_printf(bio_err,"-evp e use EVP e.\n"); + BIO_printf(bio_err,"-decrypt time decryption instead of encryption (only EVP).\n"); + BIO_printf(bio_err,"-mr produce machine readable output.\n"); +#ifdef HAVE_FORK + BIO_printf(bio_err,"-multi n run n benchmarks in parallel.\n"); +#endif goto end; } argc--; @@ -751,6 +801,11 @@ int MAIN(int argc, char **argv) j++; } +#ifdef HAVE_FORK + if(multi && do_multi(multi)) + goto show_res; +#endif + if (j == 0) { for (i=0; in)); + BIO_printf(bio_err,mr ? "+RK:%d:" + : "Loaded RSA key, %d bit modulus and e= 0x", + BN_num_bits(rsa_key[i]->n)); BN_print(bio_err,rsa_key[i]->e); BIO_printf(bio_err,"\n"); } @@ -804,9 +861,9 @@ int MAIN(int argc, char **argv) #endif #ifndef OPENSSL_NO_DES - des_set_key_unchecked(&key,&sch); - des_set_key_unchecked(&key2,&sch2); - des_set_key_unchecked(&key3,&sch3); + DES_set_key_unchecked(&key,&sch); + DES_set_key_unchecked(&key2,&sch2); + DES_set_key_unchecked(&key3,&sch3); #endif #ifndef OPENSSL_NO_IDEA idea_set_encrypt_key(key16,&idea_ks); @@ -839,8 +896,8 @@ int MAIN(int argc, char **argv) Time_F(START,usertime); for (i=count; i; i--) des_ecb_encrypt(buf_as_des_cblock,buf_as_des_cblock, - &(sch[0]),DES_ENCRYPT); - d=Time_F(STOP,usertime); + &sch,DES_ENCRYPT); + d=Time_F(STOP); } while (d <3); save_count=count; c[D_MD2][0]=count/10; @@ -942,13 +999,11 @@ int MAIN(int argc, char **argv) for (j=0; jnid); print_message(names[D_EVP],save_count, lengths[j]); + EVP_CIPHER_CTX_init(&ctx); if(decrypt) - EVP_DecryptInit(&ctx,evp,key16,iv); + EVP_DecryptInit_ex(&ctx,evp,NULL,key16,iv); else - EVP_EncryptInit(&ctx,evp,key16,iv); + EVP_EncryptInit_ex(&ctx,evp,NULL,key16,iv); - Time_F(START,usertime); + Time_F(START); if(decrypt) for (count=0,run=1; COND(save_count*4*lengths[0]/lengths[j]); count++) EVP_DecryptUpdate(&ctx,buf,&outl,buf,lengths[j]); @@ -1227,13 +1255,11 @@ int MAIN(int argc, char **argv) for (count=0,run=1; COND(save_count*4*lengths[0]/lengths[j]); count++) EVP_EncryptUpdate(&ctx,buf,&outl,buf,lengths[j]); if(decrypt) - EVP_DecryptFinal(&ctx,buf,&outl); + EVP_DecryptFinal_ex(&ctx,buf,&outl); else - EVP_EncryptFinal(&ctx,buf,&outl); - d=Time_F(STOP,usertime); - BIO_printf(bio_err,"%ld %s's in %.2fs\n", - count,names[D_EVP],d); - results[D_EVP][j]=((double)count)/d*lengths[j]; + EVP_EncryptFinal_ex(&ctx,buf,&outl); + d=Time_F(STOP); + print_result(D_EVP,j,count,d); } } @@ -1256,7 +1282,7 @@ int MAIN(int argc, char **argv) rsa_c[j][0],rsa_bits[j], RSA_SECONDS); /* RSA_blinding_on(rsa_key[j],NULL); */ - Time_F(START,usertime); + Time_F(START); for (count=0,run=1; COND(rsa_c[j][0]); count++) { ret=RSA_sign(NID_md5_sha1, buf,36, buf2, @@ -1270,10 +1296,10 @@ int MAIN(int argc, char **argv) break; } } - d=Time_F(STOP,usertime); - BIO_printf(bio_err, - "%ld %d bit private RSA's in %.2fs\n", - count,rsa_bits[j],d); + d=Time_F(STOP); + BIO_printf(bio_err,mr ? "+R1:%ld:%d:%.2f\n" + : "%ld %d bit private RSA's in %.2fs\n", + count,rsa_bits[j],d); rsa_results[j][0]=d/(double)count; rsa_count=count; } @@ -1291,7 +1317,7 @@ int MAIN(int argc, char **argv) pkey_print_message("public","rsa", rsa_c[j][1],rsa_bits[j], RSA_SECONDS); - Time_F(START,usertime); + Time_F(START); for (count=0,run=1; COND(rsa_c[j][1]); count++) { ret=RSA_verify(NID_md5_sha1, buf,36, buf2, @@ -1305,10 +1331,10 @@ int MAIN(int argc, char **argv) break; } } - d=Time_F(STOP,usertime); - BIO_printf(bio_err, - "%ld %d bit public RSA's in %.2fs\n", - count,rsa_bits[j],d); + d=Time_F(STOP); + BIO_printf(bio_err,mr ? "+R2:%ld:%d:%.2f\n" + : "%ld %d bit public RSA's in %.2fs\n", + count,rsa_bits[j],d); rsa_results[j][1]=d/(double)count; } #endif @@ -1350,7 +1376,7 @@ int MAIN(int argc, char **argv) pkey_print_message("sign","dsa", dsa_c[j][0],dsa_bits[j], DSA_SECONDS); - Time_F(START,usertime); + Time_F(START); for (count=0,run=1; COND(dsa_c[j][0]); count++) { ret=DSA_sign(EVP_PKEY_DSA,buf,20,buf2, @@ -1364,9 +1390,10 @@ int MAIN(int argc, char **argv) break; } } - d=Time_F(STOP,usertime); - BIO_printf(bio_err,"%ld %d bit DSA signs in %.2fs\n", - count,dsa_bits[j],d); + d=Time_F(STOP); + BIO_printf(bio_err,mr ? "+R3:%ld:%d:%.2f\n" + : "%ld %d bit DSA signs in %.2fs\n", + count,dsa_bits[j],d); dsa_results[j][0]=d/(double)count; rsa_count=count; } @@ -1384,7 +1411,7 @@ int MAIN(int argc, char **argv) pkey_print_message("verify","dsa", dsa_c[j][1],dsa_bits[j], DSA_SECONDS); - Time_F(START,usertime); + Time_F(START); for (count=0,run=1; COND(dsa_c[j][1]); count++) { ret=DSA_verify(EVP_PKEY_DSA,buf,20,buf2, @@ -1398,9 +1425,10 @@ int MAIN(int argc, char **argv) break; } } - d=Time_F(STOP,usertime); - BIO_printf(bio_err,"%ld %d bit DSA verify in %.2fs\n", - count,dsa_bits[j],d); + d=Time_F(STOP); + BIO_printf(bio_err,mr ? "+R4:%ld:%d:%.2f\n" + : "%ld %d bit DSA verify in %.2fs\n", + count,dsa_bits[j],d); dsa_results[j][1]=d/(double)count; } @@ -1413,71 +1441,84 @@ int MAIN(int argc, char **argv) } if (rnd_fake) RAND_cleanup(); #endif - - fprintf(stdout,"%s\n",SSLeay_version(SSLEAY_VERSION)); +show_res: + if(!mr) + { + fprintf(stdout,"%s\n",SSLeay_version(SSLEAY_VERSION)); fprintf(stdout,"%s\n",SSLeay_version(SSLEAY_BUILT_ON)); - printf("options:"); - printf("%s ",BN_options()); + printf("options:"); + printf("%s ",BN_options()); #ifndef OPENSSL_NO_MD2 - printf("%s ",MD2_options()); + printf("%s ",MD2_options()); #endif #ifndef OPENSSL_NO_RC4 - printf("%s ",RC4_options()); + printf("%s ",RC4_options()); #endif #ifndef OPENSSL_NO_DES - printf("%s ",des_options()); + printf("%s ",des_options()); #endif #ifndef OPENSSL_NO_IDEA - printf("%s ",idea_options()); + printf("%s ",idea_options()); #endif #ifndef OPENSSL_NO_BF - printf("%s ",BF_options()); + printf("%s ",BF_options()); #endif - fprintf(stdout,"\n%s\n",SSLeay_version(SSLEAY_CFLAGS)); - printf("available timing options: "); + fprintf(stdout,"\n%s\n",SSLeay_version(SSLEAY_CFLAGS)); + printf("available timing options: "); #ifdef TIMES - printf("TIMES "); + printf("TIMES "); #endif #ifdef TIMEB - printf("TIMEB "); + printf("TIMEB "); #endif #ifdef USE_TOD - printf("USE_TOD "); + printf("USE_TOD "); #endif #ifdef HZ #define as_string(s) (#s) - printf("HZ=%g", (double)HZ); + printf("HZ=%g", HZ); +# ifdef _SC_CLK_TCK + printf(" [sysconf value]"); +# endif #endif - printf("\n"); - printf("timing function used: %s%s%s%s%s%s%s\n", - (ftime_used ? "ftime" : ""), - (ftime_used + times_used > 1 ? "," : ""), - (times_used ? "times" : ""), - (ftime_used + times_used + gettimeofday_used > 1 ? "," : ""), - (gettimeofday_used ? "gettimeofday" : ""), - (ftime_used + times_used + gettimeofday_used + getrusage_used > 1 ? "," : ""), - (getrusage_used ? "getrusage" : "")); - + printf("\n"); + printf("timing function used: %s%s%s%s%s%s%s\n", + (ftime_used ? "ftime" : ""), + (ftime_used + times_used > 1 ? "," : ""), + (times_used ? "times" : ""), + (ftime_used + times_used + gettimeofday_used > 1 ? "," : ""), + (gettimeofday_used ? "gettimeofday" : ""), + (ftime_used + times_used + gettimeofday_used + getrusage_used > 1 ? "," : ""), + (getrusage_used ? "getrusage" : "")); + } if (pr_header) { - fprintf(stdout,"The 'numbers' are in 1000s of bytes per second processed.\n"); - fprintf(stdout,"type "); + if(mr) + fprintf(stdout,"+H"); + else + { + fprintf(stdout,"The 'numbers' are in 1000s of bytes per second processed.\n"); + fprintf(stdout,"type "); + } for (j=0; j 10000) + if (results[k][j] > 10000 && !mr) fprintf(stdout," %11.2fk",results[k][j]/1e3); else - fprintf(stdout," %11.2f ",results[k][j]); + fprintf(stdout,mr ? ":%.2f" : " %11.2f ",results[k][j]); } fprintf(stdout,"\n"); } @@ -1486,15 +1527,19 @@ int MAIN(int argc, char **argv) for (k=0; k