From 12ba413c08b429500fc2245201b4f2f327e26d98 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Bodo=20M=C3=B6ller?= Date: Tue, 18 May 1999 15:06:20 +0000 Subject: [PATCH] Get rid of some unnecessary casts and add a necessary one. --- apps/speed.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/apps/speed.c b/apps/speed.c index a8371fb424..5b07a21747 100644 --- a/apps/speed.c +++ b/apps/speed.c @@ -239,6 +239,7 @@ static double Time_F(int s) int MAIN(int argc, char **argv) { unsigned char *buf=NULL,*buf2=NULL; + des_cblock *buf_as_des_cblock = NULL; int ret=1; #define ALGOR_NUM 14 #define SIZE_NUM 5 @@ -360,6 +361,7 @@ int MAIN(int argc, char **argv) BIO_printf(bio_err,"out of memory\n"); goto end; } + buf_as_des_cblock = (des_cblock *)buf; if ((buf2=(unsigned char *)Malloc((int)BUFSIZE)) == NULL) { BIO_printf(bio_err,"out of memory\n"); @@ -613,7 +615,8 @@ int MAIN(int argc, char **argv) count*=2; Time_F(START); for (i=count; i; i--) - des_ecb_encrypt(buf,buf, &(sch[0]),DES_ENCRYPT); + des_ecb_encrypt(buf_as_des_cblock,buf_as_des_cblock, + &(sch[0]),DES_ENCRYPT); d=Time_F(STOP); } while (d <3); c[D_MD2][0]=count/10; @@ -868,7 +871,7 @@ int MAIN(int argc, char **argv) for (count=0,run=1; COND(c[D_CBC_IDEA][j]); count++) idea_cbc_encrypt(buf,buf, (unsigned long)lengths[j],&idea_ks, - (unsigned char *)&(iv[0]),IDEA_ENCRYPT); + iv,IDEA_ENCRYPT); d=Time_F(STOP); BIO_printf(bio_err,"%ld %s's in %.2fs\n", count,names[D_CBC_IDEA],d); @@ -886,7 +889,7 @@ int MAIN(int argc, char **argv) for (count=0,run=1; COND(c[D_CBC_RC2][j]); count++) RC2_cbc_encrypt(buf,buf, (unsigned long)lengths[j],&rc2_ks, - (unsigned char *)&(iv[0]),RC2_ENCRYPT); + iv,RC2_ENCRYPT); d=Time_F(STOP); BIO_printf(bio_err,"%ld %s's in %.2fs\n", count,names[D_CBC_RC2],d); @@ -904,7 +907,7 @@ int MAIN(int argc, char **argv) for (count=0,run=1; COND(c[D_CBC_RC5][j]); count++) RC5_32_cbc_encrypt(buf,buf, (unsigned long)lengths[j],&rc5_ks, - (unsigned char *)&(iv[0]),RC5_ENCRYPT); + iv,RC5_ENCRYPT); d=Time_F(STOP); BIO_printf(bio_err,"%ld %s's in %.2fs\n", count,names[D_CBC_RC5],d); @@ -922,7 +925,7 @@ int MAIN(int argc, char **argv) for (count=0,run=1; COND(c[D_CBC_BF][j]); count++) BF_cbc_encrypt(buf,buf, (unsigned long)lengths[j],&bf_ks, - (unsigned char *)&(iv[0]),BF_ENCRYPT); + iv,BF_ENCRYPT); d=Time_F(STOP); BIO_printf(bio_err,"%ld %s's in %.2fs\n", count,names[D_CBC_BF],d); @@ -940,7 +943,7 @@ int MAIN(int argc, char **argv) for (count=0,run=1; COND(c[D_CBC_CAST][j]); count++) CAST_cbc_encrypt(buf,buf, (unsigned long)lengths[j],&cast_ks, - (unsigned char *)&(iv[0]),CAST_ENCRYPT); + iv,CAST_ENCRYPT); d=Time_F(STOP); BIO_printf(bio_err,"%ld %s's in %.2fs\n", count,names[D_CBC_CAST],d); -- 2.25.1