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 <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/17641)

diff --git a/apps/include/apps.h b/apps/include/apps.h
index b6dbe74fa9114a4950ed4032a0218046f0ba5e55..28c2bbdad247d1e36d878518c22f5e6819cd7091 100644 (file)
--- 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 1d73e1b39ec6de620fab86c418f7a60b2e97937f..06a58a8b51975a0a102ac32b2fd72d2666ba7b45 100644 (file)
--- 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 <ctype.h>
 #include <stdio.h>
 #include <stdlib.h>

diff --git a/crypto/asn1/ameth_lib.c b/crypto/asn1/ameth_lib.c
index 031a6c936ad1257274c7e19fe1e0284c102376f7..97044926076ca6a5a462b7bc936352774d8f40dc 100644 (file)
--- 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 <stdio.h>
 #include <openssl/asn1t.h>

diff --git a/crypto/asn1/asn1_gen.c b/crypto/asn1/asn1_gen.c
index bb0dcb2e0986837a252d853fa3883e78f36d4189..a112f7de9e8d714eac5aaa488d6a191f522d8f4b 100644 (file)
--- a/crypto/asn1/asn1_gen.c
+++ b/crypto/asn1/asn1_gen.c
@@ -10,7 +10,7 @@
 #include "internal/cryptlib.h"
 #include <openssl/asn1.h>
 #include <openssl/x509v3.h>
-#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 749e8f810c3027a75aca70a6a5a7de51277b4bb7..6ba0196ce621e41f1abe6c4f95b791a8f5ad17e3 100644 (file)
--- 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 92dd26230916d42def96bd874c63837cda543215..aaac4513140048b5b31e2aa0d7bfd9d2deaffc13 100644 (file)
--- 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 <assert.h>
 #include <limits.h>
 #include <stdlib.h>

diff --git a/crypto/cmp/cmp_client.c b/crypto/cmp/cmp_client.c
index 4a7a87ff74278855816679158d69e847b34a28d7..0ca7f94a86e6ca661288787dfd4c11208ba7511f 100644 (file)
--- 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 <openssl/bio.h>

diff --git a/crypto/conf/conf_api.c b/crypto/conf/conf_api.c
index 7a4efe6dbb2b1297f353a50e724d420469c22ffd..37e66af78ea24d55cde5e2fc1b8f4a0bcb653689 100644 (file)
--- 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 <stdlib.h>
 #include <string.h>

diff --git a/crypto/conf/conf_def.c b/crypto/conf/conf_def.c
index 26764dad00421a9b6503c2a8cf82966342a2d0e7..9d79a900c8430297928da304eb65dfcf63fa1c3d 100644 (file)
--- a/crypto/conf/conf_def.c
+++ b/crypto/conf/conf_def.c
@@ -11,7 +11,7 @@
 
 #include <stdio.h>
 #include <string.h>
-#include "e_os.h" /* strcasecmp and struct stat */
+#include "internal/e_os.h" /* strcasecmp and struct stat */
 #ifdef __TANDEM
 # include <sys/types.h> /* needed for stat.h */
 # include <sys/stat.h> /* struct stat */

diff --git a/crypto/conf/conf_lib.c b/crypto/conf/conf_lib.c
index a2360035257a97076335df5e77acc6f8660aefa6..fe08e0af5f71d4cd70ed99939ac94e3db6e709c0 100644 (file)
--- 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 <stdio.h>
 #include <string.h>
 #include "internal/conf.h"

diff --git a/crypto/core_namemap.c b/crypto/core_namemap.c
index 6cb0ec5a06fa396ab791308d93d2dbc2a4e6f55a..f058e629f3b21f286809e3abbb0cf618f58e4810 100644 (file)
--- 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 <openssl/lhash.h>
 #include "crypto/lhash.h"      /* ossl_lh_strcasehash */

