Do not defined des_crypt(), since it clashes with Solaris crypt.h.

PR: 1125

diff --git a/crypto/des/des_old.h b/crypto/des/des_old.h
index 8a238d1ce1b48de947e3f095dd67a64bec411e08..9f439926c3b60d5a8a3c31699e0802130b398e75 100644 (file)
--- a/crypto/des/des_old.h
+++ b/crypto/des/des_old.h
@@ -171,9 +171,9 @@ typedef struct _ossl_old_des_ks_struct
        DES_enc_write((f),(b),(l),&(k),(iv))
 #define des_fcrypt(b,s,r)\
        DES_fcrypt((b),(s),(r))
+#if 0
 #define des_crypt(b,s)\
        DES_crypt((b),(s))
-#if 0
 #if !defined(PERL5) && !defined(__FreeBSD__) && !defined(NeXT) && !defined(__OpenBSD__)
 #define crypt(b,s)\
        DES_crypt((b),(s))

diff --git a/crypto/des/destest.c b/crypto/des/destest.c
index 4584cf300453246f27503600949daf32a6b339c0..64b92a34fe976075f986e4fea85bec12375bd479 100644 (file)
--- a/crypto/des/destest.c
+++ b/crypto/des/destest.c
@@ -84,7 +84,7 @@ int main(int argc, char *argv[])
 #else
 #include <openssl/des.h>
 
-#define crypt(c,s) (des_crypt((c),(s)))
+#define crypt(c,s) (DES_crypt((c),(s)))
 
 /* tisk tisk - the test keys don't all have odd parity :-( */
 /* test data */