X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=blobdiff_plain;f=apps%2Fspeed.c;h=92324186f42916121dc1e49aa1cbadf45e00462c;hp=2c489eb029a194a37487e60718321f5beb83e022;hb=bbdfbacdef1c90a8ea7e7056266ae0f2fd9b14d6;hpb=bdba45957a246ca3c74e93fb14e85184e2455248 diff --git a/apps/speed.c b/apps/speed.c index 2c489eb029..92324186f4 100644 --- a/apps/speed.c +++ b/apps/speed.c @@ -110,7 +110,7 @@ #if defined(_WIN32) || defined(__CYGWIN__) #include -# if defined(__CYGwIN__) && !defined(_WIN32) +# if defined(__CYGWIN__) && !defined(_WIN32) /* should define _WIN32, which normally is mutually * exclusive with __CYGWIN__, but if it didn't... */ # define _WIN32 @@ -489,7 +489,7 @@ int MAIN(int argc, char **argv) #define D_IGE_128_AES 26 #define D_IGE_192_AES 27 #define D_IGE_256_AES 28 -#define D_GHASH 29 +#define D_GHASH 29 double d=0.0; long c[ALGOR_NUM][SIZE_NUM]; #define R_DSA_512 0 @@ -1543,7 +1543,7 @@ int MAIN(int argc, char **argv) print_message(names[D_MD5],c[D_MD5][j],lengths[j]); Time_F(START); for (count=0,run=1; COND(c[D_MD5][j]); count++) - EVP_Digest(&(buf[0]),(unsigned long)lengths[j],&(md5[0]),NULL,EVP_get_digestbyname("md5"),NULL); + MD5(buf,lengths[j],md5); d=Time_F(STOP); print_result(D_MD5,j,count,d); } @@ -2593,7 +2593,7 @@ static void pkey_print_message(const char *str, const char *str2, long num, BIO_printf(bio_err,mr ? "+DTP:%d:%s:%s:%d\n" : "Doing %d bit %s %s's for %ds: ",bits,str,str2,tm); (void)BIO_flush(bio_err); - alarm(RSA_SECONDS); + alarm(tm); #else BIO_printf(bio_err,mr ? "+DNP:%ld:%d:%s:%s\n" : "Doing %ld %d bit %s %s's: ",num,bits,str,str2);