Reorganize local header files Apart from public and internal header files, there is a third type called local header files, which are located next to source files in the source directory. Currently, they have different suffixes like '*_lcl.h', '*_local.h', or '*_int.h' This commit changes the different suffixes to '*_local.h' uniformly. Reviewed-by: Richard Levitte <levitte@openssl.org> (Merged from https://github.com/openssl/openssl/pull/9333)
diff --git a/test/cipher_overhead_test.c b/test/cipher_overhead_test.c index 0492e67..04be8d7 100644 --- a/test/cipher_overhead_test.c +++ b/test/cipher_overhead_test.c
@@ -9,7 +9,7 @@ #include "internal/nelem.h" #include "testutil.h" -#include "../ssl/ssl_locl.h" +#include "../ssl/ssl_local.h" static int cipher_overhead(void) {
diff --git a/test/cmp_testlib.h b/test/cmp_testlib.h index afd32b7..462ec39 100644 --- a/test/cmp_testlib.h +++ b/test/cmp_testlib.h
@@ -16,7 +16,7 @@ # include <openssl/pem.h> # include <openssl/rand.h> -#include "../crypto/cmp/cmp_int.h" +#include "../crypto/cmp/cmp_local.h" # include "testutil.h"
diff --git a/test/constant_time_test.c b/test/constant_time_test.c index 97d568a..044100b 100644 --- a/test/constant_time_test.c +++ b/test/constant_time_test.c
@@ -11,7 +11,7 @@ #include <stdlib.h> #include "internal/nelem.h" -#include "internal/constant_time_locl.h" +#include "internal/constant_time.h" #include "testutil.h" #include "internal/numbers.h"
diff --git a/test/curve448_internal_test.c b/test/curve448_internal_test.c index d3e3aba..054948d 100644 --- a/test/curve448_internal_test.c +++ b/test/curve448_internal_test.c
@@ -10,7 +10,7 @@ #include <string.h> #include <openssl/e_os2.h> #include <openssl/evp.h> -#include "curve448_lcl.h" +#include "curve448_local.h" #include "testutil.h" static unsigned int max = 1000;
diff --git a/test/drbg_cavs_test.c b/test/drbg_cavs_test.c index 183624c..2c0829d 100644 --- a/test/drbg_cavs_test.c +++ b/test/drbg_cavs_test.c
@@ -15,7 +15,7 @@ #include <openssl/obj_mac.h> #include <openssl/evp.h> #include <openssl/aes.h> -#include "../crypto/rand/rand_lcl.h" +#include "../crypto/rand/rand_local.h" #include "testutil.h" #include "drbg_cavs_data.h"
diff --git a/test/drbgtest.c b/test/drbgtest.c index f5b1934..93adb48 100644 --- a/test/drbgtest.c +++ b/test/drbgtest.c
@@ -15,7 +15,7 @@ #include <openssl/obj_mac.h> #include <openssl/evp.h> #include <openssl/aes.h> -#include "../crypto/rand/rand_lcl.h" +#include "../crypto/rand/rand_local.h" #include "../include/crypto/rand.h" #if defined(_WIN32)
diff --git a/test/dtls_mtu_test.c b/test/dtls_mtu_test.c index bba1bdb..33603ba 100644 --- a/test/dtls_mtu_test.c +++ b/test/dtls_mtu_test.c
@@ -18,7 +18,7 @@ #include "testutil.h" /* for SSL_READ_ETM() */ -#include "../ssl/ssl_locl.h" +#include "../ssl/ssl_local.h" static int debug = 0;
diff --git a/test/ec_internal_test.c b/test/ec_internal_test.c index 8d3a4fd..4b84931 100644 --- a/test/ec_internal_test.c +++ b/test/ec_internal_test.c
@@ -10,7 +10,7 @@ #include "internal/nelem.h" #include "testutil.h" #include <openssl/ec.h> -#include "ec_lcl.h" +#include "ec_local.h" #include <openssl/objects.h> static size_t crv_len = 0;
diff --git a/test/handshake_helper.c b/test/handshake_helper.c index a85d22e..c2528b9 100644 --- a/test/handshake_helper.c +++ b/test/handshake_helper.c
@@ -16,7 +16,7 @@ #include <openssl/srp.h> #endif -#include "../ssl/ssl_locl.h" +#include "../ssl/ssl_local.h" #include "internal/sockets.h" #include "internal/nelem.h" #include "handshake_helper.h"
diff --git a/test/property_test.c b/test/property_test.c index 29e8ac3..8b953e4 100644 --- a/test/property_test.c +++ b/test/property_test.c
@@ -12,7 +12,7 @@ #include "testutil.h" #include "internal/nelem.h" #include "internal/property.h" -#include "../crypto/property/property_lcl.h" +#include "../crypto/property/property_local.h" static int add_property_names(const char *n, ...) {
diff --git a/test/rsa_sp800_56b_test.c b/test/rsa_sp800_56b_test.c index 89dab09..1e6ea8d 100644 --- a/test/rsa_sp800_56b_test.c +++ b/test/rsa_sp800_56b_test.c
@@ -26,7 +26,7 @@ return 1; } #else -# include "rsa_locl.h" +# include "rsa_local.h" # include <openssl/rsa.h> /* taken from RSA2 cavs data */
diff --git a/test/ssl_cert_table_internal_test.c b/test/ssl_cert_table_internal_test.c index 81274db..d6e93af 100644 --- a/test/ssl_cert_table_internal_test.c +++ b/test/ssl_cert_table_internal_test.c
@@ -15,7 +15,7 @@ #include <openssl/ssl.h> #include "testutil.h" #include "internal/nelem.h" -#include "../ssl/ssl_locl.h" +#include "../ssl/ssl_local.h" #include "../ssl/ssl_cert_table.h" #define test_cert_table(nid, amask, idx) \
diff --git a/test/sslapitest.c b/test/sslapitest.c index 4b510eb..2442b69 100644 --- a/test/sslapitest.c +++ b/test/sslapitest.c
@@ -25,7 +25,7 @@ #include "testutil/output.h" #include "internal/nelem.h" #include "internal/ktls.h" -#include "../ssl/ssl_locl.h" +#include "../ssl/ssl_local.h" #ifndef OPENSSL_NO_TLS1_3
diff --git a/test/tls13encryptiontest.c b/test/tls13encryptiontest.c index a5580a2..84a8557 100644 --- a/test/tls13encryptiontest.c +++ b/test/tls13encryptiontest.c
@@ -9,8 +9,8 @@ #include <openssl/ssl.h> #include <openssl/evp.h> -#include "../ssl/ssl_locl.h" -#include "../ssl/record/record_locl.h" +#include "../ssl/ssl_local.h" +#include "../ssl/record/record_local.h" #include "internal/nelem.h" #include "testutil.h"
diff --git a/test/tls13secretstest.c b/test/tls13secretstest.c index 4756faa..def78b9 100644 --- a/test/tls13secretstest.c +++ b/test/tls13secretstest.c
@@ -10,7 +10,7 @@ #include <openssl/ssl.h> #include <openssl/evp.h> -#include "../ssl/ssl_locl.h" +#include "../ssl/ssl_local.h" #include "testutil.h" #define IVLEN 12