diff options
52 files changed, 98 insertions, 56 deletions
diff --git a/lib/libcrypto/aes/aes_locl.h b/lib/libcrypto/aes/aes_locl.h index ac2fbff465e..30675474440 100644 --- a/lib/libcrypto/aes/aes_locl.h +++ b/lib/libcrypto/aes/aes_locl.h @@ -52,7 +52,7 @@ #ifndef HEADER_AES_LOCL_H #define HEADER_AES_LOCL_H -#include <openssl/e_os2.h> +#include <openssl/opensslconf.h> #ifdef OPENSSL_NO_AES #error AES is disabled. diff --git a/lib/libcrypto/asn1/asn1.h b/lib/libcrypto/asn1/asn1.h index e7264ccb096..5d2a7b44186 100644 --- a/lib/libcrypto/asn1/asn1.h +++ b/lib/libcrypto/asn1/asn1.h @@ -60,7 +60,9 @@ #define HEADER_ASN1_H #include <time.h> -#include <openssl/e_os2.h> + +#include <openssl/opensslconf.h> + #ifndef OPENSSL_NO_BIO #include <openssl/bio.h> #endif diff --git a/lib/libcrypto/asn1/asn1t.h b/lib/libcrypto/asn1/asn1t.h index 21d41bc11e9..1b9d4eb40c3 100644 --- a/lib/libcrypto/asn1/asn1t.h +++ b/lib/libcrypto/asn1/asn1t.h @@ -59,7 +59,9 @@ #define HEADER_ASN1T_H #include <stddef.h> -#include <openssl/e_os2.h> + +#include <openssl/opensslconf.h> + #include <openssl/asn1.h> /* ASN1 template defines, structures and functions */ diff --git a/lib/libcrypto/bf/blowfish.h b/lib/libcrypto/bf/blowfish.h index 289c55b3af2..be71374cb26 100644 --- a/lib/libcrypto/bf/blowfish.h +++ b/lib/libcrypto/bf/blowfish.h @@ -59,7 +59,7 @@ #ifndef HEADER_BLOWFISH_H #define HEADER_BLOWFISH_H -#include <openssl/e_os2.h> +#include <openssl/opensslconf.h> #ifdef __cplusplus extern "C" { diff --git a/lib/libcrypto/bio/bio.h b/lib/libcrypto/bio/bio.h index ee3c1d5d225..67574d9fa4a 100644 --- a/lib/libcrypto/bio/bio.h +++ b/lib/libcrypto/bio/bio.h @@ -59,7 +59,7 @@ #ifndef HEADER_BIO_H #define HEADER_BIO_H -#include <openssl/e_os2.h> +#include <openssl/opensslconf.h> #ifndef OPENSSL_NO_FP_API # include <stdio.h> diff --git a/lib/libcrypto/bn/bn.h b/lib/libcrypto/bn/bn.h index 2a73bbbecc8..ce04c4d2175 100644 --- a/lib/libcrypto/bn/bn.h +++ b/lib/libcrypto/bn/bn.h @@ -125,7 +125,8 @@ #ifndef HEADER_BN_H #define HEADER_BN_H -#include <openssl/e_os2.h> +#include <openssl/opensslconf.h> + #ifndef OPENSSL_NO_FP_API #include <stdio.h> /* FILE */ #endif diff --git a/lib/libcrypto/conf/conf.h b/lib/libcrypto/conf/conf.h index 9c392a44ceb..00efc121209 100644 --- a/lib/libcrypto/conf/conf.h +++ b/lib/libcrypto/conf/conf.h @@ -59,11 +59,12 @@ #ifndef HEADER_CONF_H #define HEADER_CONF_H +#include <openssl/opensslconf.h> + #include <openssl/bio.h> #include <openssl/lhash.h> #include <openssl/stack.h> #include <openssl/safestack.h> -#include <openssl/e_os2.h> #include <openssl/ossl_typ.h> diff --git a/lib/libcrypto/crypto.h b/lib/libcrypto/crypto.h index 00d3cc2aaed..67bb46c7e54 100644 --- a/lib/libcrypto/crypto.h +++ b/lib/libcrypto/crypto.h @@ -119,7 +119,7 @@ #include <stdlib.h> -#include <openssl/e_os2.h> +#include <openssl/opensslconf.h> #ifndef OPENSSL_NO_FP_API #include <stdio.h> diff --git a/lib/libcrypto/des/des_locl.h b/lib/libcrypto/des/des_locl.h index 1a21467b3eb..cf28f59d4ad 100644 --- a/lib/libcrypto/des/des_locl.h +++ b/lib/libcrypto/des/des_locl.h @@ -59,14 +59,15 @@ #ifndef HEADER_DES_LOCL_H #define HEADER_DES_LOCL_H -#include <openssl/e_os2.h> - #include <stdio.h> #include <stdlib.h> #include <string.h> #include <unistd.h> #include <math.h> + +#include <openssl/opensslconf.h> + #include <openssl/des.h> #define ITERATIONS 16 diff --git a/lib/libcrypto/dh/dh.h b/lib/libcrypto/dh/dh.h index ea59e610ef0..36ca149b732 100644 --- a/lib/libcrypto/dh/dh.h +++ b/lib/libcrypto/dh/dh.h @@ -59,7 +59,7 @@ #ifndef HEADER_DH_H #define HEADER_DH_H -#include <openssl/e_os2.h> +#include <openssl/opensslconf.h> #ifdef OPENSSL_NO_DH #error DH is disabled. diff --git a/lib/libcrypto/dsa/dsa.h b/lib/libcrypto/dsa/dsa.h index a6f6d0b0b24..c8714992012 100644 --- a/lib/libcrypto/dsa/dsa.h +++ b/lib/libcrypto/dsa/dsa.h @@ -65,7 +65,7 @@ #ifndef HEADER_DSA_H #define HEADER_DSA_H -#include <openssl/e_os2.h> +#include <openssl/opensslconf.h> #ifdef OPENSSL_NO_DSA #error DSA is disabled. diff --git a/lib/libcrypto/err/err.h b/lib/libcrypto/err/err.h index 8facd627119..601f56a6246 100644 --- a/lib/libcrypto/err/err.h +++ b/lib/libcrypto/err/err.h @@ -112,7 +112,7 @@ #ifndef HEADER_ERR_H #define HEADER_ERR_H -#include <openssl/e_os2.h> +#include <openssl/opensslconf.h> #ifndef OPENSSL_NO_FP_API #include <stdio.h> diff --git a/lib/libcrypto/lhash/lhash.h b/lib/libcrypto/lhash/lhash.h index ea40ef184e5..187a2842436 100644 --- a/lib/libcrypto/lhash/lhash.h +++ b/lib/libcrypto/lhash/lhash.h @@ -63,7 +63,8 @@ #ifndef HEADER_LHASH_H #define HEADER_LHASH_H -#include <openssl/e_os2.h> +#include <openssl/opensslconf.h> + #ifndef OPENSSL_NO_FP_API #include <stdio.h> #endif diff --git a/lib/libcrypto/md4/md4.h b/lib/libcrypto/md4/md4.h index b241ea1e9b7..9a9f0bcb1e6 100644 --- a/lib/libcrypto/md4/md4.h +++ b/lib/libcrypto/md4/md4.h @@ -59,9 +59,10 @@ #ifndef HEADER_MD4_H #define HEADER_MD4_H -#include <openssl/e_os2.h> #include <stddef.h> +#include <openssl/opensslconf.h> + #ifdef __cplusplus extern "C" { #endif diff --git a/lib/libcrypto/md5/md5.h b/lib/libcrypto/md5/md5.h index 747bd929fd3..08004aef6e4 100644 --- a/lib/libcrypto/md5/md5.h +++ b/lib/libcrypto/md5/md5.h @@ -59,9 +59,10 @@ #ifndef HEADER_MD5_H #define HEADER_MD5_H -#include <openssl/e_os2.h> #include <stddef.h> +#include <openssl/opensslconf.h> + #ifdef __cplusplus extern "C" { #endif diff --git a/lib/libcrypto/md5/md5_locl.h b/lib/libcrypto/md5/md5_locl.h index 74d63d1f9cf..3a6dce4da77 100644 --- a/lib/libcrypto/md5/md5_locl.h +++ b/lib/libcrypto/md5/md5_locl.h @@ -58,7 +58,9 @@ #include <stdlib.h> #include <string.h> -#include <openssl/e_os2.h> + +#include <openssl/opensslconf.h> + #include <openssl/md5.h> #ifndef MD5_LONG_LOG2 diff --git a/lib/libcrypto/objects/o_names.c b/lib/libcrypto/objects/o_names.c index 9ed1de92c99..4f61b15441b 100644 --- a/lib/libcrypto/objects/o_names.c +++ b/lib/libcrypto/objects/o_names.c @@ -2,11 +2,12 @@ #include <stdlib.h> #include <string.h> +#include <openssl/opensslconf.h> + #include <openssl/err.h> #include <openssl/lhash.h> #include <openssl/objects.h> #include <openssl/safestack.h> -#include <openssl/e_os2.h> /* I use the ex_data stuff to manage the identifiers for the obj_name_types * that applications may define. I only really use the free function field. diff --git a/lib/libcrypto/ossl_typ.h b/lib/libcrypto/ossl_typ.h index 3a7a66edeff..85ba732ddd7 100644 --- a/lib/libcrypto/ossl_typ.h +++ b/lib/libcrypto/ossl_typ.h @@ -55,7 +55,7 @@ #ifndef HEADER_OPENSSL_TYPES_H #define HEADER_OPENSSL_TYPES_H -#include <openssl/e_os2.h> +#include <openssl/opensslconf.h> #ifdef NO_ASN1_TYPEDEFS #define ASN1_INTEGER ASN1_STRING diff --git a/lib/libcrypto/pem/pem.h b/lib/libcrypto/pem/pem.h index 4af2db4b3c9..38469f02df3 100644 --- a/lib/libcrypto/pem/pem.h +++ b/lib/libcrypto/pem/pem.h @@ -59,7 +59,8 @@ #ifndef HEADER_PEM_H #define HEADER_PEM_H -#include <openssl/e_os2.h> +#include <openssl/opensslconf.h> + #ifndef OPENSSL_NO_BIO #include <openssl/bio.h> #endif diff --git a/lib/libcrypto/pkcs7/pkcs7.h b/lib/libcrypto/pkcs7/pkcs7.h index 04edb22f75b..a1220aba003 100644 --- a/lib/libcrypto/pkcs7/pkcs7.h +++ b/lib/libcrypto/pkcs7/pkcs7.h @@ -59,10 +59,10 @@ #ifndef HEADER_PKCS7_H #define HEADER_PKCS7_H +#include <openssl/opensslconf.h> + #include <openssl/asn1.h> #include <openssl/bio.h> -#include <openssl/e_os2.h> - #include <openssl/ossl_typ.h> #ifdef __cplusplus diff --git a/lib/libcrypto/ripemd/ripemd.h b/lib/libcrypto/ripemd/ripemd.h index f32cfae3118..4b2132f06d0 100644 --- a/lib/libcrypto/ripemd/ripemd.h +++ b/lib/libcrypto/ripemd/ripemd.h @@ -59,9 +59,10 @@ #ifndef HEADER_RIPEMD_H #define HEADER_RIPEMD_H -#include <openssl/e_os2.h> #include <stddef.h> +#include <openssl/opensslconf.h> + #ifdef __cplusplus extern "C" { #endif diff --git a/lib/libcrypto/sha/sha.h b/lib/libcrypto/sha/sha.h index c0c3c16c08a..43c46b5e690 100644 --- a/lib/libcrypto/sha/sha.h +++ b/lib/libcrypto/sha/sha.h @@ -59,9 +59,10 @@ #ifndef HEADER_SHA_H #define HEADER_SHA_H -#include <openssl/e_os2.h> #include <stddef.h> +#include <openssl/opensslconf.h> + #ifdef __cplusplus extern "C" { #endif diff --git a/lib/libcrypto/ui/ui_lib.c b/lib/libcrypto/ui/ui_lib.c index 0d3a960052c..db0ef98b721 100644 --- a/lib/libcrypto/ui/ui_lib.c +++ b/lib/libcrypto/ui/ui_lib.c @@ -57,8 +57,11 @@ */ #include <string.h> + +#include <openssl/opensslconf.h> + #include "cryptlib.h" -#include <openssl/e_os2.h> + #include <openssl/buffer.h> #include <openssl/ui.h> #include <openssl/err.h> diff --git a/lib/libcrypto/ui/ui_openssl.c b/lib/libcrypto/ui/ui_openssl.c index 3b79ecaf029..4ad98e4d2e8 100644 --- a/lib/libcrypto/ui/ui_openssl.c +++ b/lib/libcrypto/ui/ui_openssl.c @@ -114,7 +114,7 @@ * [including the GNU Public Licence.] */ -#include <openssl/e_os2.h> +#include <openssl/opensslconf.h> #include <signal.h> #include <stdio.h> diff --git a/lib/libcrypto/whrlpool/whrlpool.h b/lib/libcrypto/whrlpool/whrlpool.h index 03c91da1155..e417bfc19e2 100644 --- a/lib/libcrypto/whrlpool/whrlpool.h +++ b/lib/libcrypto/whrlpool/whrlpool.h @@ -1,9 +1,10 @@ #ifndef HEADER_WHRLPOOL_H #define HEADER_WHRLPOOL_H -#include <openssl/e_os2.h> #include <stddef.h> +#include <openssl/opensslconf.h> + #ifdef __cplusplus extern "C" { #endif diff --git a/lib/libcrypto/x509/x509.h b/lib/libcrypto/x509/x509.h index 2b0435686af..6a29e4bd71e 100644 --- a/lib/libcrypto/x509/x509.h +++ b/lib/libcrypto/x509/x509.h @@ -64,7 +64,8 @@ #ifndef HEADER_X509_H #define HEADER_X509_H -#include <openssl/e_os2.h> +#include <openssl/opensslconf.h> + #ifndef OPENSSL_NO_BUFFER #include <openssl/buffer.h> #endif diff --git a/lib/libssl/src/crypto/aes/aes_locl.h b/lib/libssl/src/crypto/aes/aes_locl.h index ac2fbff465e..30675474440 100644 --- a/lib/libssl/src/crypto/aes/aes_locl.h +++ b/lib/libssl/src/crypto/aes/aes_locl.h @@ -52,7 +52,7 @@ #ifndef HEADER_AES_LOCL_H #define HEADER_AES_LOCL_H -#include <openssl/e_os2.h> +#include <openssl/opensslconf.h> #ifdef OPENSSL_NO_AES #error AES is disabled. diff --git a/lib/libssl/src/crypto/asn1/asn1.h b/lib/libssl/src/crypto/asn1/asn1.h index e7264ccb096..5d2a7b44186 100644 --- a/lib/libssl/src/crypto/asn1/asn1.h +++ b/lib/libssl/src/crypto/asn1/asn1.h @@ -60,7 +60,9 @@ #define HEADER_ASN1_H #include <time.h> -#include <openssl/e_os2.h> + +#include <openssl/opensslconf.h> + #ifndef OPENSSL_NO_BIO #include <openssl/bio.h> #endif diff --git a/lib/libssl/src/crypto/asn1/asn1t.h b/lib/libssl/src/crypto/asn1/asn1t.h index 21d41bc11e9..1b9d4eb40c3 100644 --- a/lib/libssl/src/crypto/asn1/asn1t.h +++ b/lib/libssl/src/crypto/asn1/asn1t.h @@ -59,7 +59,9 @@ #define HEADER_ASN1T_H #include <stddef.h> -#include <openssl/e_os2.h> + +#include <openssl/opensslconf.h> + #include <openssl/asn1.h> /* ASN1 template defines, structures and functions */ diff --git a/lib/libssl/src/crypto/bf/blowfish.h b/lib/libssl/src/crypto/bf/blowfish.h index 289c55b3af2..be71374cb26 100644 --- a/lib/libssl/src/crypto/bf/blowfish.h +++ b/lib/libssl/src/crypto/bf/blowfish.h @@ -59,7 +59,7 @@ #ifndef HEADER_BLOWFISH_H #define HEADER_BLOWFISH_H -#include <openssl/e_os2.h> +#include <openssl/opensslconf.h> #ifdef __cplusplus extern "C" { diff --git a/lib/libssl/src/crypto/bio/bio.h b/lib/libssl/src/crypto/bio/bio.h index ee3c1d5d225..67574d9fa4a 100644 --- a/lib/libssl/src/crypto/bio/bio.h +++ b/lib/libssl/src/crypto/bio/bio.h @@ -59,7 +59,7 @@ #ifndef HEADER_BIO_H #define HEADER_BIO_H -#include <openssl/e_os2.h> +#include <openssl/opensslconf.h> #ifndef OPENSSL_NO_FP_API # include <stdio.h> diff --git a/lib/libssl/src/crypto/bn/bn.h b/lib/libssl/src/crypto/bn/bn.h index 2a73bbbecc8..ce04c4d2175 100644 --- a/lib/libssl/src/crypto/bn/bn.h +++ b/lib/libssl/src/crypto/bn/bn.h @@ -125,7 +125,8 @@ #ifndef HEADER_BN_H #define HEADER_BN_H -#include <openssl/e_os2.h> +#include <openssl/opensslconf.h> + #ifndef OPENSSL_NO_FP_API #include <stdio.h> /* FILE */ #endif diff --git a/lib/libssl/src/crypto/conf/conf.h b/lib/libssl/src/crypto/conf/conf.h index 9c392a44ceb..00efc121209 100644 --- a/lib/libssl/src/crypto/conf/conf.h +++ b/lib/libssl/src/crypto/conf/conf.h @@ -59,11 +59,12 @@ #ifndef HEADER_CONF_H #define HEADER_CONF_H +#include <openssl/opensslconf.h> + #include <openssl/bio.h> #include <openssl/lhash.h> #include <openssl/stack.h> #include <openssl/safestack.h> -#include <openssl/e_os2.h> #include <openssl/ossl_typ.h> diff --git a/lib/libssl/src/crypto/crypto.h b/lib/libssl/src/crypto/crypto.h index 00d3cc2aaed..67bb46c7e54 100644 --- a/lib/libssl/src/crypto/crypto.h +++ b/lib/libssl/src/crypto/crypto.h @@ -119,7 +119,7 @@ #include <stdlib.h> -#include <openssl/e_os2.h> +#include <openssl/opensslconf.h> #ifndef OPENSSL_NO_FP_API #include <stdio.h> diff --git a/lib/libssl/src/crypto/des/des_locl.h b/lib/libssl/src/crypto/des/des_locl.h index 1a21467b3eb..cf28f59d4ad 100644 --- a/lib/libssl/src/crypto/des/des_locl.h +++ b/lib/libssl/src/crypto/des/des_locl.h @@ -59,14 +59,15 @@ #ifndef HEADER_DES_LOCL_H #define HEADER_DES_LOCL_H -#include <openssl/e_os2.h> - #include <stdio.h> #include <stdlib.h> #include <string.h> #include <unistd.h> #include <math.h> + +#include <openssl/opensslconf.h> + #include <openssl/des.h> #define ITERATIONS 16 diff --git a/lib/libssl/src/crypto/dh/dh.h b/lib/libssl/src/crypto/dh/dh.h index ea59e610ef0..36ca149b732 100644 --- a/lib/libssl/src/crypto/dh/dh.h +++ b/lib/libssl/src/crypto/dh/dh.h @@ -59,7 +59,7 @@ #ifndef HEADER_DH_H #define HEADER_DH_H -#include <openssl/e_os2.h> +#include <openssl/opensslconf.h> #ifdef OPENSSL_NO_DH #error DH is disabled. diff --git a/lib/libssl/src/crypto/dsa/dsa.h b/lib/libssl/src/crypto/dsa/dsa.h index a6f6d0b0b24..c8714992012 100644 --- a/lib/libssl/src/crypto/dsa/dsa.h +++ b/lib/libssl/src/crypto/dsa/dsa.h @@ -65,7 +65,7 @@ #ifndef HEADER_DSA_H #define HEADER_DSA_H -#include <openssl/e_os2.h> +#include <openssl/opensslconf.h> #ifdef OPENSSL_NO_DSA #error DSA is disabled. diff --git a/lib/libssl/src/crypto/err/err.h b/lib/libssl/src/crypto/err/err.h index 8facd627119..601f56a6246 100644 --- a/lib/libssl/src/crypto/err/err.h +++ b/lib/libssl/src/crypto/err/err.h @@ -112,7 +112,7 @@ #ifndef HEADER_ERR_H #define HEADER_ERR_H -#include <openssl/e_os2.h> +#include <openssl/opensslconf.h> #ifndef OPENSSL_NO_FP_API #include <stdio.h> diff --git a/lib/libssl/src/crypto/lhash/lhash.h b/lib/libssl/src/crypto/lhash/lhash.h index ea40ef184e5..187a2842436 100644 --- a/lib/libssl/src/crypto/lhash/lhash.h +++ b/lib/libssl/src/crypto/lhash/lhash.h @@ -63,7 +63,8 @@ #ifndef HEADER_LHASH_H #define HEADER_LHASH_H -#include <openssl/e_os2.h> +#include <openssl/opensslconf.h> + #ifndef OPENSSL_NO_FP_API #include <stdio.h> #endif diff --git a/lib/libssl/src/crypto/md4/md4.h b/lib/libssl/src/crypto/md4/md4.h index b241ea1e9b7..9a9f0bcb1e6 100644 --- a/lib/libssl/src/crypto/md4/md4.h +++ b/lib/libssl/src/crypto/md4/md4.h @@ -59,9 +59,10 @@ #ifndef HEADER_MD4_H #define HEADER_MD4_H -#include <openssl/e_os2.h> #include <stddef.h> +#include <openssl/opensslconf.h> + #ifdef __cplusplus extern "C" { #endif diff --git a/lib/libssl/src/crypto/md5/md5.h b/lib/libssl/src/crypto/md5/md5.h index 747bd929fd3..08004aef6e4 100644 --- a/lib/libssl/src/crypto/md5/md5.h +++ b/lib/libssl/src/crypto/md5/md5.h @@ -59,9 +59,10 @@ #ifndef HEADER_MD5_H #define HEADER_MD5_H -#include <openssl/e_os2.h> #include <stddef.h> +#include <openssl/opensslconf.h> + #ifdef __cplusplus extern "C" { #endif diff --git a/lib/libssl/src/crypto/md5/md5_locl.h b/lib/libssl/src/crypto/md5/md5_locl.h index 74d63d1f9cf..3a6dce4da77 100644 --- a/lib/libssl/src/crypto/md5/md5_locl.h +++ b/lib/libssl/src/crypto/md5/md5_locl.h @@ -58,7 +58,9 @@ #include <stdlib.h> #include <string.h> -#include <openssl/e_os2.h> + +#include <openssl/opensslconf.h> + #include <openssl/md5.h> #ifndef MD5_LONG_LOG2 diff --git a/lib/libssl/src/crypto/objects/o_names.c b/lib/libssl/src/crypto/objects/o_names.c index 9ed1de92c99..4f61b15441b 100644 --- a/lib/libssl/src/crypto/objects/o_names.c +++ b/lib/libssl/src/crypto/objects/o_names.c @@ -2,11 +2,12 @@ #include <stdlib.h> #include <string.h> +#include <openssl/opensslconf.h> + #include <openssl/err.h> #include <openssl/lhash.h> #include <openssl/objects.h> #include <openssl/safestack.h> -#include <openssl/e_os2.h> /* I use the ex_data stuff to manage the identifiers for the obj_name_types * that applications may define. I only really use the free function field. diff --git a/lib/libssl/src/crypto/ossl_typ.h b/lib/libssl/src/crypto/ossl_typ.h index 3a7a66edeff..85ba732ddd7 100644 --- a/lib/libssl/src/crypto/ossl_typ.h +++ b/lib/libssl/src/crypto/ossl_typ.h @@ -55,7 +55,7 @@ #ifndef HEADER_OPENSSL_TYPES_H #define HEADER_OPENSSL_TYPES_H -#include <openssl/e_os2.h> +#include <openssl/opensslconf.h> #ifdef NO_ASN1_TYPEDEFS #define ASN1_INTEGER ASN1_STRING diff --git a/lib/libssl/src/crypto/pem/pem.h b/lib/libssl/src/crypto/pem/pem.h index 4af2db4b3c9..38469f02df3 100644 --- a/lib/libssl/src/crypto/pem/pem.h +++ b/lib/libssl/src/crypto/pem/pem.h @@ -59,7 +59,8 @@ #ifndef HEADER_PEM_H #define HEADER_PEM_H -#include <openssl/e_os2.h> +#include <openssl/opensslconf.h> + #ifndef OPENSSL_NO_BIO #include <openssl/bio.h> #endif diff --git a/lib/libssl/src/crypto/pkcs7/pkcs7.h b/lib/libssl/src/crypto/pkcs7/pkcs7.h index 04edb22f75b..a1220aba003 100644 --- a/lib/libssl/src/crypto/pkcs7/pkcs7.h +++ b/lib/libssl/src/crypto/pkcs7/pkcs7.h @@ -59,10 +59,10 @@ #ifndef HEADER_PKCS7_H #define HEADER_PKCS7_H +#include <openssl/opensslconf.h> + #include <openssl/asn1.h> #include <openssl/bio.h> -#include <openssl/e_os2.h> - #include <openssl/ossl_typ.h> #ifdef __cplusplus diff --git a/lib/libssl/src/crypto/ripemd/ripemd.h b/lib/libssl/src/crypto/ripemd/ripemd.h index f32cfae3118..4b2132f06d0 100644 --- a/lib/libssl/src/crypto/ripemd/ripemd.h +++ b/lib/libssl/src/crypto/ripemd/ripemd.h @@ -59,9 +59,10 @@ #ifndef HEADER_RIPEMD_H #define HEADER_RIPEMD_H -#include <openssl/e_os2.h> #include <stddef.h> +#include <openssl/opensslconf.h> + #ifdef __cplusplus extern "C" { #endif diff --git a/lib/libssl/src/crypto/sha/sha.h b/lib/libssl/src/crypto/sha/sha.h index c0c3c16c08a..43c46b5e690 100644 --- a/lib/libssl/src/crypto/sha/sha.h +++ b/lib/libssl/src/crypto/sha/sha.h @@ -59,9 +59,10 @@ #ifndef HEADER_SHA_H #define HEADER_SHA_H -#include <openssl/e_os2.h> #include <stddef.h> +#include <openssl/opensslconf.h> + #ifdef __cplusplus extern "C" { #endif diff --git a/lib/libssl/src/crypto/ui/ui_lib.c b/lib/libssl/src/crypto/ui/ui_lib.c index 0d3a960052c..db0ef98b721 100644 --- a/lib/libssl/src/crypto/ui/ui_lib.c +++ b/lib/libssl/src/crypto/ui/ui_lib.c @@ -57,8 +57,11 @@ */ #include <string.h> + +#include <openssl/opensslconf.h> + #include "cryptlib.h" -#include <openssl/e_os2.h> + #include <openssl/buffer.h> #include <openssl/ui.h> #include <openssl/err.h> diff --git a/lib/libssl/src/crypto/ui/ui_openssl.c b/lib/libssl/src/crypto/ui/ui_openssl.c index 3b79ecaf029..4ad98e4d2e8 100644 --- a/lib/libssl/src/crypto/ui/ui_openssl.c +++ b/lib/libssl/src/crypto/ui/ui_openssl.c @@ -114,7 +114,7 @@ * [including the GNU Public Licence.] */ -#include <openssl/e_os2.h> +#include <openssl/opensslconf.h> #include <signal.h> #include <stdio.h> diff --git a/lib/libssl/src/crypto/whrlpool/whrlpool.h b/lib/libssl/src/crypto/whrlpool/whrlpool.h index 03c91da1155..e417bfc19e2 100644 --- a/lib/libssl/src/crypto/whrlpool/whrlpool.h +++ b/lib/libssl/src/crypto/whrlpool/whrlpool.h @@ -1,9 +1,10 @@ #ifndef HEADER_WHRLPOOL_H #define HEADER_WHRLPOOL_H -#include <openssl/e_os2.h> #include <stddef.h> +#include <openssl/opensslconf.h> + #ifdef __cplusplus extern "C" { #endif diff --git a/lib/libssl/src/crypto/x509/x509.h b/lib/libssl/src/crypto/x509/x509.h index 2b0435686af..6a29e4bd71e 100644 --- a/lib/libssl/src/crypto/x509/x509.h +++ b/lib/libssl/src/crypto/x509/x509.h @@ -64,7 +64,8 @@ #ifndef HEADER_X509_H #define HEADER_X509_H -#include <openssl/e_os2.h> +#include <openssl/opensslconf.h> + #ifndef OPENSSL_NO_BUFFER #include <openssl/buffer.h> #endif |