diff options
| author | Richard Levitte <levitte@openssl.org> | 2005-06-23 21:53:56 +0000 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2005-06-23 21:53:56 +0000 |
| commit | 156f65720953d3323dfa65663d16fffbc0d340e8 (patch) | |
| tree | 8384463e69bd0bc2b618eaa67829cc39dad72dcb /crypto/des | |
| parent | 816f74d1c7b36de22f0a88870cc6968dac2dc26e (diff) | |
Do not defined des_crypt(), since it clashes with Solaris crypt.h.
PR: 1125
Diffstat (limited to 'crypto/des')
| -rw-r--r-- | crypto/des/des_old.h | 2 | ||||
| -rw-r--r-- | crypto/des/destest.c | 2 |
2 files changed, 2 insertions, 2 deletions
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 */ |