diff --git a/crypto/cpuid.c b/crypto/cpuid.c
index 048689f410a0c1f2bc756f91214e87987446b2a8..75bd03bffea17194727f9c0d80048427cb08393b 100644 (file)
--- 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 6e73b8352caceb18f5d0ded0667cde51cb3ea3de..f78c2236e4dec9a3cb8c9b2fe0828f4143f67e25 100644 (file)
--- 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 <openssl/safestack.h>
 

diff --git a/crypto/des/cfb_enc.c b/crypto/des/cfb_enc.c
index 30458d50a12a4687d42602622b1f95f8530b8381..e8813755bf6e963faadd655c2ea7fa867b9d5f4d 100644 (file)
--- 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 <assert.h>
 

diff --git a/crypto/dh/dh_group_params.c b/crypto/dh/dh_group_params.c
index c71f4053da6c0c8683075ee2be6e6b4ceaa74701..dec50caf665d2e72994932ba39d77f797dc4018b 100644 (file)
--- a/crypto/dh/dh_group_params.c
+++ b/crypto/dh/dh_group_params.c
@@ -23,7 +23,7 @@
 #include <openssl/objects.h>
 #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 419e7711d36248209f454207124689b9594de281..eda3d3998adea587bea70a1ab81b606d52dcd6ed 100644 (file)
--- 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 <string.h>
 #include <openssl/core_names.h>
 #include <openssl/dh.h>

diff --git a/crypto/dllmain.c b/crypto/dllmain.c
index 48c0cd31227a4107aab0cdd0d2b3763a1a59630f..65d9be6767362751797273f234a7337c0ccd91fc 100644 (file)
--- 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 6a988cc727913e6d84da8da99ab8ef407e0f3ff7..982b117e700adc7d8217ccc6be642a6960378dbd 100644 (file)
--- 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 4d3059d43879f8e9108ebdff32ba04aa600aa775..08ad8f46b3dee0fae589bcf82d7293142f0120d1 100644 (file)
--- 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 8714a51422160d6e9a8fd4d2992c76075fe9901c..45d5587347183cd80e198146f27a024975d90290 100644 (file)
--- 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 <openssl/macros.h>
 #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 8f7a7dd391bd8d6e1b01a36079b01e3e5958efc4..10a9b065e554a8d28360c6c8d96ca7443e73f1db 100644 (file)
--- 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 <openssl/macros.h>
 #include "internal/numbers.h"
 

diff --git a/crypto/ec/ec_backend.c b/crypto/ec/ec_backend.c
index 2db1c1380e88aa4316a192a8583386c459ab6b2e..d2fff0657dedbc7bf42ea128c70b7692c7c49982 100644 (file)
--- 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 2d85d4f23a2d888805d36480a86d55d66f9950e9..2aeab7e3b6b5d9dc707d813635e786372eb43d34 100644 (file)
--- 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 10a38b6f82a7ee7f982cf3e61767e03ec75940cc..9242cd2c6f3cb34201006d4bc5194a2c8063312f 100644 (file)
--- 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 475117a463af09f622d2dd06b4fd8e8f0b6539a1..472abef3116e081cac9c4d9c3dcc1b309199d214 100644 (file)
--- 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 8d083bd6a64d00d1dcb5abc53f51b004e90bad99..52cc404097ec5a72e729c0f4ac48291e1e1e9e9f 100644 (file)
--- 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 <openssl/core_names.h>
 #include <openssl/bio.h>
 #include <openssl/encoder.h>

diff --git a/crypto/encode_decode/encoder_pkey.c b/crypto/encode_decode/encoder_pkey.c
index 109dfa80cd8b1cca1e5d1c52cea951ad47a2a464..ba29da6385e13fe867c15bd4a15988ac30da80e7 100644 (file)
--- 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 <openssl/err.h>
 #include <openssl/ui.h>
 #include <openssl/params.h>

diff --git a/crypto/engine/eng_init.c b/crypto/engine/eng_init.c
index c204eb18998674eaf5e0087d0b89dcefee87fa5d..343a069fa0e7621eae3325544e8a59d357f1fa79 100644 (file)
--- 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 05c6a67c1e1b51b8bc8ae9bab877b42444764924..813bcd6df6f8bb713e4e78114d403c592e0f3ede 100644 (file)
--- 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 <openssl/rand.h>
 #include "internal/refcount.h"

