Merge in DES changed from 0.9.7-stable.

[openssl.git] / apps / speed.c

diff --git a/apps/speed.c b/apps/speed.c
index 1c2b4eeda297b5c97dc88452e7d92a24eb4e5e94..fea0ffe2cfae09c9af8f4a9d4c3b125be31148c6 100644 (file)
--- a/apps/speed.c
+++ b/apps/speed.c
@@ -131,7 +131,7 @@
 #endif
 
 #ifndef OPENSSL_NO_DES
-#include <openssl/des_old.h>
+#include <openssl/des.h>
 #endif
 #ifndef OPENSSL_NO_AES
 #include <openssl/aes.h>
@@ -374,9 +374,11 @@ int MAIN(int argc, char **argv)
        int mret=1;
        long count=0,save_count=0;
        int i,j,k;
+#if !defined(OPENSSL_NO_RSA) || !defined(OPENSSL_NO_DSA)
+       long rsa_count;
+#endif
 #ifndef OPENSSL_NO_RSA
        unsigned rsa_num;
-       long rsa_count;
 #endif
        unsigned char md[EVP_MAX_MD_SIZE];
 #ifndef OPENSSL_NO_MD2
@@ -437,9 +439,9 @@ int MAIN(int argc, char **argv)
        unsigned char iv[MAX_BLOCK_SIZE/8];
 #ifndef OPENSSL_NO_DES
        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};
+       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;
        DES_key_schedule sch2;
        DES_key_schedule sch3;
@@ -530,7 +532,7 @@ int MAIN(int argc, char **argv)
                goto end;
                }
 #ifndef OPENSSL_NO_DES
-       buf_as_des_cblock = (des_cblock *)buf;
+       buf_as_des_cblock = (DES_cblock *)buf;
 #endif
        if ((buf2=(unsigned char *)OPENSSL_malloc((int)BUFSIZE)) == NULL)
                {
@@ -1139,7 +1141,7 @@ int MAIN(int argc, char **argv)
 
                HMAC_CTX_init(&hctx);
                HMAC_Init_ex(&hctx,(unsigned char *)"This is a key...",
-                       16,EVP_md5());
+                       16,EVP_md5(), NULL);
 
                for (j=0; j<SIZE_NUM; j++)
                        {
@@ -1147,9 +1149,9 @@ int MAIN(int argc, char **argv)
                        Time_F(START);
                        for (count=0,run=1; COND(c[D_HMAC][j]); count++)
                                {
-                               HMAC_Init_ex(&hctx,NULL,0,NULL);
-                                HMAC_Update(&hctx,buf,lengths[j]);
-                                HMAC_Final(&hctx,&(hmac[0]),NULL);
+                               HMAC_Init_ex(&hctx,NULL,0,NULL,NULL);
+                               HMAC_Update(&hctx,buf,lengths[j]);
+                               HMAC_Final(&hctx,&(hmac[0]),NULL);
                                }
                        d=Time_F(STOP);
                        print_result(D_HMAC,j,count,d);
@@ -1601,7 +1603,7 @@ show_res:
                printf("%s ",RC4_options());
 #endif
 #ifndef OPENSSL_NO_DES
-               printf("%s ",des_options());
+               printf("%s ",DES_options());
 #endif
 #ifndef OPENSSL_NO_AES
                printf("%s ",AES_options());
@@ -1625,7 +1627,7 @@ show_res:
 #endif
 #ifdef HZ
 #define as_string(s) (#s)
-               printf("HZ=%g", HZ);
+               printf("HZ=%g", (double)HZ);
 # ifdef _SC_CLK_TCK
                printf(" [sysconf value]");
 # endif