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

apps/speed.c: make it indent-friendly.

Browse Source 
Conflicts:
	apps/speed.c

Conflicts:
	apps/speed.c

Reviewed-by: Tim Hudson <tjh@openssl.org>
This commit is contained in:
Andy Polyakov 2015-01-20 14:15:44 +01:00 committed by Matt Caswell
parent 18d3333cfd
commit b2aec696f2
1 changed files with 79 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

124
apps/speed.c
View File

@ -422,27 +422,27 @@ int MAIN(int argc, char **argv)
#ifndef OPENSSL_NO_CAST #ifndef OPENSSL_NO_CAST
CAST_KEY cast_ks; CAST_KEY cast_ks;
#endif #endif
static const unsigned char key16[16]= static const unsigned char key16[16]= {
{0x12,0x34,0x56,0x78,0x9a,0xbc,0xde,0xf0, 0x12,0x34,0x56,0x78,0x9a,0xbc,0xde,0xf0,
0x34,0x56,0x78,0x9a,0xbc,0xde,0xf0,0x12}; 0x34,0x56,0x78,0x9a,0xbc,0xde,0xf0,0x12};
#ifndef OPENSSL_NO_AES #ifndef OPENSSL_NO_AES
static const unsigned char key24[24]= static const unsigned char key24[24]= {
{0x12,0x34,0x56,0x78,0x9a,0xbc,0xde,0xf0, 0x12,0x34,0x56,0x78,0x9a,0xbc,0xde,0xf0,
0x34,0x56,0x78,0x9a,0xbc,0xde,0xf0,0x12, 0x34,0x56,0x78,0x9a,0xbc,0xde,0xf0,0x12,
0x56,0x78,0x9a,0xbc,0xde,0xf0,0x12,0x34}; 0x56,0x78,0x9a,0xbc,0xde,0xf0,0x12,0x34};
static const unsigned char key32[32]= static const unsigned char key32[32]= {
{0x12,0x34,0x56,0x78,0x9a,0xbc,0xde,0xf0, 0x12,0x34,0x56,0x78,0x9a,0xbc,0xde,0xf0,
0x34,0x56,0x78,0x9a,0xbc,0xde,0xf0,0x12, 0x34,0x56,0x78,0x9a,0xbc,0xde,0xf0,0x12,
0x56,0x78,0x9a,0xbc,0xde,0xf0,0x12,0x34, 0x56,0x78,0x9a,0xbc,0xde,0xf0,0x12,0x34,
0x78,0x9a,0xbc,0xde,0xf0,0x12,0x34,0x56}; 0x78,0x9a,0xbc,0xde,0xf0,0x12,0x34,0x56};
#endif #endif
#ifndef OPENSSL_NO_CAMELLIA #ifndef OPENSSL_NO_CAMELLIA
static const unsigned char ckey24[24]= static const unsigned char ckey24[24]= {
{0x12,0x34,0x56,0x78,0x9a,0xbc,0xde,0xf0, 0x12,0x34,0x56,0x78,0x9a,0xbc,0xde,0xf0,
0x34,0x56,0x78,0x9a,0xbc,0xde,0xf0,0x12, 0x34,0x56,0x78,0x9a,0xbc,0xde,0xf0,0x12,
0x56,0x78,0x9a,0xbc,0xde,0xf0,0x12,0x34}; 0x56,0x78,0x9a,0xbc,0xde,0xf0,0x12,0x34};
static const unsigned char ckey32[32]= static const unsigned char ckey32[32]= {
{0x12,0x34,0x56,0x78,0x9a,0xbc,0xde,0xf0, 0x12,0x34,0x56,0x78,0x9a,0xbc,0xde,0xf0,
0x34,0x56,0x78,0x9a,0xbc,0xde,0xf0,0x12, 0x34,0x56,0x78,0x9a,0xbc,0xde,0xf0,0x12,
0x56,0x78,0x9a,0xbc,0xde,0xf0,0x12,0x34, 0x56,0x78,0x9a,0xbc,0xde,0xf0,0x12,0x34,
0x78,0x9a,0xbc,0xde,0xf0,0x12,0x34,0x56}; 0x78,0x9a,0xbc,0xde,0xf0,0x12,0x34,0x56};
@ -455,9 +455,9 @@ int MAIN(int argc, char **argv)
unsigned char DES_iv[8]; unsigned char DES_iv[8];
unsigned char iv[2*MAX_BLOCK_SIZE/8]; unsigned char iv[2*MAX_BLOCK_SIZE/8];
#ifndef OPENSSL_NO_DES #ifndef OPENSSL_NO_DES
static DES_cblock key ={0x12,0x34,0x56,0x78,0x9a,0xbc,0xde,0xf0}; 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 key2= { 0x34,0x56,0x78,0x9a,0xbc,0xde,0xf0,0x12 };
static DES_cblock key3={0x56,0x78,0x9a,0xbc,0xde,0xf0,0x12,0x34}; static DES_cblock key3= { 0x56,0x78,0x9a,0xbc,0xde,0xf0,0x12,0x34 };
DES_key_schedule sch; DES_key_schedule sch;
DES_key_schedule sch2; DES_key_schedule sch2;
DES_key_schedule sch3; DES_key_schedule sch3;
@ -528,9 +528,10 @@ int MAIN(int argc, char **argv)
#ifndef OPENSSL_NO_RSA #ifndef OPENSSL_NO_RSA
RSA *rsa_key[RSA_NUM]; RSA *rsa_key[RSA_NUM];
long rsa_c[RSA_NUM][2]; long rsa_c[RSA_NUM][2];
static unsigned int rsa_bits[RSA_NUM]={512,1024,2048,4096}; static unsigned int rsa_bits[RSA_NUM]={
static unsigned char *rsa_data[RSA_NUM]= 512,1024,2048,4096};
{test512,test1024,test2048,test4096}; static unsigned char *rsa_data[RSA_NUM]={
test512,test1024,test2048,test4096};
static int rsa_data_length[RSA_NUM]={ static int rsa_data_length[RSA_NUM]={
sizeof(test512),sizeof(test1024), sizeof(test512),sizeof(test1024),
sizeof(test2048),sizeof(test4096)}; sizeof(test2048),sizeof(test4096)};
@ -1089,13 +1090,15 @@ int MAIN(int argc, char **argv)
BIO_printf(bio_err,"dsa512 dsa1024 dsa2048\n"); BIO_printf(bio_err,"dsa512 dsa1024 dsa2048\n");
#endif #endif
#ifndef OPENSSL_NO_ECDSA #ifndef OPENSSL_NO_ECDSA
BIO_printf(bio_err,"ecdsap160 ecdsap192 ecdsap224 ecdsap256 ecdsap384 ecdsap521\n"); BIO_printf(bio_err,"ecdsap160 ecdsap192 ecdsap224 "
"ecdsap256 ecdsap384 ecdsap521\n");
BIO_printf(bio_err,"ecdsak163 ecdsak233 ecdsak283 ecdsak409 ecdsak571\n"); BIO_printf(bio_err,"ecdsak163 ecdsak233 ecdsak283 ecdsak409 ecdsak571\n");
BIO_printf(bio_err,"ecdsab163 ecdsab233 ecdsab283 ecdsab409 ecdsab571\n"); BIO_printf(bio_err,"ecdsab163 ecdsab233 ecdsab283 ecdsab409 ecdsab571\n");
BIO_printf(bio_err,"ecdsa\n"); BIO_printf(bio_err,"ecdsa\n");
#endif #endif
#ifndef OPENSSL_NO_ECDH #ifndef OPENSSL_NO_ECDH
BIO_printf(bio_err,"ecdhp160 ecdhp192 ecdhp224 ecdhp256 ecdhp384 ecdhp521\n"); BIO_printf(bio_err,"ecdhp160 ecdhp192 ecdhp224 "
"ecdhp256 ecdhp384 ecdhp521\n");
BIO_printf(bio_err,"ecdhk163 ecdhk233 ecdhk283 ecdhk409 ecdhk571\n"); BIO_printf(bio_err,"ecdhk163 ecdhk233 ecdhk283 ecdhk409 ecdhk571\n");
BIO_printf(bio_err,"ecdhb163 ecdhb233 ecdhb283 ecdhb409 ecdhb571\n"); BIO_printf(bio_err,"ecdhb163 ecdhb233 ecdhb283 ecdhb409 ecdhb571\n");
BIO_printf(bio_err,"ecdh\n"); BIO_printf(bio_err,"ecdh\n");
@ -1135,16 +1138,27 @@ int MAIN(int argc, char **argv)
BIO_printf(bio_err,"\n"); BIO_printf(bio_err,"\n");
BIO_printf(bio_err,"Available options:\n"); BIO_printf(bio_err,"Available options:\n");
#if defined(TIMES) || defined(USE_TOD) #if defined(TIMES) || defined(USE_TOD)
BIO_printf(bio_err,"-elapsed measure time in real time instead of CPU user time.\n"); BIO_printf(bio_err,"-elapsed "
"measure time in real time instead of CPU user time.\n");
#endif #endif
#ifndef OPENSSL_NO_ENGINE #ifndef OPENSSL_NO_ENGINE
BIO_printf(bio_err,"-engine e use engine e, possibly a hardware device.\n"); BIO_printf(bio_err,
"-engine e "
"use engine e, possibly a hardware device.\n");
#endif #endif
BIO_printf(bio_err,"-evp e use EVP e.\n"); BIO_printf(bio_err,
BIO_printf(bio_err,"-decrypt time decryption instead of encryption (only EVP).\n"); "-evp e "
BIO_printf(bio_err,"-mr produce machine readable output.\n"); "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");
#ifndef NO_FORK #ifndef NO_FORK
BIO_printf(bio_err,"-multi n run n benchmarks in parallel.\n"); BIO_printf(bio_err,
"-multi n "
"run n benchmarks in parallel.\n");
#endif #endif
goto end; goto end;
} }
@ -1182,7 +1196,9 @@ int MAIN(int argc, char **argv)
if (doit[i]) pr_header++; if (doit[i]) pr_header++;
if (usertime == 0 && !mr) if (usertime == 0 && !mr)
BIO_printf(bio_err,"You have chosen to measure elapsed time instead of user CPU time.\n"); BIO_printf(bio_err,
"You have chosen to measure elapsed time "
"instead of user CPU time.\n");
#ifndef OPENSSL_NO_RSA #ifndef OPENSSL_NO_RSA
for (i=0; i<RSA_NUM; i++) for (i=0; i<RSA_NUM; i++)
@ -1199,7 +1215,8 @@ int MAIN(int argc, char **argv)
#if 0 #if 0
else else
{ {
BIO_printf(bio_err,mr ? "+RK:%d:" BIO_printf(bio_err,
mr ? "+RK:%d:"
: "Loaded RSA key, %d bit modulus and e= 0x", : "Loaded RSA key, %d bit modulus and e= 0x",
BN_num_bits(rsa_key[i]->n)); BN_num_bits(rsa_key[i]->n));
BN_print(bio_err,rsa_key[i]->e); BN_print(bio_err,rsa_key[i]->e);
@ -2018,7 +2035,7 @@ int MAIN(int argc, char **argv)
pkey_print_message("private","rsa", pkey_print_message("private","rsa",
rsa_c[j][0],rsa_bits[j], rsa_c[j][0],rsa_bits[j],
RSA_SECONDS); RSA_SECONDS);
/* RSA_blinding_on(rsa_key[j],NULL); */ /* RSA_blinding_on(rsa_key[j],NULL); */
Time_F(START); Time_F(START);
for (count=0,run=1; COND(rsa_c[j][0]); count++) for (count=0,run=1; COND(rsa_c[j][0]); count++)
{ {
@ -2034,7 +2051,8 @@ int MAIN(int argc, char **argv)
} }
} }
d=Time_F(STOP); d=Time_F(STOP);
BIO_printf(bio_err,mr ? "+R1:%ld:%d:%.2f\n" BIO_printf(bio_err,
mr ? "+R1:%ld:%d:%.2f\n"
: "%ld %d bit private RSA's in %.2fs\n", : "%ld %d bit private RSA's in %.2fs\n",
count,rsa_bits[j],d); count,rsa_bits[j],d);
rsa_results[j][0]=d/(double)count; rsa_results[j][0]=d/(double)count;
@ -2069,7 +2087,8 @@ int MAIN(int argc, char **argv)
} }
} }
d=Time_F(STOP); d=Time_F(STOP);
BIO_printf(bio_err,mr ? "+R2:%ld:%d:%.2f\n" BIO_printf(bio_err,
mr ? "+R2:%ld:%d:%.2f\n"
: "%ld %d bit public RSA's in %.2fs\n", : "%ld %d bit public RSA's in %.2fs\n",
count,rsa_bits[j],d); count,rsa_bits[j],d);
rsa_results[j][1]=d/(double)count; rsa_results[j][1]=d/(double)count;
@ -2098,8 +2117,9 @@ int MAIN(int argc, char **argv)
int ret; int ret;
if (!dsa_doit[j]) continue; if (!dsa_doit[j]) continue;
/* DSA_generate_key(dsa_key[j]); */
/* DSA_sign_setup(dsa_key[j],NULL); */ /* DSA_generate_key(dsa_key[j]); */
/* DSA_sign_setup(dsa_key[j],NULL); */
ret=DSA_sign(EVP_PKEY_DSA,buf,20,buf2, ret=DSA_sign(EVP_PKEY_DSA,buf,20,buf2,
&kk,dsa_key[j]); &kk,dsa_key[j]);
if (ret == 0) if (ret == 0)
@ -2128,7 +2148,8 @@ int MAIN(int argc, char **argv)
} }
} }
d=Time_F(STOP); d=Time_F(STOP);
BIO_printf(bio_err,mr ? "+R3:%ld:%d:%.2f\n" BIO_printf(bio_err,
mr ? "+R3:%ld:%d:%.2f\n"
: "%ld %d bit DSA signs in %.2fs\n", : "%ld %d bit DSA signs in %.2fs\n",
count,dsa_bits[j],d); count,dsa_bits[j],d);
dsa_results[j][0]=d/(double)count; dsa_results[j][0]=d/(double)count;
@ -2163,7 +2184,8 @@ int MAIN(int argc, char **argv)
} }
} }
d=Time_F(STOP); d=Time_F(STOP);
BIO_printf(bio_err,mr ? "+R4:%ld:%d:%.2f\n" BIO_printf(bio_err,
mr ? "+R4:%ld:%d:%.2f\n"
: "%ld %d bit DSA verify in %.2fs\n", : "%ld %d bit DSA verify in %.2fs\n",
count,dsa_bits[j],d); count,dsa_bits[j],d);
dsa_results[j][1]=d/(double)count; dsa_results[j][1]=d/(double)count;
@ -2236,7 +2258,8 @@ int MAIN(int argc, char **argv)
} }
d=Time_F(STOP); d=Time_F(STOP);
BIO_printf(bio_err, mr ? "+R5:%ld:%d:%.2f\n" : BIO_printf(bio_err,
mr ? "+R5:%ld:%d:%.2f\n" :
"%ld %d bit ECDSA signs in %.2fs \n", "%ld %d bit ECDSA signs in %.2fs \n",
count, test_curves_bits[j], d); count, test_curves_bits[j], d);
ecdsa_results[j][0]=d/(double)count; ecdsa_results[j][0]=d/(double)count;
@ -2271,7 +2294,8 @@ int MAIN(int argc, char **argv)
} }
} }
d=Time_F(STOP); d=Time_F(STOP);
BIO_printf(bio_err, mr? "+R6:%ld:%d:%.2f\n" BIO_printf(bio_err,
mr ? "+R6:%ld:%d:%.2f\n"
: "%ld %d bit ECDSA verify in %.2fs\n", : "%ld %d bit ECDSA verify in %.2fs\n",
count, test_curves_bits[j], d); count, test_curves_bits[j], d);
ecdsa_results[j][1]=d/(double)count; ecdsa_results[j][1]=d/(double)count;
@ -2317,8 +2341,10 @@ int MAIN(int argc, char **argv)
} }
else else
{ {
/* If field size is not more than 24 octets, then use SHA-1 hash of result; /* If field size is not more than 24 octets,
* otherwise, use result (see section 4.8 of draft-ietf-tls-ecc-03.txt). * then use SHA-1 hash of result; otherwise,
* use result (see section 4.8 of
* draft-ietf-tls-ecc-03.txt).
*/ */
int field_size, outlen; int field_size, outlen;
void *(*kdf)(const void *in, size_t inlen, void *out, size_t *xoutlen); void *(*kdf)(const void *in, size_t inlen, void *out, size_t *xoutlen);
@ -2333,10 +2359,12 @@ int MAIN(int argc, char **argv)
outlen = (field_size+7)/8; outlen = (field_size+7)/8;
kdf = NULL; kdf = NULL;
} }
secret_size_a = ECDH_compute_key(secret_a, outlen, secret_size_a =
ECDH_compute_key(secret_a, outlen,
EC_KEY_get0_public_key(ecdh_b[j]), EC_KEY_get0_public_key(ecdh_b[j]),
ecdh_a[j], kdf); ecdh_a[j], kdf);
secret_size_b = ECDH_compute_key(secret_b, outlen, secret_size_b =
ECDH_compute_key(secret_b, outlen,
EC_KEY_get0_public_key(ecdh_a[j]), EC_KEY_get0_public_key(ecdh_a[j]),
ecdh_b[j], kdf); ecdh_b[j], kdf);
if (secret_size_a != secret_size_b) if (secret_size_a != secret_size_b)
@ -2372,7 +2400,8 @@ int MAIN(int argc, char **argv)
ecdh_a[j], kdf); ecdh_a[j], kdf);
} }
d=Time_F(STOP); d=Time_F(STOP);
BIO_printf(bio_err, mr ? "+R7:%ld:%d:%.2f\n" :"%ld %d-bit ECDH ops in %.2fs\n", BIO_printf(bio_err,
mr ? "+R7:%ld:%d:%.2f\n" :"%ld %d-bit ECDH ops in %.2fs\n",
count, test_curves_bits[j], d); count, test_curves_bits[j], d);
ecdh_results[j][0]=d/(double)count; ecdh_results[j][0]=d/(double)count;
rsa_count=count; rsa_count=count;
@ -2576,12 +2605,14 @@ end:
static void print_message(const char *s, long num, int length) static void print_message(const char *s, long num, int length)
{ {
#ifdef SIGALRM #ifdef SIGALRM
BIO_printf(bio_err,mr ? "+DT:%s:%d:%d\n" BIO_printf(bio_err,
mr ? "+DT:%s:%d:%d\n"
: "Doing %s for %ds on %d size blocks: ",s,SECONDS,length); : "Doing %s for %ds on %d size blocks: ",s,SECONDS,length);
(void)BIO_flush(bio_err); (void)BIO_flush(bio_err);
alarm(SECONDS); alarm(SECONDS);
#else #else
BIO_printf(bio_err,mr ? "+DN:%s:%ld:%d\n" BIO_printf(bio_err,
mr ? "+DN:%s:%ld:%d\n"
: "Doing %s %ld times on %d size blocks: ",s,num,length); : "Doing %s %ld times on %d size blocks: ",s,num,length);
(void)BIO_flush(bio_err); (void)BIO_flush(bio_err);
#endif #endif
@ -2594,12 +2625,14 @@ static void pkey_print_message(const char *str, const char *str2, long num,
int bits, int tm) int bits, int tm)
{ {
#ifdef SIGALRM #ifdef SIGALRM
BIO_printf(bio_err,mr ? "+DTP:%d:%s:%s:%d\n" BIO_printf(bio_err,
mr ? "+DTP:%d:%s:%s:%d\n"
: "Doing %d bit %s %s's for %ds: ",bits,str,str2,tm); : "Doing %d bit %s %s's for %ds: ",bits,str,str2,tm);
(void)BIO_flush(bio_err); (void)BIO_flush(bio_err);
alarm(tm); alarm(tm);
#else #else
BIO_printf(bio_err,mr ? "+DNP:%ld:%d:%s:%s\n" BIO_printf(bio_err,
mr ? "+DNP:%ld:%d:%s:%s\n"
: "Doing %ld %d bit %s %s's: ",num,bits,str,str2); : "Doing %ld %d bit %s %s's: ",num,bits,str,str2);
(void)BIO_flush(bio_err); (void)BIO_flush(bio_err);
#endif #endif
@ -2610,7 +2643,8 @@ static void pkey_print_message(const char *str, const char *str2, long num,
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)
{ {
BIO_printf(bio_err,mr ? "+R:%d:%s:%f\n" BIO_printf(bio_err,
mr ? "+R:%d:%s:%f\n"
: "%d %s's in %.2fs\n",count,names[alg],time_used); : "%d %s's in %.2fs\n",count,names[alg],time_used);
results[alg][run_no]=((double)count)/time_used*lengths[run_no]; results[alg][run_no]=((double)count)/time_used*lengths[run_no];
} }