diff options
63 files changed, 63 insertions, 63 deletions
diff --git a/apps/include/apps.h b/apps/include/apps.h index baacd0025d..8b96fa7235 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/nelem.h" # include "internal/sockets.h" /* for openssl_fdset() */ # include "internal/cryptlib.h" /* ossl_assert() */ diff --git a/apps/s_client.c b/apps/s_client.c index 182f7d9ddb..1d99ba3824 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 <ctype.h> #include <stdio.h> #include <stdlib.h> diff --git a/crypto/bio/bio_local.h b/crypto/bio/bio_local.h index 749e8f810c..6ba0196ce6 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 7fa8778cae..a670290b6f 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 <assert.h> #include <limits.h> #include <stdlib.h> diff --git a/crypto/cmp/cmp_client.c b/crypto/cmp/cmp_client.c index c7674ce088..cc29412975 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 <openssl/bio.h> diff --git a/crypto/conf/conf_api.c b/crypto/conf/conf_api.c index 7a4efe6dbb..37e66af78e 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 <stdlib.h> #include <string.h> diff --git a/crypto/conf/conf_def.c b/crypto/conf/conf_def.c index b5d6668f42..a6aaf9d278 100644 --- 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" /* struct stat */ +#include "internal/e_os.h" /* 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 a236003525..fe08e0af5f 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 <stdio.h> #include <string.h> #include "internal/conf.h" diff --git a/crypto/cpuid.c b/crypto/cpuid.c index 090f6fe03e..c5ef486efd 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 6e73b8352c..f78c2236e4 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 <openssl/safestack.h> diff --git a/crypto/des/cfb_enc.c b/crypto/des/cfb_enc.c index 30458d50a1..e8813755bf 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 <assert.h> diff --git a/crypto/dh/dh_kdf.c b/crypto/dh/dh_kdf.c index 6e99466e60..a0fe99f4a2 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 <string.h> #include <openssl/core_names.h> #include <openssl/dh.h> diff --git a/crypto/dllmain.c b/crypto/dllmain.c index 48c0cd3122..65d9be6767 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 6a988cc727..982b117e70 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 4d3059d438..08ad8f46b3 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 8714a51422..45d5587347 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 <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 8f7a7dd391..10a9b065e5 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 <openssl/macros.h> #include "internal/numbers.h" diff --git a/crypto/ec/ec_backend.c b/crypto/ec/ec_backend.c index 98e2c418e4..5be2112875 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/encode_decode/decoder_lib.c b/crypto/encode_decode/decoder_lib.c index e24d2c6cd5..817f335453 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/engine/eng_init.c b/crypto/engine/eng_init.c index c204eb1899..343a069fa0 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 05c6a67c1e..813bcd6df6 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 <openssl/rand.h> #include "internal/refcount.h" diff --git a/crypto/engine/tb_asnmth.c b/crypto/engine/tb_asnmth.c index 81f8e7add0..bd65ede2f2 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 <openssl/evp.h> #include "crypto/asn1.h" diff --git a/crypto/err/err.c b/crypto/err/err.c index ec55642308..672a55bcfd 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/getenv.c b/crypto/getenv.c index e79b6cc161..b263d1b624 100644 --- 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 0d62f1c7bf..77302a23b2 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 <stdio.h> #include <stdlib.h> #include "crypto/ctype.h" diff --git a/crypto/info.c b/crypto/info.c index f3bef56b13..05edbc3fc8 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 cacf637c89..983d76e457 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 <openssl/err.h> #include "crypto/rand.h" diff --git a/crypto/mem.c b/crypto/mem.c index f6cdcf5a42..3d67d9256a 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 <stdio.h> diff --git a/crypto/mem_sec.c b/crypto/mem_sec.c index 711d35f409..60559a930e 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 <openssl/crypto.h> #include <string.h> diff --git a/crypto/o_dir.c b/crypto/o_dir.c index 6857a2e17d..8772347930 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 <errno.h> /* diff --git a/crypto/o_fopen.c b/crypto/o_fopen.c index 8095fffbe0..f449c3ec1d 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 a0b4256f78..30c19b81e8 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 <openssl/err.h> /* diff --git a/crypto/o_str.c b/crypto/o_str.c index 7fa487dd5f..3354ce0927 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 <string.h> #include <limits.h> #include <openssl/crypto.h> diff --git a/crypto/objects/o_names.c b/crypto/objects/o_names.c index 791f2b011e..1efa0345fb 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" /* * I use the ex_data stuff to manage the identifiers for the obj_name_types diff --git a/crypto/property/property_parse.c b/crypto/property/property_parse.c index ca2bd33381..b2bf3cd631 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 dd69f1beb7..a6bc2a99e3 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 <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 50aa9226cb..caedbca204 100644 --- 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/store/store_lib.c b/crypto/store/store_lib.c index 5ac7ff593e..c767e303f8 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 <openssl/crypto.h> #include <openssl/err.h> diff --git a/crypto/store/store_result.c b/crypto/store/store_result.c index 96d3119907..ca436b361f 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 <string.h> #include <openssl/core.h> diff --git a/crypto/ts/ts_rsp_sign.c b/crypto/ts/ts_rsp_sign.c index 8937bb2d66..fac09e9092 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 <openssl/objects.h> #include <openssl/ts.h> diff --git a/crypto/ui/ui_openssl.c b/crypto/ui/ui_openssl.c index 8007f2f70c..544415e5b1 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 <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 258ad51852..599d5463bb 100644 --- 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 3a457fa57b..a1446bc074 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 <stdio.h> #include <openssl/asn1t.h> diff --git a/crypto/x509/v3_utl.c b/crypto/x509/v3_utl.c index ba76253029..f144dababb 100644 --- a/crypto/x509/v3_utl.c +++ b/crypto/x509/v3_utl.c @@ -9,7 +9,7 @@ /* X509 v3 extension utilitie |