Commit 7b63c0fa authored by Lutz Jänicke's avatar Lutz Jänicke
Browse files

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:
parent 063a8905

apps/nseq.c

+1 −1
Original line number Diff line number Diff line
@@ -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

apps/ocsp.c

+1 −1
Original line number Diff line number Diff line
@@ -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)

apps/openssl.c

+1 −1
Original line number Diff line number Diff line
@@ -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>

crypto/engine/hw_ncipher.c

+1 −1
Original line number Diff line number Diff line
@@ -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>

crypto/engine/hw_sureware.c

+1 −1
Original line number Diff line number Diff line
@@ -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"