diff options
author | Dr. Matthias St. Pierre <Matthias.St.Pierre@ncp-e.com> | 2019-09-27 23:58:12 +0200 |
---|---|---|
committer | Dr. Matthias St. Pierre <Matthias.St.Pierre@ncp-e.com> | 2019-09-27 23:58:12 +0200 |
commit | fbbfd128c9aa884216ace8c63be9071b3b690bee (patch) | |
tree | 8e898384b78a7bb26dcaba572eba6c4579e6e569 /test | |
parent | b5acbf914833a83368e51766de4cf2e2074a9436 (diff) |
Fix header file include guard names
Make the include guards consistent by renaming them systematically according
to the naming conventions below
The public header files (in the 'include/openssl' directory) are not changed
in 1.1.1, because it is a stable release.
For the private header files files, the guard names try to match the path
specified in the include directives, with all letters converted to upper case
and '/' and '.' replaced by '_'. An extra 'OSSL_' is added as prefix.
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/9681)
Diffstat (limited to 'test')
-rw-r--r-- | test/drbg_cavs_data.h | 4 | ||||
-rw-r--r-- | test/ecdsatest.h | 6 | ||||
-rw-r--r-- | test/handshake_helper.h | 6 | ||||
-rw-r--r-- | test/ossl_shim/async_bio.h | 6 | ||||
-rw-r--r-- | test/ossl_shim/include/openssl/base.h | 6 | ||||
-rw-r--r-- | test/ossl_shim/packeted_bio.h | 6 | ||||
-rw-r--r-- | test/ossl_shim/test_config.h | 6 | ||||
-rw-r--r-- | test/ssl_test_ctx.h | 6 | ||||
-rw-r--r-- | test/ssltestlib.h | 6 | ||||
-rw-r--r-- | test/testutil.h | 6 | ||||
-rw-r--r-- | test/testutil/output.h | 6 |
11 files changed, 32 insertions, 32 deletions
diff --git a/test/drbg_cavs_data.h b/test/drbg_cavs_data.h index d673375619..c04b01298d 100644 --- a/test/drbg_cavs_data.h +++ b/test/drbg_cavs_data.h @@ -13,8 +13,8 @@ #include <stddef.h> -#ifndef DRBG_CAVS_DATA_H -# define DRBG_CAVS_DATA_H +#ifndef OSSL_TEST_DRBG_CAVS_DATA_H +# define OSSL_TEST_DRBG_CAVS_DATA_H enum drbg_kat_type { NO_RESEED, diff --git a/test/ecdsatest.h b/test/ecdsatest.h index 216e66e277..63fe319025 100644 --- a/test/ecdsatest.h +++ b/test/ecdsatest.h @@ -7,8 +7,8 @@ * https://www.openssl.org/source/license.html */ -#ifndef ECDSATEST_CAVS_H -# define ECDSATEST_CAVS_H +#ifndef OSSL_TEST_ECDSATEST_H +# define OSSL_TEST_ECDSATEST_H /*- * NIST CAVP ECDSA KATs: @@ -10211,4 +10211,4 @@ static const ecdsa_cavs_kat_t ecdsa_cavs_kats[] = { "1c8c4343a8ecbf7c4d4e48f7d76d5658bc027c77086ec8b10097deb307d6"} # endif /* OPENSSL_NO_EC2M */ }; -#endif /* ECDSATEST_CAVS_H */ +#endif /* OSSL_TEST_ECDSATEST_H */ diff --git a/test/handshake_helper.h b/test/handshake_helper.h index ab6446a490..96406dd93e 100644 --- a/test/handshake_helper.h +++ b/test/handshake_helper.h @@ -7,8 +7,8 @@ * https://www.openssl.org/source/license.html */ -#ifndef HEADER_HANDSHAKE_HELPER_H -#define HEADER_HANDSHAKE_HELPER_H +#ifndef OSSL_TEST_HANDSHAKE_HELPER_H +#define OSSL_TEST_HANDSHAKE_HELPER_H #include "ssl_test_ctx.h" @@ -78,4 +78,4 @@ HANDSHAKE_RESULT *do_handshake(SSL_CTX *server_ctx, SSL_CTX *server2_ctx, SSL_CTX *resume_client_ctx, const SSL_TEST_CTX *test_ctx); -#endif /* HEADER_HANDSHAKE_HELPER_H */ +#endif /* OSSL_TEST_HANDSHAKE_HELPER_H */ diff --git a/test/ossl_shim/async_bio.h b/test/ossl_shim/async_bio.h index bb24eadbbf..c09e236aef 100644 --- a/test/ossl_shim/async_bio.h +++ b/test/ossl_shim/async_bio.h @@ -7,8 +7,8 @@ * https://www.openssl.org/source/license.html */ -#ifndef HEADER_ASYNC_BIO -#define HEADER_ASYNC_BIO +#ifndef OSSL_TEST_SHIM_ASYNC_BIO_H +#define OSSL_TEST_SHIM_ASYNC_BIO_H #include <openssl/base.h> #include <openssl/bio.h> @@ -36,4 +36,4 @@ void AsyncBioAllowWrite(BIO *bio, size_t count); void AsyncBioEnforceWriteQuota(BIO *bio, bool enforce); -#endif // HEADER_ASYNC_BIO +#endif // OSSL_TEST_SHIM_ASYNC_BIO_H diff --git a/test/ossl_shim/include/openssl/base.h b/test/ossl_shim/include/openssl/base.h index f725cd9d45..a8d47b86ae 100644 --- a/test/ossl_shim/include/openssl/base.h +++ b/test/ossl_shim/include/openssl/base.h @@ -7,8 +7,8 @@ * https://www.openssl.org/source/license.html */ -#ifndef OPENSSL_HEADER_BASE_H -#define OPENSSL_HEADER_BASE_H +#ifndef OSSL_TEST_SHIM_INCLUDE_OPENSSL_BASE_H +#define OSSL_TEST_SHIM_INCLUDE_OPENSSL_BASE_H /* Needed for BORINGSSL_MAKE_DELETER */ # include <openssl/bio.h> @@ -108,4 +108,4 @@ BORINGSSL_MAKE_DELETER(SSL_SESSION, SSL_SESSION_free) } /* extern C++ */ -#endif /* OPENSSL_HEADER_BASE_H */ +#endif /* OSSL_TEST_SHIM_INCLUDE_OPENSSL_BASE_H */ diff --git a/test/ossl_shim/packeted_bio.h b/test/ossl_shim/packeted_bio.h index 436cf9082f..895bd37952 100644 --- a/test/ossl_shim/packeted_bio.h +++ b/test/ossl_shim/packeted_bio.h @@ -7,8 +7,8 @@ * https://www.openssl.org/source/license.html */ -#ifndef HEADER_PACKETED_BIO -#define HEADER_PACKETED_BIO +#ifndef OSSL_TEST_SHIM_PACKETED_BIO_H +#define OSSL_TEST_SHIM_PACKETED_BIO_H #include <openssl/base.h> #include <openssl/bio.h> @@ -32,4 +32,4 @@ timeval PacketedBioGetClock(const BIO *bio); bool PacketedBioAdvanceClock(BIO *bio); -#endif // HEADER_PACKETED_BIO +#endif // OSSL_TEST_SHIM_PACKETED_BIO_H diff --git a/test/ossl_shim/test_config.h b/test/ossl_shim/test_config.h index b4efa455ae..f95475a42e 100644 --- a/test/ossl_shim/test_config.h +++ b/test/ossl_shim/test_config.h @@ -7,8 +7,8 @@ * https://www.openssl.org/source/license.html */ -#ifndef HEADER_TEST_CONFIG -#define HEADER_TEST_CONFIG +#ifndef OSSL_TEST_SHIM_TEST_CONFIG_H +#define OSSL_TEST_SHIM_TEST_CONFIG_H #include <string> #include <vector> @@ -85,4 +85,4 @@ struct TestConfig { bool ParseConfig(int argc, char **argv, TestConfig *out_config); -#endif // HEADER_TEST_CONFIG +#endif // OSSL_TEST_SHIM_TEST_CONFIG_H diff --git a/test/ssl_test_ctx.h b/test/ssl_test_ctx.h index 36d73f752c..7e670c9468 100644 --- a/test/ssl_test_ctx.h +++ b/test/ssl_test_ctx.h @@ -7,8 +7,8 @@ * https://www.openssl.org/source/license.html */ -#ifndef HEADER_SSL_TEST_CTX_H -#define HEADER_SSL_TEST_CTX_H +#ifndef OSSL_TEST_SSL_TEST_CTX_H +#define OSSL_TEST_SSL_TEST_CTX_H #include <openssl/conf.h> #include <openssl/ssl.h> @@ -250,4 +250,4 @@ SSL_TEST_CTX *SSL_TEST_CTX_new(void); void SSL_TEST_CTX_free(SSL_TEST_CTX *ctx); -#endif /* HEADER_SSL_TEST_CTX_H */ +#endif /* OSSL_TEST_SSL_TEST_CTX_H */ diff --git a/test/ssltestlib.h b/test/ssltestlib.h index 56e323f5bc..17b278219a 100644 --- a/test/ssltestlib.h +++ b/test/ssltestlib.h @@ -7,8 +7,8 @@ * https://www.openssl.org/source/license.html */ -#ifndef HEADER_SSLTESTLIB_H -# define HEADER_SSLTESTLIB_H +#ifndef OSSL_TEST_SSLTESTLIB_H +# define OSSL_TEST_SSLTESTLIB_H # include <openssl/ssl.h> @@ -53,4 +53,4 @@ typedef struct mempacket_st MEMPACKET; DEFINE_STACK_OF(MEMPACKET) -#endif /* HEADER_SSLTESTLIB_H */ +#endif /* OSSL_TEST_SSLTESTLIB_H */ diff --git a/test/testutil.h b/test/testutil.h index 2a610d7bff..575be955b5 100644 --- a/test/testutil.h +++ b/test/testutil.h @@ -7,8 +7,8 @@ * https://www.openssl.org/source/license.html */ -#ifndef HEADER_TESTUTIL_H -# define HEADER_TESTUTIL_H +#ifndef OSSL_TESTUTIL_H +# define OSSL_TESTUTIL_H #include <stdarg.h> @@ -465,4 +465,4 @@ void test_random_seed(uint32_t sd); /* Create a file path from a directory and a filename */ char *test_mk_file_path(const char *dir, const char *file); -#endif /* HEADER_TESTUTIL_H */ +#endif /* OSSL_TESTUTIL_H */ diff --git a/test/testutil/output.h b/test/testutil/output.h index 8e2b2a340a..f5be69e662 100644 --- a/test/testutil/output.h +++ b/test/testutil/output.h @@ -7,8 +7,8 @@ * https://www.openssl.org/source/license.html */ -#ifndef HEADER_TU_OUTPUT_H -# define HEADER_TU_OUTPUT_H +#ifndef OSSL_TESTUTIL_OUTPUT_H +# define OSSL_TESTUTIL_OUTPUT_H #include <stdarg.h> @@ -29,4 +29,4 @@ int test_flush_stderr(void); int test_printf_stdout(const char *fmt, ...); int test_printf_stderr(const char *fmt, ...); -#endif /* HEADER_TU_OUTPUT_H */ +#endif /* OSSL_TESTUTIL_OUTPUT_H */ |