From: Rich Salz Date: Tue, 25 May 2021 19:08:03 +0000 (-0400) Subject: Use "" for include internal/xxx X-Git-Tag: openssl-3.0.0-beta1~361 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=449bdf3746244160e8ab0ee3ac73d4c73017c2fb;p=thirdparty%2Fopenssl.git Use "" for include internal/xxx Reviewed-by: Shane Lontis Reviewed-by: Paul Dale (Merged from https://github.com/openssl/openssl/pull/15468) --- diff --git a/apps/s_time.c b/apps/s_time.c index 8c43db952e3..34e939d0472 100644 --- a/apps/s_time.c +++ b/apps/s_time.c @@ -22,7 +22,7 @@ #include #include "s_apps.h" #include -#include +#include "internal/sockets.h" #if !defined(OPENSSL_SYS_MSDOS) # include #endif diff --git a/crypto/dh/dh_kdf.c b/crypto/dh/dh_kdf.c index 619571537a3..0ec76449094 100644 --- a/crypto/dh/dh_kdf.c +++ b/crypto/dh/dh_kdf.c @@ -21,7 +21,7 @@ #include #include #include -#include +#include "internal/provider.h" #include /* Key derivation function from X9.63/SECG */ diff --git a/crypto/evp/e_rc4_hmac_md5.c b/crypto/evp/e_rc4_hmac_md5.c index 6a38f95d5ee..c8b6da246fb 100644 --- a/crypto/evp/e_rc4_hmac_md5.c +++ b/crypto/evp/e_rc4_hmac_md5.c @@ -13,7 +13,7 @@ */ #include "internal/deprecated.h" -#include +#include "internal/cryptlib.h" #include #include diff --git a/crypto/ppccap.c b/crypto/ppccap.c index a504bc59b03..2048be7b1d2 100644 --- a/crypto/ppccap.c +++ b/crypto/ppccap.c @@ -28,7 +28,7 @@ #endif #include #include -#include +#include "internal/cryptlib.h" #include #include "bn/bn_local.h" diff --git a/fuzz/asn1.c b/fuzz/asn1.c index 449d851e680..8ce9a57c255 100644 --- a/fuzz/asn1.c +++ b/fuzz/asn1.c @@ -37,7 +37,7 @@ #include #include #include -#include +#include "internal/nelem.h" #include "fuzzer.h" static ASN1_ITEM_EXP *item_type[] = { diff --git a/providers/fips/self_test.c b/providers/fips/self_test.c index 2b3b30de27e..a4d7a4ffe20 100644 --- a/providers/fips/self_test.c +++ b/providers/fips/self_test.c @@ -11,7 +11,7 @@ #include #include #include -#include +#include "internal/cryptlib.h" #include #include #include @@ -25,7 +25,7 @@ * it should be run once regardless of the number of OSSL_LIB_CTXs we have. */ #define ALLOW_RUN_ONCE_IN_FIPS -#include +#include "internal/thread_once.h" #include "self_test.h" #define FIPS_STATE_INIT 0 diff --git a/ssl/statem/statem_clnt.c b/ssl/statem/statem_clnt.c index 85ed3e42597..ad1d0e7e058 100644 --- a/ssl/statem/statem_clnt.c +++ b/ssl/statem/statem_clnt.c @@ -26,7 +26,7 @@ #include #include #include -#include +#include "internal/cryptlib.h" static MSG_PROCESS_RETURN tls_process_as_hello_retry_request(SSL *s, PACKET *pkt); static MSG_PROCESS_RETURN tls_process_encrypted_extensions(SSL *s, PACKET *pkt); diff --git a/test/sparse_array_test.c b/test/sparse_array_test.c index 2c7f5a878cc..69f830e5c78 100644 --- a/test/sparse_array_test.c +++ b/test/sparse_array_test.c @@ -13,8 +13,7 @@ #include #include -#include - +#include "internal/nelem.h" #include "crypto/sparse_array.h" #include "testutil.h" diff --git a/test/tls-provider.c b/test/tls-provider.c index d9d52664b2b..20360d469e6 100644 --- a/test/tls-provider.c +++ b/test/tls-provider.c @@ -14,7 +14,7 @@ #include /* For TLS1_3_VERSION */ #include -#include +#include "internal/nelem.h" static OSSL_FUNC_keymgmt_import_fn xor_import; static OSSL_FUNC_keymgmt_import_types_fn xor_import_types;