summaryrefslogtreecommitdiffstats
path: root/crypto/encode_decode
diff options
context:
space:
mode:
authorRichard Levitte <levitte@openssl.org>2022-02-04 15:13:01 +0100
committerRichard Levitte <levitte@openssl.org>2022-02-05 05:31:09 +0100
commitd5f9166bacfb3757dfd6117310ad54ab749b11f9 (patch)
tree2ee6532788cf791a75e7e658ab8b9709c1d8ee62 /crypto/encode_decode
parent77f3936928068bee9d7e0c6939709ac179cb1059 (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 'crypto/encode_decode')
-rw-r--r--crypto/encode_decode/decoder_lib.c2
-rw-r--r--crypto/encode_decode/decoder_pkey.c2
-rw-r--r--crypto/encode_decode/encoder_lib.c2
-rw-r--r--crypto/encode_decode/encoder_pkey.c2
4 files changed, 4 insertions, 4 deletions
diff --git a/crypto/encode_decode/decoder_lib.c b/crypto/encode_decode/decoder_lib.c
index 10a38b6f82..9242cd2c6f 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 475117a463..472abef311 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 8d083bd6a6..52cc404097 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 <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 109dfa80cd..ba29da6385 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 <openssl/err.h>
#include <openssl/ui.h>
#include <openssl/params.h>