diff options
author | Richard Levitte <levitte@openssl.org> | 2022-02-04 15:13:01 +0100 |
---|---|---|
committer | Richard Levitte <levitte@openssl.org> | 2022-02-05 05:31:09 +0100 |
commit | d5f9166bacfb3757dfd6117310ad54ab749b11f9 (patch) | |
tree | 2ee6532788cf791a75e7e658ab8b9709c1d8ee62 /providers/implementations | |
parent | 77f3936928068bee9d7e0c6939709ac179cb1059 (diff) |
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)
Diffstat (limited to 'providers/implementations')
-rw-r--r-- | providers/implementations/ciphers/cipher_cts.c | 2 | ||||
-rw-r--r-- | providers/implementations/kdfs/hkdf.c | 2 | ||||
-rw-r--r-- | providers/implementations/kdfs/kbkdf.c | 2 | ||||
-rw-r--r-- | providers/implementations/kdfs/tls1_prf.c | 2 | ||||
-rw-r--r-- | providers/implementations/kdfs/x942kdf.c | 2 | ||||
-rw-r--r-- | providers/implementations/kem/rsa_kem.c | 2 | ||||
-rw-r--r-- | providers/implementations/keymgmt/dsa_kmgmt.c | 2 | ||||
-rw-r--r-- | providers/implementations/keymgmt/ec_kmgmt.c | 2 | ||||
-rw-r--r-- | providers/implementations/keymgmt/ecx_kmgmt.c | 2 | ||||
-rw-r--r-- | providers/implementations/keymgmt/mac_legacy_kmgmt.c | 2 | ||||
-rw-r--r-- | providers/implementations/rands/drbg_ctr.c | 2 | ||||
-rw-r--r-- | providers/implementations/rands/seeding/rand_unix.c | 2 | ||||
-rw-r--r-- | providers/implementations/rands/seeding/rand_vms.c | 2 | ||||
-rw-r--r-- | providers/implementations/signature/rsa_sig.c | 2 | ||||
-rw-r--r-- | providers/implementations/storemgmt/file_store.c | 2 |
15 files changed, 15 insertions, 15 deletions
diff --git a/providers/implementations/ciphers/cipher_cts.c b/providers/implementations/ciphers/cipher_cts.c index cb3372c646..aced2021f9 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 <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 e014e32d5b..2238c321a7 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 fb5c1c022e..7462eb6e94 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 23436cf241..eba4da50e1 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 4fb71835a2..3bf65aa3cd 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 <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 313ab133b3..201c80e648 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 <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 cf6daa4715..3ddafbd4c1 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 <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 dd66489bce..78dc69082f 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 <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 42ae565429..9afcb6dc0a 100644 --- 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 b1c3880277..73af2071bf 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 dbe57b0d28..1384a43390 100644 --- 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 f394927dae..6858d276cb 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 <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 30a97bf6e4..ed4f75855d 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 <unistd.h> diff --git a/providers/implementations/signature/rsa_sig.c b/providers/implementations/signature/rsa_sig.c index 14741dee9d..f543bdb17a 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 <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 dc93f08b10..461b7e468d 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 <string.h> #include <sys/stat.h> |