diff --git a/crypto/engine/tb_asnmth.c b/crypto/engine/tb_asnmth.c
index e3a5c82e9957e67dca7e85169076dfbcab9d2ede..bf424ff09eb80b7117571c4cc1dd6ea675ed1968 100644 (file)
--- 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 <openssl/evp.h>
 #include "crypto/asn1.h"

diff --git a/crypto/err/err.c b/crypto/err/err.c
index 63cf682382ca91043edc356c2a7f980a3d6c359a..04eaf43b727f778e7915faa549ff075028d6ee89 100644 (file)
--- 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 2deb1d9b475d73ae748185e60c71b8ea8fc01470..33e5e7f189204ade3fa1a8d62e19f4f27eeb36e8 100644 (file)
--- 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 8550be65e7852dfb65536bbc6273526300daefe6..979e861cffe5d7956e83dabe4e26851d6b062466 100644 (file)
--- a/crypto/evp/ec_support.c
+++ b/crypto/evp/ec_support.c
@@ -10,7 +10,7 @@
 #include <string.h>
 #include <openssl/ec.h>
 #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 24092cfd5be0599ca3fa12994125431ee560cfdc..3d261c282fdc86d68214932dedb483333ce573ec 100644 (file)
--- a/crypto/evp/evp_lib.c
+++ b/crypto/evp/evp_lib.c
@@ -15,7 +15,7 @@
 
 #include <stdio.h>
 #include <string.h>
-#include "e_os.h" /* strcasecmp */
+#include "internal/e_os.h" /* strcasecmp */
 #include "internal/cryptlib.h"
 #include <openssl/evp.h>
 #include <openssl/objects.h>

diff --git a/crypto/evp/p_lib.c b/crypto/evp/p_lib.c
index 27138af564219a9568fff71b5de85ee1832ecb5a..be15f105b7c01ca4fda3dddf5b63d452866ada53 100644 (file)
--- 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 e9f597c46c00fe46cfaa12f0eeed65e0f571d771..cedf283533b670cebbfcac784bfd2ce11efa6a95 100644 (file)
--- 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 6e025a06be6ecc31d326f295bb1c4d50ed0f2403..1078a7b845fc6d8bdd99da0ee31f05f781ef6e4f 100644 (file)
--- 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 <openssl/asn1.h> /* ossl_ffc_params_print */

diff --git a/crypto/getenv.c b/crypto/getenv.c
index e79b6cc1618f43728b0bab18d36aa23de4fa5fcd..b263d1b624705f2733f1789036ea0efe861a6dd8 100644 (file)
--- a/crypto/getenv.c
+++ b/crypto/getenv.c
@@ -13,7 +13,7 @@
 
 #include <stdlib.h>
 #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 14c2cbf2b5af8d7d98ae8226b91eb96003cbeca8..d6345b4582231b8c4f01b02af615caeb3e34a15e 100644 (file)
--- 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 <stdio.h>
 #include <stdlib.h>
 #include "crypto/ctype.h"

diff --git a/crypto/info.c b/crypto/info.c
index f3bef56b1369f063d153152b4097333b3995306c..05edbc3fc8b5077923994e5f85f04209aba70b9e 100644 (file)
--- 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 6a27d1a8e440318cdb9440cc4449c60fe8d42d04..b7d7ad0ea35d72b1a2e3291bd8141f77ac6f0c67 100644 (file)
--- 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 <openssl/err.h>
 #include "crypto/rand.h"

diff --git a/crypto/mem.c b/crypto/mem.c
index 242d88470aeedf4c280488cebbf5ea164d41c880..f76c48d88676182064a55ecfba975e6bf2b17503 100644 (file)
--- 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 <stdio.h>

diff --git a/crypto/mem_sec.c b/crypto/mem_sec.c
index c2cc2cbf32403445576b23409ba0fe15cb04fb68..4806102805fbddc51abc9fa67a976aedec82581e 100644 (file)
--- 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 <openssl/crypto.h>
 
 #include <string.h>

