generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
PR: 1125
This commit is contained in:
Richard Levitte 2005-06-23 21:53:52 +00:00
parent 46e7a9797e
commit 00ce9376c7
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
crypto/des/des_old.h
View File

@ -171,9 +171,9 @@ typedef struct _ossl_old_des_ks_struct
DES_enc_write((f),(b),(l),&(k),(iv)) DES_enc_write((f),(b),(l),&(k),(iv))
#define des_fcrypt(b,s,r)\ #define des_fcrypt(b,s,r)\
DES_fcrypt((b),(s),(r)) DES_fcrypt((b),(s),(r))
#if 0
#define des_crypt(b,s)\ #define des_crypt(b,s)\
DES_crypt((b),(s)) DES_crypt((b),(s))
#if 0
#if !defined(PERL5) && !defined(__FreeBSD__) && !defined(NeXT) && !defined(__OpenBSD__) #if !defined(PERL5) && !defined(__FreeBSD__) && !defined(NeXT) && !defined(__OpenBSD__)
#define crypt(b,s)\ #define crypt(b,s)\
DES_crypt((b),(s)) DES_crypt((b),(s))

2
crypto/des/destest.c
View File

@ -84,7 +84,7 @@ int main(int argc, char *argv[])
#else #else
#include <openssl/des.h> #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 :-( */ /* tisk tisk - the test keys don't all have odd parity :-( */
/* test data */ /* test data */