Addapt seldom compiled code to new semantics of the key schedule (not

[openssl.git] / crypto / des / speed.c

diff --git a/crypto/des/speed.c b/crypto/des/speed.c
index 814b86f4aee517cb4177bdce8d350f050d5d0d38..3dc710591691381b13198f588d8dc3dee628f700 100644 (file)
--- a/crypto/des/speed.c
+++ b/crypto/des/speed.c
@@ -59,7 +59,7 @@
 /* 11-Sep-92 Andrew Daviel   Support for Silicon Graphics IRIX added */
 /* 06-Apr-92 Luke Brennan    Support for VMS and add extra signal calls */
 
-#if !defined(MSDOS) && (!defined(VMS) || defined(__DECC))
+#if !defined(OPENSSL_SYS_MSDOS) && (!defined(OPENSSL_SYS_VMS) || defined(__DECC)) && !defined(OPENSSL_SYS_MACOSX)
 #define TIMES
 #endif
 
@@ -82,7 +82,7 @@ OPENSSL_DECLARE_EXIT
    The __TMS macro will show if it was.  If it wasn't defined, we should
    undefine TIMES, since that tells the rest of the program how things
    should be handled.                          -- Richard Levitte */
-#if defined(VMS) && defined(__DECC) && !defined(__TMS)
+#if defined(OPENSSL_SYS_VMS_DECC) && !defined(__TMS)
 #undef TIMES
 #endif
 
@@ -204,7 +204,7 @@ int main(int argc, char **argv)
                count*=2;
                Time_F(START);
                for (i=count; i; i--)
-                       des_encrypt(data,&(sch[0]),DES_ENCRYPT);
+                       des_encrypt1(data,&(sch[0]),DES_ENCRYPT);
                d=Time_F(STOP);
                } while (d < 3.0);
        ca=count;
@@ -241,7 +241,7 @@ int main(int argc, char **argv)
                {
                DES_LONG data[2];
 
-               des_encrypt(data,&(sch[0]),DES_ENCRYPT);
+               des_encrypt1(data,&(sch[0]),DES_ENCRYPT);
                }
        d=Time_F(STOP);
        printf("%ld des_encrypt's in %.2f second\n",count,d);
@@ -304,7 +304,7 @@ int main(int argc, char **argv)
        printf("DES ede cbc bytes  per sec = %12.2f (%9.3fuS)\n",d,8.0e6/d);
        printf("crypt              per sec = %12.2f (%9.3fuS)\n",e,1.0e6/e);
        exit(0);
-#if defined(LINT) || defined(MSDOS)
+#if defined(LINT) || defined(OPENSSL_SYS_MSDOS)
        return(0);
 #endif
        }