From: Richard Levitte Date: Fri, 4 Feb 2022 14:13:01 +0000 (+0100) Subject: Move e_os.h to include/internal X-Git-Tag: openssl-3.2.0-alpha1~2976 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d5f9166bacfb3757dfd6117310ad54ab749b11f9;p=thirdparty%2Fopenssl.git Move e_os.h to include/internal Including e_os.h with a path from a header file doesn't work well on certain exotic platform. It simply fails to build. Since we don't seem to be able to stop ourselves, the better move is to move e_os.h to an include directory that's part of the inclusion path given to the compiler. Reviewed-by: Paul Dale (Merged from https://github.com/openssl/openssl/pull/17641) --- diff --git a/apps/include/apps.h b/apps/include/apps.h index b6dbe74fa91..28c2bbdad24 100644 --- a/apps/include/apps.h +++ b/apps/include/apps.h @@ -10,7 +10,7 @@ #ifndef OSSL_APPS_H # define OSSL_APPS_H -# include "e_os.h" /* struct timeval for DTLS */ +# include "internal/e_os.h" /* struct timeval for DTLS */ # include "internal/common.h" /* for HAS_PREFIX */ # include "internal/nelem.h" # include "internal/sockets.h" /* for openssl_fdset() */ diff --git a/apps/s_client.c b/apps/s_client.c index 1d73e1b39ec..06a58a8b519 100644 --- a/apps/s_client.c +++ b/apps/s_client.c @@ -8,7 +8,7 @@ * https://www.openssl.org/source/license.html */ -#include "e_os.h" +#include "internal/e_os.h" #include #include #include diff --git a/crypto/asn1/ameth_lib.c b/crypto/asn1/ameth_lib.c index 031a6c936ad..97044926076 100644 --- a/crypto/asn1/ameth_lib.c +++ b/crypto/asn1/ameth_lib.c @@ -10,7 +10,7 @@ /* We need to use some engine deprecated APIs */ #define OPENSSL_SUPPRESS_DEPRECATED -#include "e_os.h" /* for strncasecmp */ +#include "internal/e_os.h" /* for strncasecmp */ #include "internal/cryptlib.h" #include #include diff --git a/crypto/asn1/asn1_gen.c b/crypto/asn1/asn1_gen.c index bb0dcb2e098..a112f7de9e8 100644 --- a/crypto/asn1/asn1_gen.c +++ b/crypto/asn1/asn1_gen.c @@ -10,7 +10,7 @@ #include "internal/cryptlib.h" #include #include -#include "e_os.h" /* strncasecmp() */ +#include "internal/e_os.h" /* strncasecmp() */ #define ASN1_GEN_FLAG 0x10000 #define ASN1_GEN_FLAG_IMP (ASN1_GEN_FLAG|1) diff --git a/crypto/bio/bio_local.h b/crypto/bio/bio_local.h index 749e8f810c3..6ba0196ce62 100644 --- a/crypto/bio/bio_local.h +++ b/crypto/bio/bio_local.h @@ -7,7 +7,7 @@ * https://www.openssl.org/source/license.html */ -#include "e_os.h" +#include "internal/e_os.h" #include "internal/sockets.h" /* BEGIN BIO_ADDRINFO/BIO_ADDR stuff. */ diff --git a/crypto/bio/bss_bio.c b/crypto/bio/bss_bio.c index 92dd2623091..aaac4513140 100644 --- a/crypto/bio/bss_bio.c +++ b/crypto/bio/bss_bio.c @@ -15,7 +15,7 @@ * See ssl/ssltest.c for some hints on how this can be used. */ -#include "e_os.h" +#include "internal/e_os.h" #include #include #include diff --git a/crypto/cmp/cmp_client.c b/crypto/cmp/cmp_client.c index 4a7a87ff742..0ca7f94a86e 100644 --- a/crypto/cmp/cmp_client.c +++ b/crypto/cmp/cmp_client.c @@ -11,7 +11,7 @@ #include "cmp_local.h" #include "internal/cryptlib.h" -#include "e_os.h" /* ossl_sleep() */ +#include "internal/e_os.h" /* ossl_sleep() */ /* explicit #includes not strictly needed since implied by the above: */ #include diff --git a/crypto/conf/conf_api.c b/crypto/conf/conf_api.c index 7a4efe6dbb2..37e66af78ea 100644 --- a/crypto/conf/conf_api.c +++ b/crypto/conf/conf_api.c @@ -9,7 +9,7 @@ /* Part of the code in here was originally in conf.c, which is now removed */ -#include "e_os.h" +#include "internal/e_os.h" #include "internal/cryptlib.h" #include #include diff --git a/crypto/conf/conf_def.c b/crypto/conf/conf_def.c index 26764dad004..9d79a900c84 100644 --- a/crypto/conf/conf_def.c +++ b/crypto/conf/conf_def.c @@ -11,7 +11,7 @@ #include #include -#include "e_os.h" /* strcasecmp and struct stat */ +#include "internal/e_os.h" /* strcasecmp and struct stat */ #ifdef __TANDEM # include /* needed for stat.h */ # include /* struct stat */ diff --git a/crypto/conf/conf_lib.c b/crypto/conf/conf_lib.c index a2360035257..fe08e0af5f7 100644 --- a/crypto/conf/conf_lib.c +++ b/crypto/conf/conf_lib.c @@ -7,7 +7,7 @@ * https://www.openssl.org/source/license.html */ -#include "e_os.h" +#include "internal/e_os.h" #include #include #include "internal/conf.h" diff --git a/crypto/core_namemap.c b/crypto/core_namemap.c index 6cb0ec5a06f..f058e629f3b 100644 --- a/crypto/core_namemap.c +++ b/crypto/core_namemap.c @@ -7,7 +7,7 @@ * https://www.openssl.org/source/license.html */ -#include "e_os.h" /* strcasecmp */ +#include "internal/e_os.h" /* strcasecmp */ #include "internal/namemap.h" #include #include "crypto/lhash.h" /* ossl_lh_strcasehash */ diff --git a/crypto/cpuid.c b/crypto/cpuid.c index 048689f410a..75bd03bffea 100644 --- a/crypto/cpuid.c +++ b/crypto/cpuid.c @@ -7,7 +7,7 @@ * https://www.openssl.org/source/license.html */ -#include "e_os.h" +#include "internal/e_os.h" #include "crypto/cryptlib.h" #if defined(__i386) || defined(__i386__) || defined(_M_IX86) || \ diff --git a/crypto/cryptlib.c b/crypto/cryptlib.c index 6e73b8352ca..f78c2236e4d 100644 --- a/crypto/cryptlib.c +++ b/crypto/cryptlib.c @@ -8,7 +8,7 @@ * https://www.openssl.org/source/license.html */ -#include "e_os.h" +#include "internal/e_os.h" #include "crypto/cryptlib.h" #include diff --git a/crypto/des/cfb_enc.c b/crypto/des/cfb_enc.c index 30458d50a12..e8813755bf6 100644 --- a/crypto/des/cfb_enc.c +++ b/crypto/des/cfb_enc.c @@ -13,7 +13,7 @@ */ #include "internal/deprecated.h" -#include "e_os.h" +#include "internal/e_os.h" #include "des_local.h" #include diff --git a/crypto/dh/dh_group_params.c b/crypto/dh/dh_group_params.c index c71f4053da6..dec50caf665 100644 --- a/crypto/dh/dh_group_params.c +++ b/crypto/dh/dh_group_params.c @@ -23,7 +23,7 @@ #include #include "internal/nelem.h" #include "crypto/dh.h" -#include "e_os.h" /* strcasecmp */ +#include "internal/e_os.h" /* strcasecmp */ static DH *dh_param_init(OSSL_LIB_CTX *libctx, const DH_NAMED_GROUP *group) { diff --git a/crypto/dh/dh_kdf.c b/crypto/dh/dh_kdf.c index 419e7711d36..eda3d3998ad 100644 --- a/crypto/dh/dh_kdf.c +++ b/crypto/dh/dh_kdf.c @@ -13,8 +13,8 @@ */ #include "internal/deprecated.h" -#include "e_os.h" -#include "e_os.h" +#include "internal/e_os.h" +#include "internal/e_os.h" #include #include #include diff --git a/crypto/dllmain.c b/crypto/dllmain.c index 48c0cd31227..65d9be67673 100644 --- a/crypto/dllmain.c +++ b/crypto/dllmain.c @@ -7,7 +7,7 @@ * https://www.openssl.org/source/license.html */ -#include "e_os.h" +#include "internal/e_os.h" #include "crypto/cryptlib.h" #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/crypto/dso/dso_dlfcn.c b/crypto/dso/dso_dlfcn.c index 6a988cc7279..982b117e700 100644 --- a/crypto/dso/dso_dlfcn.c +++ b/crypto/dso/dso_dlfcn.c @@ -17,7 +17,7 @@ #endif #include "dso_local.h" -#include "e_os.h" +#include "internal/e_os.h" #ifdef DSO_DLFCN diff --git a/crypto/dso/dso_win32.c b/crypto/dso/dso_win32.c index 4d3059d4387..08ad8f46b3d 100644 --- a/crypto/dso/dso_win32.c +++ b/crypto/dso/dso_win32.c @@ -7,7 +7,7 @@ * https://www.openssl.org/source/license.html */ -#include "e_os.h" +#include "internal/e_os.h" #include "dso_local.h" #if defined(DSO_WIN32) diff --git a/crypto/ec/curve448/arch_32/f_impl32.c b/crypto/ec/curve448/arch_32/f_impl32.c index 8714a514221..45d55873471 100644 --- a/crypto/ec/curve448/arch_32/f_impl32.c +++ b/crypto/ec/curve448/arch_32/f_impl32.c @@ -10,7 +10,7 @@ * Originally written by Mike Hamburg */ -#include "e_os.h" +#include "internal/e_os.h" #include #include "internal/numbers.h" diff --git a/crypto/ec/curve448/arch_64/f_impl64.c b/crypto/ec/curve448/arch_64/f_impl64.c index 8f7a7dd391b..10a9b065e55 100644 --- a/crypto/ec/curve448/arch_64/f_impl64.c +++ b/crypto/ec/curve448/arch_64/f_impl64.c @@ -10,7 +10,7 @@ * Originally written by Mike Hamburg */ -#include "e_os.h" +#include "internal/e_os.h" #include #include "internal/numbers.h" diff --git a/crypto/ec/ec_backend.c b/crypto/ec/ec_backend.c index 2db1c1380e8..d2fff0657de 100644 --- a/crypto/ec/ec_backend.c +++ b/crypto/ec/ec_backend.c @@ -24,7 +24,7 @@ #include "crypto/bn.h" #include "crypto/ec.h" #include "ec_local.h" -#include "e_os.h" +#include "internal/e_os.h" #include "internal/param_build_set.h" /* Mapping between a flag and a name */ diff --git a/crypto/ec/ec_lib.c b/crypto/ec/ec_lib.c index 2d85d4f23a2..2aeab7e3b6b 100644 --- a/crypto/ec/ec_lib.c +++ b/crypto/ec/ec_lib.c @@ -22,7 +22,7 @@ #include "crypto/ec.h" #include "internal/nelem.h" #include "ec_local.h" -#include "e_os.h" /* strcasecmp */ +#include "internal/e_os.h" /* strcasecmp */ /* functions for EC_GROUP objects */ diff --git a/crypto/encode_decode/decoder_lib.c b/crypto/encode_decode/decoder_lib.c index 10a38b6f82a..9242cd2c6f3 100644 --- a/crypto/encode_decode/decoder_lib.c +++ b/crypto/encode_decode/decoder_lib.c @@ -20,7 +20,7 @@ #include "internal/provider.h" #include "crypto/decoder.h" #include "encoder_local.h" -#include "e_os.h" +#include "internal/e_os.h" struct decoder_process_data_st { OSSL_DECODER_CTX *ctx; diff --git a/crypto/encode_decode/decoder_pkey.c b/crypto/encode_decode/decoder_pkey.c index 475117a463a..472abef3116 100644 --- a/crypto/encode_decode/decoder_pkey.c +++ b/crypto/encode_decode/decoder_pkey.c @@ -18,7 +18,7 @@ #include "crypto/evp.h" #include "crypto/decoder.h" #include "encoder_local.h" -#include "e_os.h" /* strcasecmp on Windows */ +#include "internal/e_os.h" /* strcasecmp on Windows */ int OSSL_DECODER_CTX_set_passphrase(OSSL_DECODER_CTX *ctx, const unsigned char *kstr, diff --git a/crypto/encode_decode/encoder_lib.c b/crypto/encode_decode/encoder_lib.c index 8d083bd6a64..52cc404097e 100644 --- a/crypto/encode_decode/encoder_lib.c +++ b/crypto/encode_decode/encoder_lib.c @@ -7,7 +7,7 @@ * https://www.openssl.org/source/license.html */ -#include "e_os.h" /* strcasecmp on Windows */ +#include "internal/e_os.h" /* strcasecmp on Windows */ #include #include #include diff --git a/crypto/encode_decode/encoder_pkey.c b/crypto/encode_decode/encoder_pkey.c index 109dfa80cd8..ba29da6385e 100644 --- a/crypto/encode_decode/encoder_pkey.c +++ b/crypto/encode_decode/encoder_pkey.c @@ -7,7 +7,7 @@ * https://www.openssl.org/source/license.html */ -#include "e_os.h" /* strcasecmp on Windows */ +#include "internal/e_os.h" /* strcasecmp on Windows */ #include #include #include diff --git a/crypto/engine/eng_init.c b/crypto/engine/eng_init.c index c204eb18998..343a069fa0e 100644 --- a/crypto/engine/eng_init.c +++ b/crypto/engine/eng_init.c @@ -10,7 +10,7 @@ /* We need to use some engine deprecated APIs */ #define OPENSSL_SUPPRESS_DEPRECATED -#include "e_os.h" +#include "internal/e_os.h" #include "eng_local.h" /* diff --git a/crypto/engine/eng_lib.c b/crypto/engine/eng_lib.c index 05c6a67c1e1..813bcd6df6f 100644 --- a/crypto/engine/eng_lib.c +++ b/crypto/engine/eng_lib.c @@ -7,7 +7,7 @@ * https://www.openssl.org/source/license.html */ -#include "e_os.h" +#include "internal/e_os.h" #include "eng_local.h" #include #include "internal/refcount.h" diff --git a/crypto/engine/tb_asnmth.c b/crypto/engine/tb_asnmth.c index e3a5c82e995..bf424ff09eb 100644 --- a/crypto/engine/tb_asnmth.c +++ b/crypto/engine/tb_asnmth.c @@ -10,7 +10,7 @@ /* We need to use some engine deprecated APIs */ #define OPENSSL_SUPPRESS_DEPRECATED -#include "e_os.h" +#include "internal/e_os.h" #include "eng_local.h" #include #include "crypto/asn1.h" diff --git a/crypto/err/err.c b/crypto/err/err.c index 63cf682382c..04eaf43b727 100644 --- a/crypto/err/err.c +++ b/crypto/err/err.c @@ -23,7 +23,7 @@ #include "internal/thread_once.h" #include "crypto/ctype.h" #include "internal/constant_time.h" -#include "e_os.h" +#include "internal/e_os.h" #include "err_local.h" /* Forward declaration in case it's not published because of configuration */ diff --git a/crypto/evp/ctrl_params_translate.c b/crypto/evp/ctrl_params_translate.c index 2deb1d9b475..33e5e7f1892 100644 --- a/crypto/evp/ctrl_params_translate.c +++ b/crypto/evp/ctrl_params_translate.c @@ -37,7 +37,7 @@ #include "crypto/dh.h" #include "crypto/ec.h" -#include "e_os.h" /* strcasecmp() for Windows */ +#include "internal/e_os.h" /* strcasecmp() for Windows */ struct translation_ctx_st; /* Forwarding */ struct translation_st; /* Forwarding */ diff --git a/crypto/evp/ec_support.c b/crypto/evp/ec_support.c index 8550be65e78..979e861cffe 100644 --- a/crypto/evp/ec_support.c +++ b/crypto/evp/ec_support.c @@ -10,7 +10,7 @@ #include #include #include "crypto/ec.h" -#include "e_os.h" /* strcasecmp required by windows */ +#include "internal/e_os.h" /* strcasecmp required by windows */ typedef struct ec_name2nid_st { const char *name; diff --git a/crypto/evp/evp_lib.c b/crypto/evp/evp_lib.c index 24092cfd5be..3d261c282fd 100644 --- a/crypto/evp/evp_lib.c +++ b/crypto/evp/evp_lib.c @@ -15,7 +15,7 @@ #include #include -#include "e_os.h" /* strcasecmp */ +#include "internal/e_os.h" /* strcasecmp */ #include "internal/cryptlib.h" #include #include diff --git a/crypto/evp/p_lib.c b/crypto/evp/p_lib.c index 27138af5642..be15f105b7c 100644 --- a/crypto/evp/p_lib.c +++ b/crypto/evp/p_lib.c @@ -50,7 +50,7 @@ #include "internal/provider.h" #include "evp_local.h" -#include "e_os.h" /* strcasecmp on Windows */ +#include "internal/e_os.h" /* strcasecmp on Windows */ static int pkey_set_type(EVP_PKEY *pkey, ENGINE *e, int type, const char *str, int len, EVP_KEYMGMT *keymgmt); diff --git a/crypto/ffc/ffc_dh.c b/crypto/ffc/ffc_dh.c index e9f597c46c0..cedf283533b 100644 --- a/crypto/ffc/ffc_dh.c +++ b/crypto/ffc/ffc_dh.c @@ -10,7 +10,7 @@ #include "internal/ffc.h" #include "internal/nelem.h" #include "crypto/bn_dh.h" -#include "e_os.h" /* strcasecmp */ +#include "internal/e_os.h" /* strcasecmp */ #ifndef OPENSSL_NO_DH diff --git a/crypto/ffc/ffc_params.c b/crypto/ffc/ffc_params.c index 6e025a06be6..1078a7b845f 100644 --- a/crypto/ffc/ffc_params.c +++ b/crypto/ffc/ffc_params.c @@ -12,7 +12,7 @@ #include "internal/ffc.h" #include "internal/param_build_set.h" #include "internal/nelem.h" -#include "e_os.h" /* strcasecmp */ +#include "internal/e_os.h" /* strcasecmp */ #ifndef FIPS_MODULE # include /* ossl_ffc_params_print */ diff --git a/crypto/getenv.c b/crypto/getenv.c index e79b6cc1618..b263d1b6247 100644 --- a/crypto/getenv.c +++ b/crypto/getenv.c @@ -13,7 +13,7 @@ #include #include "internal/cryptlib.h" -#include "e_os.h" +#include "internal/e_os.h" char *ossl_safe_getenv(const char *name) { diff --git a/crypto/http/http_client.c b/crypto/http/http_client.c index 14c2cbf2b5a..d6345b45822 100644 --- a/crypto/http/http_client.c +++ b/crypto/http/http_client.c @@ -8,7 +8,7 @@ * https://www.openssl.org/source/license.html */ -#include "e_os.h" +#include "internal/e_os.h" #include #include #include "crypto/ctype.h" diff --git a/crypto/info.c b/crypto/info.c index f3bef56b136..05edbc3fc8b 100644 --- a/crypto/info.c +++ b/crypto/info.c @@ -12,7 +12,7 @@ #include "crypto/dso_conf.h" #include "internal/thread_once.h" #include "internal/cryptlib.h" -#include "e_os.h" +#include "internal/e_os.h" #include "buildinf.h" #if defined(__arm__) || defined(__arm) || defined(__aarch64__) diff --git a/crypto/init.c b/crypto/init.c index 6a27d1a8e44..b7d7ad0ea35 100644 --- a/crypto/init.c +++ b/crypto/init.c @@ -10,7 +10,7 @@ /* We need to use some engine deprecated APIs */ #define OPENSSL_SUPPRESS_DEPRECATED -#include "e_os.h" +#include "internal/e_os.h" #include "crypto/cryptlib.h" #include #include "crypto/rand.h" diff --git a/crypto/mem.c b/crypto/mem.c index 242d88470ae..f76c48d8867 100644 --- a/crypto/mem.c +++ b/crypto/mem.c @@ -7,7 +7,7 @@ * https://www.openssl.org/source/license.html */ -#include "e_os.h" +#include "internal/e_os.h" #include "internal/cryptlib.h" #include "crypto/cryptlib.h" #include diff --git a/crypto/mem_sec.c b/crypto/mem_sec.c index c2cc2cbf324..4806102805f 100644 --- a/crypto/mem_sec.c +++ b/crypto/mem_sec.c @@ -15,7 +15,7 @@ * For details on that implementation, see below (look for uppercase * "SECURE HEAP IMPLEMENTATION"). */ -#include "e_os.h" +#include "internal/e_os.h" #include #include diff --git a/crypto/o_dir.c b/crypto/o_dir.c index 6857a2e17d4..87723479301 100644 --- a/crypto/o_dir.c +++ b/crypto/o_dir.c @@ -7,7 +7,7 @@ * https://www.openssl.org/source/license.html */ -#include "e_os.h" +#include "internal/e_os.h" #include /* diff --git a/crypto/o_fopen.c b/crypto/o_fopen.c index 8095fffbe0c..f449c3ec1d1 100644 --- a/crypto/o_fopen.c +++ b/crypto/o_fopen.c @@ -25,7 +25,7 @@ # endif # endif -#include "e_os.h" +#include "internal/e_os.h" #include "internal/cryptlib.h" #if !defined(OPENSSL_NO_STDIO) diff --git a/crypto/o_init.c b/crypto/o_init.c index a0b4256f78f..30c19b81e81 100644 --- a/crypto/o_init.c +++ b/crypto/o_init.c @@ -7,7 +7,7 @@ * https://www.openssl.org/source/license.html */ -#include "e_os.h" +#include "internal/e_os.h" #include /* diff --git a/crypto/o_str.c b/crypto/o_str.c index d7aa665ad8f..649a669d25d 100644 --- a/crypto/o_str.c +++ b/crypto/o_str.c @@ -7,7 +7,7 @@ * https://www.openssl.org/source/license.html */ -#include "e_os.h" +#include "internal/e_os.h" #include #include #include "internal/cryptlib.h" diff --git a/crypto/objects/o_names.c b/crypto/objects/o_names.c index 92152eeb667..82fbc3bf96a 100644 --- a/crypto/objects/o_names.c +++ b/crypto/objects/o_names.c @@ -19,7 +19,7 @@ #include "internal/thread_once.h" #include "crypto/lhash.h" #include "obj_local.h" -#include "e_os.h" +#include "internal/e_os.h" /* * We define this wrapper for two reasons. Firstly, later versions of diff --git a/crypto/params_dup.c b/crypto/params_dup.c index 530bc530cc0..3c3b18e6207 100644 --- a/crypto/params_dup.c +++ b/crypto/params_dup.c @@ -11,7 +11,7 @@ #include #include #include "internal/param_build_set.h" -#include "e_os.h" /* strcasecmp */ +#include "internal/e_os.h" /* strcasecmp */ #define OSSL_PARAM_ALLOCATED_END 127 #define OSSL_PARAM_MERGE_LIST_MAX 128 diff --git a/crypto/property/property_parse.c b/crypto/property/property_parse.c index dc35646be2e..4b99ee1f394 100644 --- a/crypto/property/property_parse.c +++ b/crypto/property/property_parse.c @@ -17,7 +17,7 @@ #include "crypto/ctype.h" #include "internal/nelem.h" #include "property_local.h" -#include "e_os.h" +#include "internal/e_os.h" DEFINE_STACK_OF(OSSL_PROPERTY_DEFINITION) diff --git a/crypto/rand/rand_deprecated.c b/crypto/rand/rand_deprecated.c index dd69f1beb72..a6bc2a99e3b 100644 --- a/crypto/rand/rand_deprecated.c +++ b/crypto/rand/rand_deprecated.c @@ -7,7 +7,7 @@ * https://www.openssl.org/source/license.html */ -#include +#include "internal/e_os.h" #include #include diff --git a/crypto/rand/rand_lib.c b/crypto/rand/rand_lib.c index 30b6cb817f4..4f36e84bd45 100644 --- a/crypto/rand/rand_lib.c +++ b/crypto/rand/rand_lib.c @@ -28,7 +28,7 @@ # include # include "crypto/rand_pool.h" # include "prov/seeding.h" -# include "e_os.h" +# include "internal/e_os.h" # ifndef OPENSSL_NO_ENGINE /* non-NULL if default_RAND_meth is ENGINE-provided */ diff --git a/crypto/rsa/rsa_backend.c b/crypto/rsa/rsa_backend.c index 4385dd01359..a0e1e14e4d6 100644 --- a/crypto/rsa/rsa_backend.c +++ b/crypto/rsa/rsa_backend.c @@ -27,7 +27,7 @@ #include "crypto/rsa.h" #include "rsa_local.h" -#include "e_os.h" /* strcasecmp for Windows() */ +#include "internal/e_os.h" /* strcasecmp for Windows() */ /* * The intention with the "backend" source file is to offer backend support diff --git a/crypto/store/store_lib.c b/crypto/store/store_lib.c index 4efa7eea038..81e0f70a191 100644 --- a/crypto/store/store_lib.c +++ b/crypto/store/store_lib.c @@ -14,7 +14,7 @@ /* We need to use some STORE deprecated APIs */ #define OPENSSL_SUPPRESS_DEPRECATED -#include "e_os.h" +#include "internal/e_os.h" #include #include diff --git a/crypto/store/store_result.c b/crypto/store/store_result.c index de00f4f5628..567b9c99cd6 100644 --- a/crypto/store/store_result.c +++ b/crypto/store/store_result.c @@ -7,7 +7,7 @@ * https://www.openssl.org/source/license.html */ -#include "e_os.h" +#include "internal/e_os.h" #include #include diff --git a/crypto/trace.c b/crypto/trace.c index dc194acb525..a9a097f1a31 100644 --- a/crypto/trace.c +++ b/crypto/trace.c @@ -19,7 +19,7 @@ #include "internal/refcount.h" #include "crypto/cryptlib.h" -#include "e_os.h" /* strcasecmp for Windows */ +#include "internal/e_os.h" /* strcasecmp for Windows */ #ifndef OPENSSL_NO_TRACE diff --git a/crypto/ts/ts_rsp_sign.c b/crypto/ts/ts_rsp_sign.c index cf3e5443dee..99b2228a068 100644 --- a/crypto/ts/ts_rsp_sign.c +++ b/crypto/ts/ts_rsp_sign.c @@ -7,7 +7,7 @@ * https://www.openssl.org/source/license.html */ -#include "e_os.h" +#include "internal/e_os.h" #include #include diff --git a/crypto/ui/ui_openssl.c b/crypto/ui/ui_openssl.c index 37b98910c7c..fc5b12b03d7 100644 --- a/crypto/ui/ui_openssl.c +++ b/crypto/ui/ui_openssl.c @@ -7,7 +7,7 @@ * https://www.openssl.org/source/license.html */ -#include "e_os.h" +#include "internal/e_os.h" #include #include #include diff --git a/crypto/x509/by_dir.c b/crypto/x509/by_dir.c index 258ad518525..599d5463bb0 100644 --- a/crypto/x509/by_dir.c +++ b/crypto/x509/by_dir.c @@ -16,7 +16,7 @@ # include #endif -#include "e_os.h" +#include "internal/e_os.h" #include "internal/cryptlib.h" #include #include diff --git a/crypto/x509/v3_tlsf.c b/crypto/x509/v3_tlsf.c index 6a613d64e6a..32ac300355c 100644 --- a/crypto/x509/v3_tlsf.c +++ b/crypto/x509/v3_tlsf.c @@ -7,7 +7,7 @@ * https://www.openssl.org/source/license.html */ -#include "e_os.h" +#include "internal/e_os.h" #include "internal/cryptlib.h" #include #include diff --git a/crypto/x509/v3_utl.c b/crypto/x509/v3_utl.c index 72d4d3867d8..0687ffabc9a 100644 --- a/crypto/x509/v3_utl.c +++ b/crypto/x509/v3_utl.c @@ -9,7 +9,7 @@ /* X509 v3 extension utilities */ -#include "e_os.h" +#include "internal/e_os.h" #include "internal/cryptlib.h" #include #include diff --git a/engines/e_devcrypto.c b/engines/e_devcrypto.c index adf53d8d91d..abc2930fb09 100644 --- a/engines/e_devcrypto.c +++ b/engines/e_devcrypto.c @@ -10,7 +10,7 @@ /* We need to use some deprecated APIs */ #define OPENSSL_SUPPRESS_DEPRECATED -#include "../e_os.h" +#include "internal/e_os.h" #include #include #include diff --git a/engines/e_loader_attic.c b/engines/e_loader_attic.c index e2a5474c1ce..be36c6e3971 100644 --- a/engines/e_loader_attic.c +++ b/engines/e_loader_attic.c @@ -14,7 +14,7 @@ /* We need to use some engine deprecated APIs */ #define OPENSSL_SUPPRESS_DEPRECATED -#include "../e_os.h" /* for stat and strncasecmp */ +#include "internal/e_os.h" /* for stat and strncasecmp */ #include #include #include diff --git a/include/internal/common.h b/include/internal/common.h index 44224f3ba8a..f20b041ac0f 100644 --- a/include/internal/common.h +++ b/include/internal/common.h @@ -13,7 +13,7 @@ # include # include -# include "../../e_os.h" /* To get strncasecmp() on Windows */ +# include "internal/e_os.h" /* To get strncasecmp() on Windows */ # include "internal/nelem.h" diff --git a/e_os.h b/include/internal/e_os.h similarity index 100% rename from e_os.h rename to include/internal/e_os.h diff --git a/providers/common/capabilities.c b/providers/common/capabilities.c index f6d95197f07..edf7c9f7686 100644 --- a/providers/common/capabilities.c +++ b/providers/common/capabilities.c @@ -17,7 +17,7 @@ #include "internal/nelem.h" #include "internal/tlsgroups.h" #include "prov/providercommon.h" -#include "e_os.h" +#include "internal/e_os.h" /* If neither ec or dh is available then we have no TLS-GROUP capabilities */ #if !defined(OPENSSL_NO_EC) || !defined(OPENSSL_NO_DH) diff --git a/providers/fips/self_test.c b/providers/fips/self_test.c index e236bd421a7..a41f49b8871 100644 --- a/providers/fips/self_test.c +++ b/providers/fips/self_test.c @@ -15,7 +15,7 @@ #include #include #include -#include "e_os.h" +#include "internal/e_os.h" #include "prov/providercommon.h" /* diff --git a/providers/implementations/ciphers/cipher_cts.c b/providers/implementations/ciphers/cipher_cts.c index cb3372c646a..aced2021f96 100644 --- a/providers/implementations/ciphers/cipher_cts.c +++ b/providers/implementations/ciphers/cipher_cts.c @@ -46,7 +46,7 @@ * Otherwise it is the same as CS2. */ -#include "e_os.h" /* strcasecmp */ +#include "internal/e_os.h" /* strcasecmp */ #include #include "prov/ciphercommon.h" #include "internal/nelem.h" diff --git a/providers/implementations/kdfs/hkdf.c b/providers/implementations/kdfs/hkdf.c index e014e32d5b7..2238c321a7e 100644 --- a/providers/implementations/kdfs/hkdf.c +++ b/providers/implementations/kdfs/hkdf.c @@ -29,7 +29,7 @@ #include "prov/providercommon.h" #include "prov/implementations.h" #include "prov/provider_util.h" -#include "e_os.h" +#include "internal/e_os.h" #define HKDF_MAXBUF 2048 diff --git a/providers/implementations/kdfs/kbkdf.c b/providers/implementations/kdfs/kbkdf.c index fb5c1c022e3..7462eb6e946 100644 --- a/providers/implementations/kdfs/kbkdf.c +++ b/providers/implementations/kdfs/kbkdf.c @@ -44,7 +44,7 @@ #include "prov/provider_util.h" #include "prov/providercommon.h" -#include "e_os.h" +#include "internal/e_os.h" #define ossl_min(a, b) ((a) < (b)) ? (a) : (b) diff --git a/providers/implementations/kdfs/tls1_prf.c b/providers/implementations/kdfs/tls1_prf.c index 23436cf2417..eba4da50e12 100644 --- a/providers/implementations/kdfs/tls1_prf.c +++ b/providers/implementations/kdfs/tls1_prf.c @@ -60,7 +60,7 @@ #include "prov/providercommon.h" #include "prov/implementations.h" #include "prov/provider_util.h" -#include "e_os.h" +#include "internal/e_os.h" static OSSL_FUNC_kdf_newctx_fn kdf_tls1_prf_new; static OSSL_FUNC_kdf_dupctx_fn kdf_tls1_prf_dup; diff --git a/providers/implementations/kdfs/x942kdf.c b/providers/implementations/kdfs/x942kdf.c index 4fb71835a24..3bf65aa3cd4 100644 --- a/providers/implementations/kdfs/x942kdf.c +++ b/providers/implementations/kdfs/x942kdf.c @@ -8,7 +8,7 @@ * https://www.openssl.org/source/license.html */ -#include "e_os.h" +#include "internal/e_os.h" #include #include #include diff --git a/providers/implementations/kem/rsa_kem.c b/providers/implementations/kem/rsa_kem.c index 313ab133b33..201c80e6487 100644 --- a/providers/implementations/kem/rsa_kem.c +++ b/providers/implementations/kem/rsa_kem.c @@ -13,7 +13,7 @@ */ #include "internal/deprecated.h" -#include "e_os.h" /* strcasecmp */ +#include "internal/e_os.h" /* strcasecmp */ #include #include #include diff --git a/providers/implementations/keymgmt/dsa_kmgmt.c b/providers/implementations/keymgmt/dsa_kmgmt.c index cf6daa4715c..3ddafbd4c11 100644 --- a/providers/implementations/keymgmt/dsa_kmgmt.c +++ b/providers/implementations/keymgmt/dsa_kmgmt.c @@ -13,7 +13,7 @@ */ #include "internal/deprecated.h" -#include "e_os.h" /* strcasecmp */ +#include "internal/e_os.h" /* strcasecmp */ #include #include #include diff --git a/providers/implementations/keymgmt/ec_kmgmt.c b/providers/implementations/keymgmt/ec_kmgmt.c index dd66489bce2..78dc69082fa 100644 --- a/providers/implementations/keymgmt/ec_kmgmt.c +++ b/providers/implementations/keymgmt/ec_kmgmt.c @@ -13,7 +13,7 @@ */ #include "internal/deprecated.h" -#include "e_os.h" /* strcasecmp */ +#include "internal/e_os.h" /* strcasecmp */ #include #include #include diff --git a/providers/implementations/keymgmt/ecx_kmgmt.c b/providers/implementations/keymgmt/ecx_kmgmt.c index 42ae565429a..9afcb6dc0ad 100644 --- a/providers/implementations/keymgmt/ecx_kmgmt.c +++ b/providers/implementations/keymgmt/ecx_kmgmt.c @@ -10,7 +10,7 @@ #include #include /* For strcasecmp on Windows */ -#include "e_os.h" +#include "internal/e_os.h" #include #include #include diff --git a/providers/implementations/keymgmt/mac_legacy_kmgmt.c b/providers/implementations/keymgmt/mac_legacy_kmgmt.c index b1c38802772..73af2071bfc 100644 --- a/providers/implementations/keymgmt/mac_legacy_kmgmt.c +++ b/providers/implementations/keymgmt/mac_legacy_kmgmt.c @@ -26,7 +26,7 @@ #include "prov/providercommon.h" #include "prov/provider_ctx.h" #include "prov/macsignature.h" -#include "e_os.h" /* strcasecmp */ +#include "internal/e_os.h" /* strcasecmp */ static OSSL_FUNC_keymgmt_new_fn mac_new; static OSSL_FUNC_keymgmt_free_fn mac_free; diff --git a/providers/implementations/rands/drbg_ctr.c b/providers/implementations/rands/drbg_ctr.c index dbe57b0d289..1384a433904 100644 --- a/providers/implementations/rands/drbg_ctr.c +++ b/providers/implementations/rands/drbg_ctr.c @@ -14,7 +14,7 @@ #include #include #include -#include "e_os.h" /* strcasecmp */ +#include "internal/e_os.h" /* strcasecmp */ #include "crypto/modes.h" #include "internal/thread_once.h" #include "prov/implementations.h" diff --git a/providers/implementations/rands/seeding/rand_unix.c b/providers/implementations/rands/seeding/rand_unix.c index f394927daef..6858d276cb4 100644 --- a/providers/implementations/rands/seeding/rand_unix.c +++ b/providers/implementations/rands/seeding/rand_unix.c @@ -10,7 +10,7 @@ #ifndef _GNU_SOURCE # define _GNU_SOURCE #endif -#include "../e_os.h" +#include "internal/e_os.h" #include #include "internal/cryptlib.h" #include diff --git a/providers/implementations/rands/seeding/rand_vms.c b/providers/implementations/rands/seeding/rand_vms.c index 30a97bf6e49..ed4f75855db 100644 --- a/providers/implementations/rands/seeding/rand_vms.c +++ b/providers/implementations/rands/seeding/rand_vms.c @@ -7,7 +7,7 @@ * https://www.openssl.org/source/license.html */ -#include "e_os.h" +#include "internal/e_os.h" #define __NEW_STARLET 1 /* New starlet definitions since VMS 7.0 */ #include diff --git a/providers/implementations/signature/rsa_sig.c b/providers/implementations/signature/rsa_sig.c index 14741dee9dd..f543bdb17ad 100644 --- a/providers/implementations/signature/rsa_sig.c +++ b/providers/implementations/signature/rsa_sig.c @@ -13,7 +13,7 @@ */ #include "internal/deprecated.h" -#include "e_os.h" /* strcasecmp */ +#include "internal/e_os.h" /* strcasecmp */ #include #include #include diff --git a/providers/implementations/storemgmt/file_store.c b/providers/implementations/storemgmt/file_store.c index dc93f08b107..461b7e468d6 100644 --- a/providers/implementations/storemgmt/file_store.c +++ b/providers/implementations/storemgmt/file_store.c @@ -9,7 +9,7 @@ /* This file has quite some overlap with engines/e_loader_attic.c */ -#include "e_os.h" /* To get strncasecmp() on Windows */ +#include "internal/e_os.h" /* To get strncasecmp() on Windows */ #include #include diff --git a/ssl/d1_lib.c b/ssl/d1_lib.c index 95a34093c91..baedf390f60 100644 --- a/ssl/d1_lib.c +++ b/ssl/d1_lib.c @@ -7,7 +7,7 @@ * https://www.openssl.org/source/license.html */ -#include "e_os.h" +#include "internal/e_os.h" #include #include #include diff --git a/ssl/ssl_init.c b/ssl/ssl_init.c index e996a803e07..6a666ac0e7b 100644 --- a/ssl/ssl_init.c +++ b/ssl/ssl_init.c @@ -7,7 +7,7 @@ * https://www.openssl.org/source/license.html */ -#include "e_os.h" +#include "internal/e_os.h" #include "internal/err.h" #include diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c index cb7a52ab7e0..9138cd659bd 100644 --- a/ssl/ssl_lib.c +++ b/ssl/ssl_lib.c @@ -11,7 +11,7 @@ #include #include "ssl_local.h" -#include "e_os.h" +#include "internal/e_os.h" #include #include #include diff --git a/ssl/ssl_local.h b/ssl/ssl_local.h index 2c83505660b..58a3e9e08ac 100644 --- a/ssl/ssl_local.h +++ b/ssl/ssl_local.h @@ -12,7 +12,7 @@ #ifndef OSSL_SSL_LOCAL_H # define OSSL_SSL_LOCAL_H -# include "e_os.h" /* struct timeval for DTLS */ +# include "internal/e_os.h" /* struct timeval for DTLS */ # include # include # include diff --git a/test/evp_extra_test.c b/test/evp_extra_test.c index 05af89379f4..caceb50fb61 100644 --- a/test/evp_extra_test.c +++ b/test/evp_extra_test.c @@ -35,7 +35,7 @@ #include "internal/nelem.h" #include "internal/sizes.h" #include "crypto/evp.h" -#include "../e_os.h" /* strcasecmp */ +#include "internal/e_os.h" /* strcasecmp */ static OSSL_LIB_CTX *testctx = NULL; static char *testpropq = NULL; diff --git a/test/evp_libctx_test.c b/test/evp_libctx_test.c index e2663dc0299..ada3bf01c81 100644 --- a/test/evp_libctx_test.c +++ b/test/evp_libctx_test.c @@ -33,7 +33,7 @@ #include "testutil.h" #include "internal/nelem.h" #include "crypto/bn_dh.h" /* _bignum_ffdhe2048_p */ -#include "../e_os.h" /* strcasecmp */ +#include "internal/e_os.h" /* strcasecmp */ static OSSL_LIB_CTX *libctx = NULL; static OSSL_PROVIDER *nullprov = NULL; diff --git a/test/evp_test.c b/test/evp_test.c index 5e106c64f09..6c4e64c159a 100644 --- a/test/evp_test.c +++ b/test/evp_test.c @@ -12,7 +12,7 @@ #include #include #include -#include "../e_os.h" /* strcasecmp and strncasecmp */ +#include "internal/e_os.h" /* strcasecmp and strncasecmp */ #include #include #include diff --git a/test/helpers/ssltestlib.c b/test/helpers/ssltestlib.c index 795cff26601..7ece47edd61 100644 --- a/test/helpers/ssltestlib.c +++ b/test/helpers/ssltestlib.c @@ -12,7 +12,7 @@ #include "internal/nelem.h" #include "ssltestlib.h" #include "../testutil.h" -#include "e_os.h" /* for ossl_sleep() etc. */ +#include "internal/e_os.h" /* for ossl_sleep() etc. */ #ifdef OPENSSL_SYS_UNIX # include diff --git a/test/p_test.c b/test/p_test.c index 80f0784dd9d..32a5e44117b 100644 --- a/test/p_test.c +++ b/test/p_test.c @@ -26,7 +26,7 @@ # define OSSL_provider_init PROVIDER_INIT_FUNCTION_NAME #endif -#include "e_os.h" +#include "internal/e_os.h" #include #include #include diff --git a/test/secmemtest.c b/test/secmemtest.c index d0f9ba2e990..2b0a163747f 100644 --- a/test/secmemtest.c +++ b/test/secmemtest.c @@ -10,7 +10,7 @@ #include #include "testutil.h" -#include "../e_os.h" +#include "internal/e_os.h" static int test_sec_mem(void) { diff --git a/test/ssl_old_test.c b/test/ssl_old_test.c index e7ac6dfba4d..1b1983b7c37 100644 --- a/test/ssl_old_test.c +++ b/test/ssl_old_test.c @@ -9,7 +9,7 @@ * https://www.openssl.org/source/license.html */ -#include "e_os.h" +#include "internal/e_os.h" /* Or gethostname won't be declared properly on Linux and GNU platforms. */ #ifndef _BSD_SOURCE