From: Richard Levitte <levitte@openssl.org>
Date: Thu, 23 Jun 2005 21:53:52 +0000 (+0000)
Subject: Do not defined des_crypt(), since it clashes with Solaris crypt.h.
X-Git-Tag: OpenSSL_0_9_8~39
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=00ce9376c714143a7538f39dc709a86f8a98166e;p=oweals%2Fopenssl.git

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 8a238d1ce1..9f439926c3 100644
--- 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 4584cf3004..64b92a34fe 100644
--- 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 */