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 | |
parent | 063a8905bfd53f3cc12a01789efc23c0ea6af053 (diff) |
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')
-rw-r--r-- | crypto/engine/hw_ncipher.c | 2 | ||||
-rw-r--r-- | crypto/engine/hw_sureware.c | 2 | ||||
-rw-r--r-- | crypto/evp/evp_pbe.c | 2 | ||||
-rw-r--r-- | crypto/evp/p5_crpt.c | 2 | ||||
-rw-r--r-- | crypto/evp/p5_crpt2.c | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/crypto/engine/hw_ncipher.c b/crypto/engine/hw_ncipher.c index 7c1141afa9..4fef86fcc5 100644 --- a/crypto/engine/hw_ncipher.c +++ b/crypto/engine/hw_ncipher.c @@ -59,9 +59,9 @@ #include <stdio.h> #include <string.h> +#include "cryptlib.h" #include <openssl/crypto.h> #include <openssl/pem.h> -#include "cryptlib.h" #include <openssl/dso.h> #include <openssl/engine.h> #include <openssl/ui.h> diff --git a/crypto/engine/hw_sureware.c b/crypto/engine/hw_sureware.c index 27d380e8b9..89f708661d 100644 --- a/crypto/engine/hw_sureware.c +++ b/crypto/engine/hw_sureware.c @@ -51,9 +51,9 @@ ====================================================================*/ #include <stdio.h> +#include "cryptlib.h" #include <openssl/crypto.h> #include <openssl/pem.h> -#include "cryptlib.h" #include <openssl/dso.h> #include "eng_int.h" #include "engine.h" 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 */ diff --git a/crypto/evp/p5_crpt.c b/crypto/evp/p5_crpt.c index 113c60fedb..27a8286489 100644 --- a/crypto/evp/p5_crpt.c +++ b/crypto/evp/p5_crpt.c @@ -58,9 +58,9 @@ #include <stdio.h> #include <stdlib.h> +#include "cryptlib.h" #include <openssl/x509.h> #include <openssl/evp.h> -#include "cryptlib.h" /* PKCS#5 v1.5 compatible PBE functions: see PKCS#5 v2.0 for more info. */ diff --git a/crypto/evp/p5_crpt2.c b/crypto/evp/p5_crpt2.c index 7881860b53..7485d6a278 100644 --- a/crypto/evp/p5_crpt2.c +++ b/crypto/evp/p5_crpt2.c @@ -58,10 +58,10 @@ #if !defined(OPENSSL_NO_HMAC) && !defined(OPENSSL_NO_SHA) #include <stdio.h> #include <stdlib.h> +#include "cryptlib.h" #include <openssl/x509.h> #include <openssl/evp.h> #include <openssl/hmac.h> -#include "cryptlib.h" /* set this to print out info about the keygen algorithm */ /* #define DEBUG_PKCS5V2 */ |