Commit 156f6572 authored by Richard Levitte's avatar Richard Levitte
Browse files

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

PR: 1125
parent 816f74d1

crypto/des/des_old.h

+1 −1
Original line number Diff line number Diff line
@@ -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))

crypto/des/destest.c

+1 −1
Original line number Diff line number Diff line
@@ -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 */