diff --git a/crypto/o_dir.c b/crypto/o_dir.c
index 6857a2e17d4fcc1d6efd32b7bfc58ed684e9e8e3..8772347930111bb9c1ca1b5bd730c4b6d83fbf46 100644 (file)
--- 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 <errno.h>
 
 /*

diff --git a/crypto/o_fopen.c b/crypto/o_fopen.c
index 8095fffbe0c9fca6684cc1b15524073f68a7e6ad..f449c3ec1d173970d2cd935b8381fe5d3c3df96e 100644 (file)
--- 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 a0b4256f78f6a07d05becf2d2ae22edeaec264a8..30c19b81e81d9f610315a05c01d732693d7c88d8 100644 (file)
--- 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 <openssl/err.h>
 
 /*

diff --git a/crypto/o_str.c b/crypto/o_str.c
index d7aa665ad8f67a138eff056cb3412a2970042d45..649a669d25d79472ffd50ba2c2db37f57e711230 100644 (file)
--- 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 <limits.h>
 #include <openssl/crypto.h>
 #include "internal/cryptlib.h"

diff --git a/crypto/objects/o_names.c b/crypto/objects/o_names.c
index 92152eeb6674628c3a4838b5ef77d8e02503d876..82fbc3bf96a048a5adc54d1ea8245d8d37eb5754 100644 (file)
--- 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 530bc530cc054c11fea88d9d7ff09569da3d09f3..3c3b18e62073b964be6346906ec1205634b2693f 100644 (file)
--- a/crypto/params_dup.c
+++ b/crypto/params_dup.c
@@ -11,7 +11,7 @@
 #include <openssl/params.h>
 #include <openssl/param_build.h>
 #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 dc35646be2eaba59f23f2e87c3f378da9b3677c6..4b99ee1f3947308e1320a21c50f249732fe2edfa 100644 (file)
--- 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 dd69f1beb7266d9019f3f56598ecae439d5d1cc1..a6bc2a99e3b84eab34a437fa5245d43e7c6cfb60 100644 (file)
--- a/crypto/rand/rand_deprecated.c
+++ b/crypto/rand/rand_deprecated.c
@@ -7,7 +7,7 @@
  * https://www.openssl.org/source/license.html
  */
 
-#include <e_os.h>
+#include "internal/e_os.h"
 #include <openssl/macros.h>
 #include <openssl/rand.h>
 

diff --git a/crypto/rand/rand_lib.c b/crypto/rand/rand_lib.c
index 30b6cb817f446c09af7068923c6410c1728447e9..4f36e84bd45173fc55006320865d11d1132822a6 100644 (file)
--- a/crypto/rand/rand_lib.c
+++ b/crypto/rand/rand_lib.c
@@ -28,7 +28,7 @@
 # include <openssl/engine.h>
 # 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 4385dd01359c379cb45139087e0f846a33ecac0c..a0e1e14e4d6f4322cc970fa1e40ca720533c83bd 100644 (file)
--- 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 4efa7eea038413909b925cf2630c3cfb2c15f548..81e0f70a19183e8d328bd87bd0327349baf82935 100644 (file)
--- 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 <openssl/crypto.h>
 #include <openssl/err.h>

diff --git a/crypto/store/store_result.c b/crypto/store/store_result.c
index de00f4f56287f4567ff8402cea12812efe1b932c..567b9c99cd608d582eb704262dc4f4879f0e121e 100644 (file)
--- 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 <string.h>
 
 #include <openssl/core.h>

diff --git a/crypto/trace.c b/crypto/trace.c
index dc194acb525435fe112270c19048bcb4662b6cbb..a9a097f1a3142754d74a85be9bf084468341ee5b 100644 (file)
--- 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 cf3e5443dee95ff43861ab029edc583ae8223f39..99b2228a068a1c51661420bb3ec153beae4bd344 100644 (file)
--- 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 <openssl/objects.h>
 #include <openssl/ts.h>

