diff options
| author | Ben Laurie <ben@openssl.org> | 2001-07-30 23:57:25 +0000 |
|---|---|---|
| committer | Ben Laurie <ben@openssl.org> | 2001-07-30 23:57:25 +0000 |
| commit | dbad169019598981174ff46c7a9bf58373b0e53a (patch) | |
| tree | ce8ca1188d5614648f24b03967785543f1edc8f5 /apps/speed.c | |
| parent | 3ba5d1cf2eb6ef28ac5f6d9f3d28020d00c5be50 (diff) | |
| download | openssl-dbad169019598981174ff46c7a9bf58373b0e53a.tar.gz | |
Really add the EVP and all of the DES changes.
Diffstat (limited to 'apps/speed.c')
| -rw-r--r-- | apps/speed.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/apps/speed.c b/apps/speed.c index 6bfe345f81..acd8b3e7b6 100644 --- a/apps/speed.c +++ b/apps/speed.c @@ -787,9 +787,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); @@ -990,6 +990,8 @@ int MAIN(int argc, char **argv) if (doit[D_HMAC]) { HMAC_CTX hctx; + + HMAC_CTX_init(&hctx); HMAC_Init(&hctx,(unsigned char *)"This is a key...", 16,EVP_md5()); @@ -1008,7 +1010,7 @@ int MAIN(int argc, char **argv) count,names[D_HMAC],d); results[D_HMAC][j]=((double)count)/d*lengths[j]; } - HMAC_cleanup(&hctx); + HMAC_CTX_cleanup(&hctx); } #endif #ifndef OPENSSL_NO_SHA @@ -1068,11 +1070,11 @@ int MAIN(int argc, char **argv) print_message(names[D_CBC_DES],c[D_CBC_DES][j],lengths[j]); Time_F(START,usertime); for (count=0,run=1; COND(c[D_CBC_DES][j]); count++) - des_ncbc_encrypt(buf,buf,lengths[j],sch, + des_ncbc_encrypt(buf,buf,lengths[j],&sch, &iv,DES_ENCRYPT); d=Time_F(STOP,usertime); BIO_printf(bio_err,"%ld %s's in %.2fs\n", - count,names[D_CBC_DES],d); + count,names[D_CBC_DES],d); results[D_CBC_DES][j]=((double)count)/d*lengths[j]; } } @@ -1085,7 +1087,7 @@ int MAIN(int argc, char **argv) Time_F(START,usertime); for (count=0,run=1; COND(c[D_EDE3_DES][j]); count++) des_ede3_cbc_encrypt(buf,buf,lengths[j], - sch,sch2,sch3, + &sch,&sch2,&sch3, &iv,DES_ENCRYPT); d=Time_F(STOP,usertime); BIO_printf(bio_err,"%ld %s's in %.2fs\n", |