Merge in DES changed from 0.9.7-stable.

diff --git a/apps/passwd.c b/apps/passwd.c
index 2023b76f5bf39a0bff01f6338b7413fbb7aaa59d..ad8e7b0349bc1bc4a99624ea567ea53016238484 100644 (file)
--- a/apps/passwd.c
+++ b/apps/passwd.c
@@ -16,7 +16,7 @@
 #include <openssl/evp.h>
 #include <openssl/rand.h>
 #ifndef OPENSSL_NO_DES
 #include <openssl/evp.h>
 #include <openssl/rand.h>
 #ifndef OPENSSL_NO_DES

-# include <openssl/des_old.h>
+# include <openssl/des.h>

 #endif
 #ifndef NO_MD5CRYPT_1
 # include <openssl/evp.h>
 #endif
 #ifndef NO_MD5CRYPT_1
 # include <openssl/evp.h>


@@ -482,7 +482,7 @@ static int do_passwd(int passed_salt, char **salt_p, char **salt_malloc_p,
        /* now compute password hash */
 #ifndef OPENSSL_NO_DES
        if (usecrypt)
        /* now compute password hash */
 #ifndef OPENSSL_NO_DES
        if (usecrypt)

-               hash = des_crypt(passwd, *salt_p);
+               hash = DES_crypt(passwd, *salt_p);

 #endif
 #ifndef NO_MD5CRYPT_1
        if (use1 || useapr1)
 #endif
 #ifndef NO_MD5CRYPT_1
        if (use1 || useapr1)

diff --git a/apps/speed.c b/apps/speed.c
index 8b837e99642ce790b734a65710e89a32433b23cc..fea0ffe2cfae09c9af8f4a9d4c3b125be31148c6 100644 (file)
--- a/apps/speed.c
+++ b/apps/speed.c
@@ -131,7 +131,7 @@
 #endif
 
 #ifndef OPENSSL_NO_DES
 #endif
 
 #ifndef OPENSSL_NO_DES

-#include <openssl/des_old.h>
+#include <openssl/des.h>

 #endif
 #ifndef OPENSSL_NO_AES
 #include <openssl/aes.h>
 #endif
 #ifndef OPENSSL_NO_AES
 #include <openssl/aes.h>


@@ -439,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;
        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;
        DES_key_schedule sch;
        DES_key_schedule sch2;
        DES_key_schedule sch3;


@@ -532,7 +532,7 @@ int MAIN(int argc, char **argv)
                goto end;
                }
 #ifndef OPENSSL_NO_DES
                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)
                {
 #endif
        if ((buf2=(unsigned char *)OPENSSL_malloc((int)BUFSIZE)) == NULL)
                {


@@ -1603,7 +1603,7 @@ show_res:
                printf("%s ",RC4_options());
 #endif
 #ifndef OPENSSL_NO_DES
                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());
 #endif
 #ifndef OPENSSL_NO_AES
                printf("%s ",AES_options());

diff --git a/apps/version.c b/apps/version.c
index 6baf679b776497823ca3cfd7b150189c80097db0..0cbcb47f881f4a39700976b9486828f753534766 100644 (file)
--- a/apps/version.c
+++ b/apps/version.c
@@ -122,7 +122,7 @@
 # include <openssl/rc4.h>
 #endif
 #ifndef OPENSSL_NO_DES
 # include <openssl/rc4.h>
 #endif
 #ifndef OPENSSL_NO_DES

-# include <openssl/des_old.h>
+# include <openssl/des.h>

 #endif
 #ifndef OPENSSL_NO_IDEA
 # include <openssl/idea.h>
 #endif
 #ifndef OPENSSL_NO_IDEA
 # include <openssl/idea.h>


@@ -186,7 +186,7 @@ int MAIN(int argc, char **argv)
                printf("%s ",RC4_options());
 #endif
 #ifndef OPENSSL_NO_DES
                printf("%s ",RC4_options());
 #endif
 #ifndef OPENSSL_NO_DES

-               printf("%s ",des_options());
+               printf("%s ",DES_options());

 #endif
 #ifndef OPENSSL_NO_IDEA
                printf("%s ",idea_options());
 #endif
 #ifndef OPENSSL_NO_IDEA
                printf("%s ",idea_options());