diff --git a/crypto/ui/ui_openssl.c b/crypto/ui/ui_openssl.c
index 37b98910c7c06c8820b2228316bfcbdb6b9eec1e..fc5b12b03d72484fa2221545b014262691c3c3b8 100644 (file)
--- 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 <openssl/e_os2.h>
 #include <openssl/err.h>
 #include <openssl/ui.h>

diff --git a/crypto/x509/by_dir.c b/crypto/x509/by_dir.c
index 258ad518525743358e989e3de041792f9f139040..599d5463bb0ffede4b84eea020edac70b6b274fb 100644 (file)
--- a/crypto/x509/by_dir.c
+++ b/crypto/x509/by_dir.c
@@ -16,7 +16,7 @@
 # include <sys/stat.h>
 #endif
 
-#include "e_os.h"
+#include "internal/e_os.h"
 #include "internal/cryptlib.h"
 #include <stdio.h>
 #include <time.h>

diff --git a/crypto/x509/v3_tlsf.c b/crypto/x509/v3_tlsf.c
index 6a613d64e6aab1ea3b639aea7f39810c40fcd4cc..32ac300355cb2d96fa9d6fe4d203567804281bf2 100644 (file)
--- 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 <stdio.h>
 #include <openssl/asn1t.h>

diff --git a/crypto/x509/v3_utl.c b/crypto/x509/v3_utl.c
index 72d4d3867d8938a135dac74a9e1585260d7bda4a..0687ffabc9ad466f639648a47674e30799e57e74 100644 (file)
--- 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 <stdio.h>
 #include <string.h>

diff --git a/engines/e_devcrypto.c b/engines/e_devcrypto.c
index adf53d8d91d5628508840dd11b0b64a2f802f5c4..abc2930fb09fda76a105e4bd5c8620e8dba4a708 100644 (file)
--- 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 <string.h>
 #include <sys/types.h>
 #include <sys/stat.h>

diff --git a/engines/e_loader_attic.c b/engines/e_loader_attic.c
index e2a5474c1ce75d434feff84bf1a4f7f53ab57863..be36c6e3971725fe2a25676e694e832b8e255478 100644 (file)
--- 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 <string.h>
 #include <sys/stat.h>
 #include <ctype.h>

diff --git a/include/internal/common.h b/include/internal/common.h
index 44224f3ba8a281d6af79064374f4f8cbb15aa7eb..f20b041ac0f9be95258cbbd0b0bae96606120830 100644 (file)
--- a/include/internal/common.h
+++ b/include/internal/common.h
@@ -13,7 +13,7 @@
 
 # include <stdlib.h>
 # include <string.h>
-# 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 f6d95197f07c0fdc066d23f175c1b7f737fba3ae..edf7c9f7686d8d9a0180a65f70b01c3429d41653 100644 (file)
--- 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 e236bd421a7c37045201df5430bf4a672b607f88..a41f49b8871de6ca497719aebe1a19cec0f45781 100644 (file)
--- a/providers/fips/self_test.c
+++ b/providers/fips/self_test.c
@@ -15,7 +15,7 @@
 #include <openssl/fipskey.h>
 #include <openssl/err.h>
 #include <openssl/proverr.h>
-#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 cb3372c646aab28356befa529a26afa13ddbeb69..aced2021f96914544421a6074934dd7bd3d67d1b 100644 (file)
--- 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 <openssl/core_names.h>
 #include "prov/ciphercommon.h"
 #include "internal/nelem.h"

diff --git a/providers/implementations/kdfs/hkdf.c b/providers/implementations/kdfs/hkdf.c
index e014e32d5b73cee235b7d416fba1318afbbc4633..2238c321a7ed936c7cbf2f48a953d9035f399350 100644 (file)
--- 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 fb5c1c022e32642267c62c5bd391da2fe1f3430a..7462eb6e9465071b8426e6a3892f26a1886c96d7 100644 (file)
--- 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 23436cf241738ba73fa0dd5da6538a4b74d50a78..eba4da50e128bf9deded67d378a286c509a84d9e 100644 (file)
--- 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 4fb71835a24d87f077a03bfbf7255cbb8146e9dc..3bf65aa3cd4f65f5ee28c6074f06d13465c9e54c 100644 (file)
--- 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 <openssl/core_names.h>
 #include <openssl/core_dispatch.h>
 #include <openssl/err.h>

