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 /apps | |
| 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 'apps')
| -rw-r--r-- | apps/nseq.c | 2 | ||||
| -rw-r--r-- | apps/ocsp.c | 2 | ||||
| -rw-r--r-- | apps/openssl.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/apps/nseq.c b/apps/nseq.c index 93adcdfef8..c26f62cb61 100644 --- a/apps/nseq.c +++ b/apps/nseq.c @@ -58,9 +58,9 @@ #include <stdio.h> #include <string.h> +#include "apps.h" #include <openssl/pem.h> #include <openssl/err.h> -#include "apps.h" #undef PROG #define PROG nseq_main diff --git a/apps/ocsp.c b/apps/ocsp.c index 50af2a56f1..49a156a1cf 100644 --- a/apps/ocsp.c +++ b/apps/ocsp.c @@ -58,11 +58,11 @@ #include <stdio.h> #include <string.h> +#include "apps.h" #include <openssl/pem.h> #include <openssl/ocsp.h> #include <openssl/err.h> #include <openssl/ssl.h> -#include "apps.h" /* Maximum leeway in validity period: default 5 minutes */ #define MAX_VALIDITY_PERIOD (5 * 60) diff --git a/apps/openssl.c b/apps/openssl.c index c17458ef7c..1c4a4291aa 100644 --- a/apps/openssl.c +++ b/apps/openssl.c @@ -114,6 +114,7 @@ #include <string.h> #include <stdlib.h> #define OPENSSL_C /* tells apps.h to use complete apps_startup() */ +#include "apps.h" #include <openssl/bio.h> #include <openssl/crypto.h> #include <openssl/lhash.h> @@ -123,7 +124,6 @@ #include <openssl/ssl.h> #include <openssl/engine.h> #define USE_SOCKETS /* needed for the _O_BINARY defs in the MS world */ -#include "apps.h" #include "progs.h" #include "s_apps.h" #include <openssl/err.h> |