diff options
author | Lutz Jänicke <jaenicke@openssl.org> | 2002-07-10 07:01:54 +0000 |
---|---|---|
committer | Lutz Jänicke <jaenicke@openssl.org> | 2002-07-10 07:01:54 +0000 |
commit | 7b63c0fa8c309bed7848b5ca5810ae9e2f2fb3c1 (patch) | |
tree | b17353bbf0eb8e7e4452b1c5044d84b6c0bc4e11 /crypto/evp/evp_pbe.c | |
parent | 063a8905bfd53f3cc12a01789efc23c0ea6af053 (diff) | |
download | openssl-7b63c0fa8c309bed7848b5ca5810ae9e2f2fb3c1.tar.gz |
Reorder inclusion of header files:
des_old.h redefines crypt:
#define crypt(b,s)\
DES_crypt((b),(s))
This scheme leads to failure, if header files with the OS's true definition
of crypt() are processed _after_ des_old.h was processed. This is e.g. the
case on HP-UX with unistd.h.
As evp.h now again includes des.h (which includes des_old.h), this problem
only came up after this modification.
Solution: move header files (indirectly) including e_os.h before the header
files (indirectly) including evp.h.
Submitted by:
Reviewed by:
PR:
Diffstat (limited to 'crypto/evp/evp_pbe.c')
-rw-r--r-- | crypto/evp/evp_pbe.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/evp/evp_pbe.c b/crypto/evp/evp_pbe.c index 06afb9d152..bcd4d29f85 100644 --- a/crypto/evp/evp_pbe.c +++ b/crypto/evp/evp_pbe.c @@ -57,9 +57,9 @@ */ #include <stdio.h> +#include "cryptlib.h" #include <openssl/evp.h> #include <openssl/x509.h> -#include "cryptlib.h" /* Password based encryption (PBE) functions */ |