diff --git a/providers/implementations/kem/rsa_kem.c b/providers/implementations/kem/rsa_kem.c
index 313ab133b33a988ab690516e366377329d2225ef..201c80e648728e34470927b7ce19759dab84485b 100644 (file)
--- 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 <openssl/crypto.h>
 #include <openssl/evp.h>
 #include <openssl/core_dispatch.h>

diff --git a/providers/implementations/keymgmt/dsa_kmgmt.c b/providers/implementations/keymgmt/dsa_kmgmt.c
index cf6daa4715c84e4d3fd6e14afc5f2a7a9761d28b..3ddafbd4c11648c79da757ea8d1c8f92e2df40e3 100644 (file)
--- 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 <openssl/core_dispatch.h>
 #include <openssl/core_names.h>
 #include <openssl/bn.h>

diff --git a/providers/implementations/keymgmt/ec_kmgmt.c b/providers/implementations/keymgmt/ec_kmgmt.c
index dd66489bce2c30c534dfff51c4ace99ff9723d6f..78dc69082fabf3d4ebc6dc500dbeabf2fa5a7de9 100644 (file)
--- 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 <string.h>
 #include <openssl/core_dispatch.h>
 #include <openssl/core_names.h>

diff --git a/providers/implementations/keymgmt/ecx_kmgmt.c b/providers/implementations/keymgmt/ecx_kmgmt.c
index 42ae565429a3c983e4778f8bbe72d8d26508a83f..9afcb6dc0adacd40f100f030c116b1989c0c8890 100644 (file)
--- a/providers/implementations/keymgmt/ecx_kmgmt.c
+++ b/providers/implementations/keymgmt/ecx_kmgmt.c
@@ -10,7 +10,7 @@
 #include <assert.h>
 #include <string.h>
 /* For strcasecmp on Windows */
-#include "e_os.h"
+#include "internal/e_os.h"
 #include <openssl/core_dispatch.h>
 #include <openssl/core_names.h>
 #include <openssl/params.h>

diff --git a/providers/implementations/keymgmt/mac_legacy_kmgmt.c b/providers/implementations/keymgmt/mac_legacy_kmgmt.c
index b1c388027722e7773c5f99fbaf649510bb06199b..73af2071bfc404cc7891a5568ee0181657e3fc3d 100644 (file)
--- 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 dbe57b0d2898df28da08d81901ec3ee225b98c68..1384a43390469ebbf7457232d64d405bf97069ea 100644 (file)
--- a/providers/implementations/rands/drbg_ctr.c
+++ b/providers/implementations/rands/drbg_ctr.c
@@ -14,7 +14,7 @@
 #include <openssl/rand.h>
 #include <openssl/aes.h>
 #include <openssl/proverr.h>
-#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 f394927daef4a38df4c01839059ec80f3bce8ba0..6858d276cb4c26a8e4c150d0e4db9c3b75139bb7 100644 (file)
--- 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 <stdio.h>
 #include "internal/cryptlib.h"
 #include <openssl/rand.h>

diff --git a/providers/implementations/rands/seeding/rand_vms.c b/providers/implementations/rands/seeding/rand_vms.c
index 30a97bf6e4930e801f57a87d6d3cd9997d17bfc2..ed4f75855db2d1446dd9ad7b0c10266247c699b0 100644 (file)
--- 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 <unistd.h>

diff --git a/providers/implementations/signature/rsa_sig.c b/providers/implementations/signature/rsa_sig.c
index 14741dee9dded76c64e7d13e054daa6e7e0b3a38..f543bdb17ad28ded32be7f97624540e91ee36d46 100644 (file)
--- 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 <string.h>
 #include <openssl/crypto.h>
 #include <openssl/core_dispatch.h>

diff --git a/providers/implementations/storemgmt/file_store.c b/providers/implementations/storemgmt/file_store.c
index dc93f08b107d8423e7b55daa747b641764cbdc27..461b7e468d67e5a4488a88063dc7d44be0832259 100644 (file)
--- 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 <string.h>
 #include <sys/stat.h>

diff --git a/ssl/d1_lib.c b/ssl/d1_lib.c
index 95a34093c91b0a3c74a95fe19ff074bc6e020dc2..baedf390f60a802a64fb2da1dd2265cb185d65a9 100644 (file)
--- 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 <stdio.h>
 #include <openssl/objects.h>
 #include <openssl/rand.h>

diff --git a/ssl/ssl_init.c b/ssl/ssl_init.c
index e996a803e07be08f8d65ba21a75b1d9c6be44433..6a666ac0e7b01048b5b5efb95af9a35f1031a979 100644 (file)
--- 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 <openssl/crypto.h>

diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c
index cb7a52ab7e0609d3b8ec2b55dcc312a3a1bb2794..9138cd659bd9d80aef9fd733ff55d8bbb3c6777e 100644 (file)
--- a/ssl/ssl_lib.c
+++ b/ssl/ssl_lib.c
@@ -11,7 +11,7 @@
 
 #include <stdio.h>
 #include "ssl_local.h"
-#include "e_os.h"
+#include "internal/e_os.h"
 #include <openssl/objects.h>
 #include <openssl/x509v3.h>
 #include <openssl/rand.h>

diff --git a/ssl/ssl_local.h b/ssl/ssl_local.h
index 2c83505660bdce7a8b4004c78d29a8d459209db2..58a3e9e08acb5af00766d9f71d51cc9d025d1836 100644 (file)
--- 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 <stdlib.h>
 # include <time.h>
 # include <errno.h>

diff --git a/test/evp_extra_test.c b/test/evp_extra_test.c
index 05af89379f48361daed07580feeb0f1f7e0f166f..caceb50fb61d07487edd390ef66f39b88bc2b010 100644 (file)
--- 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 e2663dc029987da29796d74cc2cf3105adea9f0d..ada3bf01c81535e0164de21589b86c61a59cbcbe 100644 (file)
--- 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 5e106c64f099e3af76514ba0b2cd7ceb7d1c6940..6c4e64c159a0de1375c51f2ea846ff084b763cfc 100644 (file)
--- a/test/evp_test.c
+++ b/test/evp_test.c
@@ -12,7 +12,7 @@
 #include <string.h>
 #include <stdlib.h>
 #include <ctype.h>
-#include "../e_os.h" /* strcasecmp and strncasecmp */
+#include "internal/e_os.h" /* strcasecmp and strncasecmp */
 #include <openssl/evp.h>
 #include <openssl/pem.h>
 #include <openssl/err.h>

diff --git a/test/helpers/ssltestlib.c b/test/helpers/ssltestlib.c
index 795cff266018bc4ab91a7ac6a17ba5b572e453a1..7ece47edd616afb0714c8955fb17c81cda687392 100644 (file)
--- 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 <unistd.h>

diff --git a/test/p_test.c b/test/p_test.c
index 80f0784dd9d5abd545934146f8cdfe940e532193..32a5e44117bfc27e70571457fd0d33b554c3daad 100644 (file)
--- 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 <openssl/core.h>
 #include <openssl/core_dispatch.h>
 #include <openssl/err.h>

diff --git a/test/secmemtest.c b/test/secmemtest.c
index d0f9ba2e99015fff5b01b4bbeb755088dce22f60..2b0a163747f8ff74eaed757e25d62d1e072cd6f6 100644 (file)
--- a/test/secmemtest.c
+++ b/test/secmemtest.c
@@ -10,7 +10,7 @@
 #include <openssl/crypto.h>
 
 #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 e7ac6dfba4d01a70cc29d2f4a5f01c4f94b5ef6f..1b1983b7c3725404f9dea9060d01a13675926f26 100644 (file)
--- 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