{"schema":"libjg2-1", "vpath":"/git/", "avatar":"/git/avatar/", "alang":"", "gen_ut":1752659371, "reponame":"openssl", "desc":"OpenSSL", "owner": { "name": "Andy Green", "email": "andy@warmcat.com", "md5": "c50933ca2aa61e0fe2c43d46bb6b59cb" },"url":"https://warmcat.com/repo/openssl", "f":3, "items": [ {"schema":"libjg2-1", "cid":"5e4c97dbadb14019c0e4d160253875d2", "commit": {"type":"commit", "time": 1569621492, "time_ofs": 120, "oid_tree": { "oid": "8e898384b78a7bb26dcaba572eba6c4579e6e569", "alias": []}, "oid":{ "oid": "fbbfd128c9aa884216ace8c63be9071b3b690bee", "alias": []}, "msg": "Fix header file include guard names", "sig_commit": { "git_time": { "time": 1569621492, "offset": 120 }, "name": "Dr. Matthias St. Pierre", "email": "Matthias.St.Pierre@ncp-e.com", "md5": "7d700d548b38974b2492f8ff219793b3" }, "sig_author": { "git_time": { "time": 1569621492, "offset": 120 }, "name": "Dr. Matthias St. Pierre", "email": "Matthias.St.Pierre@ncp-e.com", "md5": "7d700d548b38974b2492f8ff219793b3" }}, "body": "Fix header file include guard names\n\nMake the include guards consistent by renaming them systematically according\nto the naming conventions below\n\nThe public header files (in the 'include/openssl' directory) are not changed\nin 1.1.1, because it is a stable release.\n\nFor the private header files files, the guard names try to match the path\nspecified in the include directives, with all letters converted to upper case\nand '/' and '.' replaced by '_'. An extra 'OSSL_' is added as prefix.\n\nReviewed-by: Richard Levitte \u003clevitte@openssl.org\u003e\n(Merged from https://github.com/openssl/openssl/pull/9681)\n" , "diff": "diff --git a/apps/apps.h b/apps/apps.h\nindex 4a3e1a8..34c3fd8 100644\n--- a/apps/apps.h\n+++ b/apps/apps.h\n@@ -7,8 +7,8 @@\n * https://www.openssl.org/source/license.html\n */\n \n-#ifndef HEADER_APPS_H\n-# define HEADER_APPS_H\n+#ifndef OSSL_APPS_H\n+# define OSSL_APPS_H\n \n # include \u0022e_os.h\u0022 /* struct timeval for DTLS */\n # include \u0022internal/nelem.h\u0022\ndiff --git a/apps/timeouts.h b/apps/timeouts.h\nindex e023b0a..7e606cb 100644\n--- a/apps/timeouts.h\n+++ b/apps/timeouts.h\n@@ -7,11 +7,11 @@\n * https://www.openssl.org/source/license.html\n */\n \n-#ifndef INCLUDED_TIMEOUTS_H\n-# define INCLUDED_TIMEOUTS_H\n+#ifndef OSSL_APPS_TIMEOUTS_H\n+# define OSSL_APPS_TIMEOUTS_H\n \n /* numbers in us */\n # define DGRAM_RCV_TIMEOUT 250000\n # define DGRAM_SND_TIMEOUT 250000\n \n-#endif /* ! INCLUDED_TIMEOUTS_H */\n+#endif /* ! OSSL_APPS_TIMEOUTS_H */\ndiff --git a/apps/vms_term_sock.h b/apps/vms_term_sock.h\nindex c4d1702..e092b18 100644\n--- a/apps/vms_term_sock.h\n+++ b/apps/vms_term_sock.h\n@@ -8,8 +8,8 @@\n * https://www.openssl.org/source/license.html\n */\n \n-#ifndef TERM_SOCK_H\n-# define TERM_SOCK_H\n+#ifndef OSSL_APPS_VMS_TERM_SOCK_H\n+# define OSSL_APPS_VMS_TERM_SOCK_H\n \n /*\n ** Terminal Socket Function Codes\ndiff --git a/crypto/aes/aes_local.h b/crypto/aes/aes_local.h\nindex adee29d..cc84568 100644\n--- a/crypto/aes/aes_local.h\n+++ b/crypto/aes/aes_local.h\n@@ -7,8 +7,8 @@\n * https://www.openssl.org/source/license.html\n */\n \n-#ifndef HEADER_AES_LOCL_H\n-# define HEADER_AES_LOCL_H\n+#ifndef OSSL_CRYPTO_AES_LOCAL_H\n+# define OSSL_CRYPTO_AES_LOCAL_H\n \n # include \u003copenssl/e_os2.h\u003e\n # include \u003cstdio.h\u003e\n@@ -39,4 +39,4 @@ typedef unsigned char u8;\n /* This controls loop-unrolling in aes_core.c */\n # undef FULL_UNROLL\n \n-#endif /* !HEADER_AES_LOCL_H */\n+#endif /* !OSSL_CRYPTO_AES_LOCAL_H */\ndiff --git a/crypto/arm_arch.h b/crypto/arm_arch.h\nindex f11b543..8b71055 100644\n--- a/crypto/arm_arch.h\n+++ b/crypto/arm_arch.h\n@@ -7,8 +7,8 @@\n * https://www.openssl.org/source/license.html\n */\n \n-#ifndef __ARM_ARCH_H__\n-# define __ARM_ARCH_H__\n+#ifndef OSSL_CRYPTO_ARM_ARCH_H\n+# define OSSL_CRYPTO_ARM_ARCH_H\n \n # if !defined(__ARM_ARCH__)\n # if defined(__CC_ARM)\ndiff --git a/crypto/async/arch/async_posix.h b/crypto/async/arch/async_posix.h\nindex 62449fe..873c031 100644\n--- a/crypto/async/arch/async_posix.h\n+++ b/crypto/async/arch/async_posix.h\n@@ -7,8 +7,8 @@\n * https://www.openssl.org/source/license.html\n */\n \n-#ifndef OPENSSL_ASYNC_ARCH_ASYNC_POSIX_H\n-#define OPENSSL_ASYNC_ARCH_ASYNC_POSIX_H\n+#ifndef OSSL_CRYPTO_ASYNC_POSIX_H\n+#define OSSL_CRYPTO_ASYNC_POSIX_H\n #include \u003copenssl/e_os2.h\u003e\n \n #if defined(OPENSSL_SYS_UNIX) \u005c\n@@ -55,4 +55,4 @@ void async_fibre_free(async_fibre *fibre);\n \n # endif\n #endif\n-#endif /* OPENSSL_ASYNC_ARCH_ASYNC_POSIX_H */\n+#endif /* OSSL_CRYPTO_ASYNC_POSIX_H */\ndiff --git a/crypto/bf/bf_local.h b/crypto/bf/bf_local.h\nindex b1a415e..8c76976 100644\n--- a/crypto/bf/bf_local.h\n+++ b/crypto/bf/bf_local.h\n@@ -7,8 +7,8 @@\n * https://www.openssl.org/source/license.html\n */\n \n-#ifndef HEADER_BF_LOCL_H\n-# define HEADER_BF_LOCL_H\n+#ifndef OSSL_CRYPTO_BF_LOCAL_H\n+# define OSSL_CRYPTO_BF_LOCAL_H\n # include \u003copenssl/opensslconf.h\u003e\n \n /* NOTE - c is not incremented as per n2l */\ndiff --git a/crypto/bio/bio_local.h b/crypto/bio/bio_local.h\nindex 2ec1ef5..8b21221 100644\n--- a/crypto/bio/bio_local.h\n+++ b/crypto/bio/bio_local.h\n@@ -27,7 +27,7 @@\n * For clarity, we check for internal/cryptlib.h since it's a common header\n * that also includes bio.h.\n */\n-# ifdef HEADER_CRYPTLIB_H\n+# ifdef OSSL_INTERNAL_CRYPTLIB_H\n # error internal/cryptlib.h included before bio_local.h\n # endif\n # ifdef HEADER_BIO_H\ndiff --git a/crypto/bn/bn_local.h b/crypto/bn/bn_local.h\nindex 5e895b0..3722810 100644\n--- a/crypto/bn/bn_local.h\n+++ b/crypto/bn/bn_local.h\n@@ -7,8 +7,8 @@\n * https://www.openssl.org/source/license.html\n */\n \n-#ifndef HEADER_BN_LCL_H\n-# define HEADER_BN_LCL_H\n+#ifndef OSSL_CRYPTO_BN_LOCAL_H\n+# define OSSL_CRYPTO_BN_LOCAL_H\n \n /*\n * The EDK2 build doesn't use bn_conf.h; it sets THIRTY_TWO_BIT or\ndiff --git a/crypto/bn/rsaz_exp.h b/crypto/bn/rsaz_exp.h\nindex c5864f8..88f65a4 100644\n--- a/crypto/bn/rsaz_exp.h\n+++ b/crypto/bn/rsaz_exp.h\n@@ -12,8 +12,8 @@\n * (2) University of Haifa, Israel\n */\n \n-#ifndef RSAZ_EXP_H\n-# define RSAZ_EXP_H\n+#ifndef OSSL_CRYPTO_BN_RSAZ_EXP_H\n+# define OSSL_CRYPTO_BN_RSAZ_EXP_H\n \n # undef RSAZ_ENABLED\n # if defined(OPENSSL_BN_ASM_MONT) \u0026\u0026 \u005c\ndiff --git a/crypto/camellia/cmll_local.h b/crypto/camellia/cmll_local.h\nindex 6403b39..d16baa5 100644\n--- a/crypto/camellia/cmll_local.h\n+++ b/crypto/camellia/cmll_local.h\n@@ -22,8 +22,8 @@\n * to the OpenSSL project.\n */\n \n-#ifndef HEADER_CAMELLIA_LOCL_H\n-# define HEADER_CAMELLIA_LOCL_H\n+#ifndef OSSL_CRYPTO_CAMELLIA_CMLL_LOCAL_H\n+# define OSSL_CRYPTO_CAMELLIA_CMLL_LOCAL_H\n \n typedef unsigned int u32;\n typedef unsigned char u8;\n@@ -40,4 +40,4 @@ void Camellia_EncryptBlock(int keyBitLength, const u8 plaintext[],\n const KEY_TABLE_TYPE keyTable, u8 ciphertext[]);\n void Camellia_DecryptBlock(int keyBitLength, const u8 ciphertext[],\n const KEY_TABLE_TYPE keyTable, u8 plaintext[]);\n-#endif /* #ifndef HEADER_CAMELLIA_LOCL_H */\n+#endif /* #ifndef OSSL_CRYPTO_CAMELLIA_CMLL_LOCAL_H */\ndiff --git a/crypto/cms/cms_local.h b/crypto/cms/cms_local.h\nindex 68aa012..a0ce444 100644\n--- a/crypto/cms/cms_local.h\n+++ b/crypto/cms/cms_local.h\n@@ -7,8 +7,8 @@\n * https://www.openssl.org/source/license.html\n */\n \n-#ifndef HEADER_CMS_LCL_H\n-# define HEADER_CMS_LCL_H\n+#ifndef OSSL_CRYPTO_CMS_LOCAL_H\n+# define OSSL_CRYPTO_CMS_LOCAL_H\n \n # include \u003copenssl/x509.h\u003e\n \ndiff --git a/crypto/des/des_local.h b/crypto/des/des_local.h\nindex f401e6f..0f58a1c 100644\n--- a/crypto/des/des_local.h\n+++ b/crypto/des/des_local.h\n@@ -7,8 +7,8 @@\n * https://www.openssl.org/source/license.html\n */\n \n-#ifndef HEADER_DES_LOCL_H\n-# define HEADER_DES_LOCL_H\n+#ifndef OSSL_CRYPTO_DES_LOCAL_H\n+# define OSSL_CRYPTO_DES_LOCAL_H\n \n # include \u003copenssl/e_os2.h\u003e\n \ndiff --git a/crypto/ec/curve448/arch_32/arch_intrinsics.h b/crypto/ec/curve448/arch_32/arch_intrinsics.h\nindex c464108..5f63898 100644\n--- a/crypto/ec/curve448/arch_32/arch_intrinsics.h\n+++ b/crypto/ec/curve448/arch_32/arch_intrinsics.h\n@@ -10,8 +10,8 @@\n * Originally written by Mike Hamburg\n */\n \n-#ifndef HEADER_ARCH_32_ARCH_INTRINSICS_H\n-# define HEADER_ARCH_32_ARCH_INTRINSICS_H\n+#ifndef OSSL_CRYPTO_EC_CURVE448_ARCH_32_INTRINSICS_H\n+# define OSSL_CRYPTO_EC_CURVE448_ARCH_32_INTRINSICS_H\n \n #include \u0022internal/constant_time.h\u0022\n \n@@ -24,4 +24,4 @@ static ossl_inline uint64_t widemul(uint32_t a, uint32_t b)\n return ((uint64_t)a) * b;\n }\n \n-#endif /* HEADER_ARCH_32_ARCH_INTRINSICS_H */\n+#endif /* OSSL_CRYPTO_EC_CURVE448_ARCH_32_INTRINSICS_H */\ndiff --git a/crypto/ec/curve448/arch_32/f_impl.h b/crypto/ec/curve448/arch_32/f_impl.h\nindex bbde84a..e1dddda 100644\n--- a/crypto/ec/curve448/arch_32/f_impl.h\n+++ b/crypto/ec/curve448/arch_32/f_impl.h\n@@ -10,8 +10,8 @@\n * Originally written by Mike Hamburg\n */\n \n-#ifndef HEADER_ARCH_32_F_IMPL_H\n-# define HEADER_ARCH_32_F_IMPL_H\n+#ifndef OSSL_CRYPTO_EC_CURVE448_ARCH_32_F_IMPL_H\n+# define OSSL_CRYPTO_EC_CURVE448_ARCH_32_F_IMPL_H\n \n # define GF_HEADROOM 2\n # define LIMB(x) ((x) \u0026 ((1 \u003c\u003c 28) - 1)), ((x) \u003e\u003e 28)\n@@ -57,4 +57,4 @@ void gf_weak_reduce(gf a)\n a-\u003elimb[0] \u003d (a-\u003elimb[0] \u0026 mask) + tmp;\n }\n \n-#endif /* HEADER_ARCH_32_F_IMPL_H */\n+#endif /* OSSL_CRYPTO_EC_CURVE448_ARCH_32_F_IMPL_H */\ndiff --git a/crypto/ec/curve448/curve448_local.h b/crypto/ec/curve448/curve448_local.h\nindex 2bc3bd8..b277706 100644\n--- a/crypto/ec/curve448/curve448_local.h\n+++ b/crypto/ec/curve448/curve448_local.h\n@@ -6,8 +6,8 @@\n * in the file LICENSE in the source distribution or at\n * https://www.openssl.org/source/license.html\n */\n-#ifndef HEADER_CURVE448_LCL_H\n-# define HEADER_CURVE448_LCL_H\n+#ifndef OSSL_CRYPTO_EC_CURVE448_LOCAL_H\n+# define OSSL_CRYPTO_EC_CURVE448_LOCAL_H\n # include \u0022curve448utils.h\u0022\n \n int X448(uint8_t out_shared_key[56], const uint8_t private_key[56],\n@@ -35,4 +35,4 @@ int ED448ph_verify(const uint8_t hash[64], const uint8_t signature[114],\n int ED448_public_from_private(uint8_t out_public_key[57],\n const uint8_t private_key[57]);\n \n-#endif /* HEADER_CURVE448_LCL_H */\n+#endif /* OSSL_CRYPTO_EC_CURVE448_LOCAL_H */\ndiff --git a/crypto/ec/curve448/curve448utils.h b/crypto/ec/curve448/curve448utils.h\nindex 9032bb4..86c258e 100644\n--- a/crypto/ec/curve448/curve448utils.h\n+++ b/crypto/ec/curve448/curve448utils.h\n@@ -10,8 +10,8 @@\n * Originally written by Mike Hamburg\n */\n \n-#ifndef HEADER_CURVE448UTILS_H\n-# define HEADER_CURVE448UTILS_H\n+#ifndef OSSL_CRYPTO_EC_CURVE448UTILS_H\n+# define OSSL_CRYPTO_EC_CURVE448UTILS_H\n \n # include \u003copenssl/e_os2.h\u003e\n \ndiff --git a/crypto/ec/curve448/ed448.h b/crypto/ec/curve448/ed448.h\nindex 5fe939e..c1e5c28 100644\n--- a/crypto/ec/curve448/ed448.h\n+++ b/crypto/ec/curve448/ed448.h\n@@ -10,8 +10,8 @@\n * Originally written by Mike Hamburg\n */\n \n-#ifndef HEADER_ED448_H\n-# define HEADER_ED448_H\n+#ifndef OSSL_CRYPTO_EC_CURVE448_ED448_H\n+# define OSSL_CRYPTO_EC_CURVE448_ED448_H\n \n # include \u0022point_448.h\u0022\n \n@@ -192,4 +192,4 @@ c448_error_t c448_ed448_convert_private_key_to_x448(\n uint8_t x[X448_PRIVATE_BYTES],\n const uint8_t ed[EDDSA_448_PRIVATE_BYTES]);\n \n-#endif /* HEADER_ED448_H */\n+#endif /* OSSL_CRYPTO_EC_CURVE448_ED448_H */\ndiff --git a/crypto/ec/curve448/field.h b/crypto/ec/curve448/field.h\nindex 8d046da..ccd0448 100644\n--- a/crypto/ec/curve448/field.h\n+++ b/crypto/ec/curve448/field.h\n@@ -10,8 +10,8 @@\n * Originally written by Mike Hamburg\n */\n \n-#ifndef HEADER_FIELD_H\n-# define HEADER_FIELD_H\n+#ifndef OSSL_CRYPTO_EC_CURVE448_FIELD_H\n+# define OSSL_CRYPTO_EC_CURVE448_FIELD_H\n \n # include \u0022internal/constant_time.h\u0022\n # include \u003cstring.h\u003e\n@@ -165,4 +165,4 @@ static ossl_inline void gf_cond_swap(gf x, gf_s * RESTRICT y, mask_t swap)\n }\n }\n \n-#endif /* HEADER_FIELD_H */\n+#endif /* OSSL_CRYPTO_EC_CURVE448_FIELD_H */\ndiff --git a/crypto/ec/curve448/point_448.h b/crypto/ec/curve448/point_448.h\nindex 399f91b..93e715f 100644\n--- a/crypto/ec/curve448/point_448.h\n+++ b/crypto/ec/curve448/point_448.h\n@@ -10,8 +10,8 @@\n * Originally written by Mike Hamburg\n */\n \n-#ifndef HEADER_POINT_448_H\n-# define HEADER_POINT_448_H\n+#ifndef OSSL_CRYPTO_EC_CURVE448_POINT_448_H\n+# define OSSL_CRYPTO_EC_CURVE448_POINT_448_H\n \n # include \u0022curve448utils.h\u0022\n # include \u0022field.h\u0022\n@@ -298,4 +298,4 @@ void curve448_scalar_destroy(curve448_scalar_t scalar);\n /* Overwrite point with zeros. */\n void curve448_point_destroy(curve448_point_t point);\n \n-#endif /* HEADER_POINT_448_H */\n+#endif /* OSSL_CRYPTO_EC_CURVE448_POINT_448_H */\ndiff --git a/crypto/ec/curve448/word.h b/crypto/ec/curve448/word.h\nindex a48b9e0..237cc9b 100644\n--- a/crypto/ec/curve448/word.h\n+++ b/crypto/ec/curve448/word.h\n@@ -10,8 +10,8 @@\n * Originally written by Mike Hamburg\n */\n \n-#ifndef HEADER_WORD_H\n-# define HEADER_WORD_H\n+#ifndef OSSL_CRYPTO_EC_CURVE448_WORD_H\n+# define OSSL_CRYPTO_EC_CURVE448_WORD_H\n \n # include \u003cstring.h\u003e\n # include \u003cassert.h\u003e\n@@ -78,4 +78,4 @@ static ossl_inline mask_t bool_to_mask(c448_bool_t m)\n return ret;\n }\n \n-#endif /* HEADER_WORD_H */\n+#endif /* OSSL_CRYPTO_EC_CURVE448_WORD_H */\ndiff --git a/crypto/engine/eng_local.h b/crypto/engine/eng_local.h\nindex b5f3b50..8ef7172 100644\n--- a/crypto/engine/eng_local.h\n+++ b/crypto/engine/eng_local.h\n@@ -8,8 +8,8 @@\n * https://www.openssl.org/source/license.html\n */\n \n-#ifndef HEADER_ENGINE_INT_H\n-# define HEADER_ENGINE_INT_H\n+#ifndef OSSL_CRYPTO_ENGINE_ENG_LOCAL_H\n+# define OSSL_CRYPTO_ENGINE_ENG_LOCAL_H\n \n # include \u0022internal/cryptlib.h\u0022\n # include \u0022crypto/engine.h\u0022\n@@ -168,4 +168,4 @@ typedef struct st_engine_pile ENGINE_PILE;\n \n DEFINE_LHASH_OF(ENGINE_PILE);\n \n-#endif /* HEADER_ENGINE_INT_H */\n+#endif /* OSSL_CRYPTO_ENGINE_ENG_LOCAL_H */\ndiff --git a/crypto/hmac/hmac_local.h b/crypto/hmac/hmac_local.h\nindex 8fd8345..ed855e8 100644\n--- a/crypto/hmac/hmac_local.h\n+++ b/crypto/hmac/hmac_local.h\n@@ -7,8 +7,8 @@\n * https://www.openssl.org/source/license.html\n */\n \n-#ifndef HEADER_HMAC_LCL_H\n-# define HEADER_HMAC_LCL_H\n+#ifndef OSSL_CRYPTO_HMAC_LOCAL_H\n+# define OSSL_CRYPTO_HMAC_LOCAL_H\n \n /* The current largest case is for SHA3-224 */\n #define HMAC_MAX_MD_CBLOCK_SIZE 144\ndiff --git a/crypto/mips_arch.h b/crypto/mips_arch.h\nindex e18ac07..4ae1a1a 100644\n--- a/crypto/mips_arch.h\n+++ b/crypto/mips_arch.h\n@@ -7,8 +7,8 @@\n * https://www.openssl.org/source/license.html\n */\n \n-#ifndef __MIPS_ARCH_H__\n-# define __MIPS_ARCH_H__\n+#ifndef OSSL_CRYPTO_MIPS_ARCH_H\n+# define OSSL_CRYPTO_MIPS_ARCH_H\n \n # if (defined(__mips_smartmips) || defined(_MIPS_ARCH_MIPS32R3) || \u005c\n defined(_MIPS_ARCH_MIPS32R5) || defined(_MIPS_ARCH_MIPS32R6)) \u005c\ndiff --git a/crypto/ppc_arch.h b/crypto/ppc_arch.h\nindex 72bd746..e3845e9 100644\n--- a/crypto/ppc_arch.h\n+++ b/crypto/ppc_arch.h\n@@ -7,8 +7,8 @@\n * https://www.openssl.org/source/license.html\n */\n \n-#ifndef HEADER_PPC_ARCH_H\n-# define HEADER_PPC_ARCH_H\n+#ifndef OSSL_CRYPTO_PPC_ARCH_H\n+# define OSSL_CRYPTO_PPC_ARCH_H\n \n extern unsigned int OPENSSL_ppccap_P;\n \ndiff --git a/crypto/rand/rand_local.h b/crypto/rand/rand_local.h\nindex 306c59f..96fa3ca 100644\n--- a/crypto/rand/rand_local.h\n+++ b/crypto/rand/rand_local.h\n@@ -7,8 +7,8 @@\n * https://www.openssl.org/source/license.html\n */\n \n-#ifndef HEADER_RAND_LCL_H\n-# define HEADER_RAND_LCL_H\n+#ifndef OSSL_CRYPTO_RAND_LOCAL_H\n+# define OSSL_CRYPTO_RAND_LOCAL_H\n \n # include \u003copenssl/aes.h\u003e\n # include \u003copenssl/evp.h\u003e\ndiff --git a/crypto/rc4/rc4_local.h b/crypto/rc4/rc4_local.h\nindex 4380add..e739be4 100644\n--- a/crypto/rc4/rc4_local.h\n+++ b/crypto/rc4/rc4_local.h\n@@ -7,8 +7,8 @@\n * https://www.openssl.org/source/license.html\n */\n \n-#ifndef HEADER_RC4_LOCL_H\n-# define HEADER_RC4_LOCL_H\n+#ifndef OSSL_CRYPTO_RC4_LOCAL_H\n+# define OSSL_CRYPTO_RC4_LOCAL_H\n \n # include \u003copenssl/opensslconf.h\u003e\n # include \u0022internal/cryptlib.h\u0022\ndiff --git a/crypto/s390x_arch.h b/crypto/s390x_arch.h\nindex 4a775a9..4d2cc02 100644\n--- a/crypto/s390x_arch.h\n+++ b/crypto/s390x_arch.h\n@@ -7,8 +7,8 @@\n * https://www.openssl.org/source/license.html\n */\n \n-#ifndef S390X_ARCH_H\n-# define S390X_ARCH_H\n+#ifndef OSSL_CRYPTO_S390X_ARCH_H\n+# define OSSL_CRYPTO_S390X_ARCH_H\n \n # ifndef __ASSEMBLER__\n \ndiff --git a/crypto/seed/seed_local.h b/crypto/seed/seed_local.h\nindex ac2950d..e3681f8 100644\n--- a/crypto/seed/seed_local.h\n+++ b/crypto/seed/seed_local.h\n@@ -32,8 +32,8 @@\n * SUCH DAMAGE.\n *\n */\n-#ifndef HEADER_SEED_LOCL_H\n-# define HEADER_SEED_LOCL_H\n+#ifndef OSSL_CRYPTO_SEED_LOCAL_H\n+# define OSSL_CRYPTO_SEED_LOCAL_H\n \n # include \u0022openssl/e_os2.h\u0022\n # include \u003copenssl/seed.h\u003e\n@@ -109,4 +109,4 @@ typedef unsigned int seed_word;\n (X1) ^\u003d (T0); \u005c\n (X2) ^\u003d (T1)\n \n-#endif /* HEADER_SEED_LOCL_H */\n+#endif /* OSSL_CRYPTO_SEED_LOCAL_H */\ndiff --git a/crypto/sparc_arch.h b/crypto/sparc_arch.h\nindex 99eafb3..c74063b 100644\n--- a/crypto/sparc_arch.h\n+++ b/crypto/sparc_arch.h\n@@ -7,8 +7,8 @@\n * https://www.openssl.org/source/license.html\n */\n \n-#ifndef __SPARC_ARCH_H__\n-# define __SPARC_ARCH_H__\n+#ifndef OSSL_CRYPTO_SPARC_ARCH_H\n+# define OSSL_CRYPTO_SPARC_ARCH_H\n \n # define SPARCV9_TICK_PRIVILEGED (1\u003c\u003c0)\n # define SPARCV9_PREFER_FPU (1\u003c\u003c1)\n@@ -115,4 +115,4 @@\n mov tmp, %o7;\n # endif\n \n-#endif /* __SPARC_ARCH_H__ */\n+#endif /* OSSL_CRYPTO_SPARC_ARCH_H */\ndiff --git a/crypto/ui/ui_local.h b/crypto/ui/ui_local.h\nindex 19b33b8..8a7dbda 100644\n--- a/crypto/ui/ui_local.h\n+++ b/crypto/ui/ui_local.h\n@@ -7,8 +7,8 @@\n * https://www.openssl.org/source/license.html\n */\n \n-#ifndef HEADER_UI_LOCL_H\n-# define HEADER_UI_LOCL_H\n+#ifndef OSSL_CRYPTO_UI_LOCAL_H\n+# define OSSL_CRYPTO_UI_LOCAL_H\n \n # include \u003copenssl/ui.h\u003e\n # include \u003copenssl/crypto.h\u003e\ndiff --git a/crypto/x509v3/v3_admis.h b/crypto/x509v3/v3_admis.h\nindex fa23fc7..ea7632b 100644\n--- a/crypto/x509v3/v3_admis.h\n+++ b/crypto/x509v3/v3_admis.h\n@@ -7,8 +7,8 @@\n * https://www.openssl.org/source/license.html\n */\n \n-#ifndef HEADER_V3_ADMISSION_H\n-# define HEADER_V3_ADMISSION_H\n+#ifndef OSSL_CRYPTO_X509V3_V3_ADMIS_H\n+# define OSSL_CRYPTO_X509V3_V3_ADMIS_H\n \n struct NamingAuthority_st {\n ASN1_OBJECT* namingAuthorityId;\ndiff --git a/e_os.h b/e_os.h\nindex 858bc40..2f8e3fe 100644\n--- a/e_os.h\n+++ b/e_os.h\n@@ -7,8 +7,8 @@\n * https://www.openssl.org/source/license.html\n */\n \n-#ifndef HEADER_E_OS_H\n-# define HEADER_E_OS_H\n+#ifndef OSSL_E_OS_H\n+# define OSSL_E_OS_H\n \n # include \u003climits.h\u003e\n # include \u003copenssl/opensslconf.h\u003e\ndiff --git a/engines/e_afalg.h b/engines/e_afalg.h\nindex 2c03c44..3323c89 100644\n--- a/engines/e_afalg.h\n+++ b/engines/e_afalg.h\n@@ -7,8 +7,8 @@\n * https://www.openssl.org/source/license.html\n */\n \n-#ifndef HEADER_AFALG_H\n-# define HEADER_AFALG_H\n+#ifndef OSSL_ENGINES_E_AFALG_H\n+# define OSSL_ENGINES_E_AFALG_H\n \n # if defined(__GNUC__) \u0026\u0026 __GNUC__ \u003e\u003d 4 \u0026\u0026 \u005c\n (!defined(__STDC_VERSION__) || __STDC_VERSION__ \u003c 199901L)\ndiff --git a/engines/e_afalg_err.h b/engines/e_afalg_err.h\nindex 3eb1332..3036443 100644\n--- a/engines/e_afalg_err.h\n+++ b/engines/e_afalg_err.h\n@@ -8,8 +8,8 @@\n * https://www.openssl.org/source/license.html\n */\n \n-#ifndef HEADER_AFALGERR_H\n-# define HEADER_AFALGERR_H\n+#ifndef OSSL_ENGINES_E_AFALG_ERR_H\n+# define OSSL_ENGINES_E_AFALG_ERR_H\n \n # define AFALGerr(f, r) ERR_AFALG_error((f), (r), OPENSSL_FILE, OPENSSL_LINE)\n \ndiff --git a/engines/e_capi_err.h b/engines/e_capi_err.h\nindex e034c98..e3a927a 100644\n--- a/engines/e_capi_err.h\n+++ b/engines/e_capi_err.h\n@@ -8,8 +8,8 @@\n * https://www.openssl.org/source/license.html\n */\n \n-#ifndef HEADER_CAPIERR_H\n-# define HEADER_CAPIERR_H\n+#ifndef OSSL_ENGINES_E_CAPI_ERR_H\n+# define OSSL_ENGINES_E_CAPI_ERR_H\n \n # define CAPIerr(f, r) ERR_CAPI_error((f), (r), OPENSSL_FILE, OPENSSL_LINE)\n \ndiff --git a/engines/e_dasync_err.h b/engines/e_dasync_err.h\nindex 7c2c027..5b74d8b 100644\n--- a/engines/e_dasync_err.h\n+++ b/engines/e_dasync_err.h\n@@ -8,8 +8,8 @@\n * https://www.openssl.org/source/license.html\n */\n \n-#ifndef HEADER_DASYNCERR_H\n-# define HEADER_DASYNCERR_H\n+#ifndef OSSL_ENGINES_E_DASYNC_ERR_H\n+# define OSSL_ENGINES_E_DASYNC_ERR_H\n \n # define DASYNCerr(f, r) ERR_DASYNC_error((f), (r), OPENSSL_FILE, OPENSSL_LINE)\n \ndiff --git a/engines/e_ossltest_err.h b/engines/e_ossltest_err.h\nindex e745c1a..8e6535b 100644\n--- a/engines/e_ossltest_err.h\n+++ b/engines/e_ossltest_err.h\n@@ -8,8 +8,8 @@\n * https://www.openssl.org/source/license.html\n */\n \n-#ifndef HEADER_OSSLTESTERR_H\n-# define HEADER_OSSLTESTERR_H\n+#ifndef OSSL_ENGINES_E_OSSLTEST_ERR_H\n+# define OSSL_ENGINES_E_OSSLTEST_ERR_H\n \n # define OSSLTESTerr(f, r) ERR_OSSLTEST_error((f), (r), OPENSSL_FILE, OPENSSL_LINE)\n \ndiff --git a/include/crypto/aria.h b/include/crypto/aria.h\nindex 355abe5..03a6295 100644\n--- a/include/crypto/aria.h\n+++ b/include/crypto/aria.h\n@@ -10,8 +10,8 @@\n \n /* Copyright (c) 2017 National Security Research Institute. All rights reserved. */\n \n-#ifndef HEADER_ARIA_H\n-# define HEADER_ARIA_H\n+#ifndef OSSL_CRYPTO_ARIA_H\n+# define OSSL_CRYPTO_ARIA_H\n \n # include \u003copenssl/opensslconf.h\u003e\n \ndiff --git a/include/crypto/bn.h b/include/crypto/bn.h\nindex 30be7ef..60afda1 100644\n--- a/include/crypto/bn.h\n+++ b/include/crypto/bn.h\n@@ -7,8 +7,8 @@\n * https://www.openssl.org/source/license.html\n */\n \n-#ifndef HEADER_BN_INT_H\n-# define HEADER_BN_INT_H\n+#ifndef OSSL_CRYPTO_BN_H\n+# define OSSL_CRYPTO_BN_H\n \n # include \u003copenssl/bn.h\u003e\n # include \u003climits.h\u003e\ndiff --git a/include/crypto/bn_conf.h.in b/include/crypto/bn_conf.h.in\nindex ec6e4f6..b6b9eb7 100644\n--- a/include/crypto/bn_conf.h.in\n+++ b/include/crypto/bn_conf.h.in\n@@ -8,8 +8,8 @@\n * https://www.openssl.org/source/license.html\n */\n \n-#ifndef HEADER_BN_CONF_H\n-# define HEADER_BN_CONF_H\n+#ifndef OSSL_CRYPTO_BN_CONF_H\n+# define OSSL_CRYPTO_BN_CONF_H\n \n /*\n * The contents of this file are not used in the UEFI build, as\ndiff --git a/include/crypto/chacha.h b/include/crypto/chacha.h\nindex 67243f2..4029400 100644\n--- a/include/crypto/chacha.h\n+++ b/include/crypto/chacha.h\n@@ -7,8 +7,8 @@\n * https://www.openssl.org/source/license.html\n */\n \n-#ifndef HEADER_CHACHA_H\n-#define HEADER_CHACHA_H\n+#ifndef OSSL_CRYPTO_CHACHA_H\n+#define OSSL_CRYPTO_CHACHA_H\n \n #include \u003cstddef.h\u003e\n \ndiff --git a/include/crypto/ctype.h b/include/crypto/ctype.h\nindex 9f3a583..81ef8f5 100644\n--- a/include/crypto/ctype.h\n+++ b/include/crypto/ctype.h\n@@ -18,8 +18,8 @@\n * throughout the rest of the source code. Refer to issue #4154 for\n * details.\n */\n-#ifndef INTERNAL_CTYPE_H\n-# define INTERNAL_CTYPE_H\n+#ifndef OSSL_CRYPTO_CTYPE_H\n+# define OSSL_CRYPTO_CTYPE_H\n \n # define CTYPE_MASK_lower 0x1\n # define CTYPE_MASK_upper 0x2\ndiff --git a/include/crypto/dso_conf.h.in b/include/crypto/dso_conf.h.in\nindex b2ace48..57a09b1 100644\n--- a/include/crypto/dso_conf.h.in\n+++ b/include/crypto/dso_conf.h.in\n@@ -8,8 +8,8 @@\n * https://www.openssl.org/source/license.html\n */\n \n-#ifndef HEADER_DSO_CONF_H\n-# define HEADER_DSO_CONF_H\n+#ifndef OSSL_CRYPTO_DSO_CONF_H\n+# define OSSL_CRYPTO_DSO_CONF_H\n {- # The DSO code currently always implements all functions so that no\n # applications will have to worry about that from a compilation point\n # of view. However, the \u0022method\u0022s may return zero unless that platform\ndiff --git a/include/crypto/ec.h b/include/crypto/ec.h\nindex 182c39c..fe52ae7 100644\n--- a/include/crypto/ec.h\n+++ b/include/crypto/ec.h\n@@ -9,8 +9,8 @@\n \n /* Internal EC functions for other submodules: not for application use */\n \n-#ifndef HEADER_OSSL_EC_INTERNAL_H\n-# define HEADER_OSSL_EC_INTERNAL_H\n+#ifndef OSSL_CRYPTO_EC_H\n+# define OSSL_CRYPTO_EC_H\n # include \u003copenssl/opensslconf.h\u003e\n \n # ifndef OPENSSL_NO_EC\ndiff --git a/include/crypto/err.h b/include/crypto/err.h\nindex 44ac944..8ab0e5b 100644\n--- a/include/crypto/err.h\n+++ b/include/crypto/err.h\n@@ -7,8 +7,8 @@\n * https://www.openssl.org/source/license.html\n */\n \n-#ifndef INTERNAL_ERR_INT_H\n-# define INTERNAL_ERR_INT_H\n+#ifndef OSSL_CRYPTO_ERR_H\n+# define OSSL_CRYPTO_ERR_H\n \n int err_load_crypto_strings_int(void);\n void err_cleanup(void);\ndiff --git a/include/crypto/lhash.h b/include/crypto/lhash.h\nindex 200ba86..ab060cc 100644\n--- a/include/crypto/lhash.h\n+++ b/include/crypto/lhash.h\n@@ -7,8 +7,8 @@\n * https://www.openssl.org/source/license.html\n */\n \n-#ifndef INTERNAL_LHASH_H\n-# define INTERNAL_LHASH_H\n+#ifndef OSSL_CRYPTO_LHASH_H\n+# define OSSL_CRYPTO_LHASH_H\n \n unsigned long openssl_lh_strcasehash(const char *);\n \ndiff --git a/include/crypto/rand.h b/include/crypto/rand.h\nindex 10347ab..5350d3a 100644\n--- a/include/crypto/rand.h\n+++ b/include/crypto/rand.h\n@@ -15,8 +15,8 @@\n * or in the file LICENSE in the source distribution.\n */\n \n-#ifndef HEADER_RAND_INT_H\n-# define HEADER_RAND_INT_H\n+#ifndef OSSL_CRYPTO_RAND_H\n+# define OSSL_CRYPTO_RAND_H\n \n # include \u003copenssl/rand.h\u003e\n \ndiff --git a/include/crypto/sha.h b/include/crypto/sha.h\nindex 458a75e..6d15edb 100644\n--- a/include/crypto/sha.h\n+++ b/include/crypto/sha.h\n@@ -8,8 +8,8 @@\n * https://www.openssl.org/source/license.html\n */\n \n-#ifndef HEADER_INTERNAL_SHA_H\n-# define HEADER_INTERNAL_SHA_H\n+#ifndef OSSL_CRYPTO_SHA_H\n+# define OSSL_CRYPTO_SHA_H\n \n # include \u003copenssl/opensslconf.h\u003e\n \ndiff --git a/include/crypto/sm2.h b/include/crypto/sm2.h\nindex 5c5cd4b..76ee80b 100644\n--- a/include/crypto/sm2.h\n+++ b/include/crypto/sm2.h\n@@ -9,8 +9,8 @@\n * https://www.openssl.org/source/license.html\n */\n \n-#ifndef HEADER_SM2_H\n-# define HEADER_SM2_H\n+#ifndef OSSL_CRYPTO_SM2_H\n+# define OSSL_CRYPTO_SM2_H\n # include \u003copenssl/opensslconf.h\u003e\n \n # ifndef OPENSSL_NO_SM2\ndiff --git a/include/crypto/sm2err.h b/include/crypto/sm2err.h\nindex 09edfab..d1c0ee2 100644\n--- a/include/crypto/sm2err.h\n+++ b/include/crypto/sm2err.h\n@@ -8,8 +8,8 @@\n * https://www.openssl.org/source/license.html\n */\n \n-#ifndef HEADER_SM2ERR_H\n-# define HEADER_SM2ERR_H\n+#ifndef OSSL_CRYPTO_SM2ERR_H\n+# define OSSL_CRYPTO_SM2ERR_H\n \n # ifndef HEADER_SYMHACKS_H\n # include \u003copenssl/symhacks.h\u003e\ndiff --git a/include/crypto/sm3.h b/include/crypto/sm3.h\nindex 27eb471..97e7460 100644\n--- a/include/crypto/sm3.h\n+++ b/include/crypto/sm3.h\n@@ -8,8 +8,8 @@\n * https://www.openssl.org/source/license.html\n */\n \n-#ifndef HEADER_SM3_H\n-# define HEADER_SM3_H\n+#ifndef OSSL_CRYPTO_SM3_H\n+# define OSSL_CRYPTO_SM3_H\n \n # include \u003copenssl/opensslconf.h\u003e\n \ndiff --git a/include/crypto/sm4.h b/include/crypto/sm4.h\nindex f1f157e..abe28f3 100644\n--- a/include/crypto/sm4.h\n+++ b/include/crypto/sm4.h\n@@ -8,8 +8,8 @@\n * https://www.openssl.org/source/license.html\n */\n \n-#ifndef HEADER_SM4_H\n-# define HEADER_SM4_H\n+#ifndef OSSL_CRYPTO_SM4_H\n+# define OSSL_CRYPTO_SM4_H\n \n # include \u003copenssl/opensslconf.h\u003e\n # include \u003copenssl/e_os2.h\u003e\ndiff --git a/include/crypto/store.h b/include/crypto/store.h\nindex 81c075b..428d3c6 100644\n--- a/include/crypto/store.h\n+++ b/include/crypto/store.h\n@@ -7,8 +7,8 @@\n * https://www.openssl.org/source/license.html\n */\n \n-#ifndef HEADER_STORE_H\n-# define HEADER_STORE_H\n+#ifndef OSSL_CRYPTO_STORE_H\n+# define OSSL_CRYPTO_STORE_H\n \n # include \u003copenssl/bio.h\u003e\n # include \u003copenssl/store.h\u003e\ndiff --git a/include/internal/conf.h b/include/internal/conf.h\nindex 29bc9f9..163fea8 100644\n--- a/include/internal/conf.h\n+++ b/include/internal/conf.h\n@@ -7,8 +7,8 @@\n * https://www.openssl.org/source/license.html\n */\n \n-#ifndef HEADER_INTERNAL_CONF_H\n-# define HEADER_INTERNAL_CONF_H\n+#ifndef OSSL_INTERNAL_CONF_H\n+# define OSSL_INTERNAL_CONF_H\n \n #include \u003copenssl/conf.h\u003e\n \ndiff --git a/include/internal/constant_time.h b/include/internal/constant_time.h\nindex 0193a65..6600a1d 100644\n--- a/include/internal/constant_time.h\n+++ b/include/internal/constant_time.h\n@@ -7,8 +7,8 @@\n * https://www.openssl.org/source/license.html\n */\n \n-#ifndef HEADER_CONSTANT_TIME_LOCL_H\n-# define HEADER_CONSTANT_TIME_LOCL_H\n+#ifndef OSSL_INTERNAL_CONSTANT_TIME_H\n+# define OSSL_INTERNAL_CONSTANT_TIME_H\n \n # include \u003cstdlib.h\u003e\n # include \u003cstring.h\u003e\n@@ -384,4 +384,4 @@ static ossl_inline void constant_time_lookup(void *out,\n */\n void err_clear_last_constant_time(int clear);\n \n-#endif /* HEADER_CONSTANT_TIME_LOCL_H */\n+#endif /* OSSL_INTERNAL_CONSTANT_TIME_H */\ndiff --git a/include/internal/cryptlib.h b/include/internal/cryptlib.h\nindex 23e17e5..6e7291a 100644\n--- a/include/internal/cryptlib.h\n+++ b/include/internal/cryptlib.h\n@@ -7,8 +7,8 @@\n * https://www.openssl.org/source/license.html\n */\n \n-#ifndef HEADER_CRYPTLIB_H\n-# define HEADER_CRYPTLIB_H\n+#ifndef OSSL_INTERNAL_CRYPTLIB_H\n+# define OSSL_INTERNAL_CRYPTLIB_H\n \n # include \u003cstdlib.h\u003e\n # include \u003cstring.h\u003e\ndiff --git a/include/internal/dane.h b/include/internal/dane.h\nindex a1cb548..7a39bd7 100644\n--- a/include/internal/dane.h\n+++ b/include/internal/dane.h\n@@ -7,8 +7,8 @@\n * https://www.openssl.org/source/license.html\n */\n \n-#ifndef HEADER_INTERNAL_DANE_H\n-#define HEADER_INTERNAL_DANE_H\n+#ifndef OSSL_INTERNAL_DANE_H\n+#define OSSL_INTERNAL_DANE_H\n \n #include \u003copenssl/safestack.h\u003e\n \n@@ -100,4 +100,4 @@ struct ssl_dane_st {\n #define DANETLS_HAS_DANE_TA(dane) ((dane)\u0026\u0026((dane)-\u003eumask \u0026 DANETLS_DANE_TA_MASK))\n #define DANETLS_HAS_DANE_EE(dane) ((dane)\u0026\u0026((dane)-\u003eumask \u0026 DANETLS_DANE_EE_MASK))\n \n-#endif /* HEADER_INTERNAL_DANE_H */\n+#endif /* OSSL_INTERNAL_DANE_H */\ndiff --git a/include/internal/dso.h b/include/internal/dso.h\nindex eb5f7d5..c57c0c4 100644\n--- a/include/internal/dso.h\n+++ b/include/internal/dso.h\n@@ -7,8 +7,8 @@\n * https://www.openssl.org/source/license.html\n */\n \n-#ifndef HEADER_DSO_H\n-# define HEADER_DSO_H\n+#ifndef OSSL_INTERNAL_DSO_H\n+# define OSSL_INTERNAL_DSO_H\n \n # include \u003copenssl/crypto.h\u003e\n # include \u0022internal/dsoerr.h\u0022\ndiff --git a/include/internal/dsoerr.h b/include/internal/dsoerr.h\nindex 5f4511c..94d642a 100644\n--- a/include/internal/dsoerr.h\n+++ b/include/internal/dsoerr.h\n@@ -8,8 +8,8 @@\n * https://www.openssl.org/source/license.html\n */\n \n-#ifndef HEADER_DSOERR_H\n-# define HEADER_DSOERR_H\n+#ifndef OSSL_INTERNAL_DSOERR_H\n+# define OSSL_INTERNAL_DSOERR_H\n \n # ifndef HEADER_SYMHACKS_H\n # include \u003copenssl/symhacks.h\u003e\ndiff --git a/include/internal/err.h b/include/internal/err.h\nindex d46b8bd..88dde70 100644\n--- a/include/internal/err.h\n+++ b/include/internal/err.h\n@@ -7,8 +7,8 @@\n * https://www.openssl.org/source/license.html\n */\n \n-#ifndef INTERNAL_ERR_H\n-# define INTERNAL_ERR_H\n+#ifndef OSSL_INTERNAL_ERR_H\n+# define OSSL_INTERNAL_ERR_H\n \n void err_free_strings_int(void);\n \ndiff --git a/include/internal/nelem.h b/include/internal/nelem.h\nindex d65a21a..699ef88 100644\n--- a/include/internal/nelem.h\n+++ b/include/internal/nelem.h\n@@ -7,8 +7,8 @@\n * https://www.openssl.org/source/license.html\n */\n \n-#ifndef HEADER_NELEM_H\n-# define HEADER_NELEM_H\n+#ifndef OSSL_INTERNAL_NELEM_H\n+# define OSSL_INTERNAL_NELEM_H\n \n # define OSSL_NELEM(x) (sizeof(x)/sizeof((x)[0]))\n #endif\ndiff --git a/include/internal/numbers.h b/include/internal/numbers.h\nindex 31931df..f5ade52 100644\n--- a/include/internal/numbers.h\n+++ b/include/internal/numbers.h\n@@ -7,8 +7,8 @@\n * https://www.openssl.org/source/license.html\n */\n \n-#ifndef HEADER_NUMBERS_H\n-# define HEADER_NUMBERS_H\n+#ifndef OSSL_INTERNAL_NUMBERS_H\n+# define OSSL_INTERNAL_NUMBERS_H\n \n # include \u003climits.h\u003e\n \ndiff --git a/include/internal/o_dir.h b/include/internal/o_dir.h\nindex e7b55e0..dafc8dd 100644\n--- a/include/internal/o_dir.h\n+++ b/include/internal/o_dir.h\n@@ -36,8 +36,8 @@\n * SUCH DAMAGE.\n */\n \n-#ifndef O_DIR_H\n-# define O_DIR_H\n+#ifndef OSSL_INTERNAL_O_DIR_H\n+# define OSSL_INTERNAL_O_DIR_H\n \n typedef struct OPENSSL_dir_context_st OPENSSL_DIR_CTX;\n \ndiff --git a/include/internal/o_str.h b/include/internal/o_str.h\nindex 86403c9..15c12e8 100644\n--- a/include/internal/o_str.h\n+++ b/include/internal/o_str.h\n@@ -7,8 +7,8 @@\n * https://www.openssl.org/source/license.html\n */\n \n-#ifndef HEADER_O_STR_H\n-# define HEADER_O_STR_H\n+#ifndef OSSL_INTERNAL_O_STR_H\n+# define OSSL_INTERNAL_O_STR_H\n \n # include \u003cstddef.h\u003e /* to get size_t */\n \ndiff --git a/include/internal/refcount.h b/include/internal/refcount.h\nindex 6e1a840..8fb536e 100644\n--- a/include/internal/refcount.h\n+++ b/include/internal/refcount.h\n@@ -6,8 +6,8 @@\n * in the file LICENSE in the source distribution or at\n * https://www.openssl.org/source/license.html\n */\n-#ifndef HEADER_INTERNAL_REFCOUNT_H\n-# define HEADER_INTERNAL_REFCOUNT_H\n+#ifndef OSSL_INTERNAL_REFCOUNT_H\n+# define OSSL_INTERNAL_REFCOUNT_H\n \n /* Used to checking reference counts, most while doing perl5 stuff :-) */\n # if defined(OPENSSL_NO_STDIO)\ndiff --git a/include/internal/sockets.h b/include/internal/sockets.h\nindex 5bb0355..39186ef 100644\n--- a/include/internal/sockets.h\n+++ b/include/internal/sockets.h\n@@ -8,8 +8,8 @@\n */\n \n \n-#ifndef HEADER_INTERNAL_SOCKETS\n-# define HEADER_INTERNAL_SOCKETS\n+#ifndef OSSL_INTERNAL_SOCKETS_H\n+# define OSSL_INTERNAL_SOCKETS_H\n \n # if defined(OPENSSL_SYS_VXWORKS) || defined(OPENSSL_SYS_UEFI)\n # define NO_SYS_PARAM_H\ndiff --git a/include/internal/sslconf.h b/include/internal/sslconf.h\nindex d538f86..92c8941 100644\n--- a/include/internal/sslconf.h\n+++ b/include/internal/sslconf.h\n@@ -7,8 +7,8 @@\n * https://www.openssl.org/source/license.html\n */\n \n-#ifndef HEADER_SSLCONF_H\n-# define HEADER_SSLCONF_H\n+#ifndef OSSL_INTERNAL_SSLCONF_H\n+# define OSSL_INTERNAL_SSLCONF_H\n \n typedef struct ssl_conf_cmd_st SSL_CONF_CMD;\n \ndiff --git a/ssl/packet_local.h b/ssl/packet_local.h\nindex 860360b..1b6c2fb 100644\n--- a/ssl/packet_local.h\n+++ b/ssl/packet_local.h\n@@ -7,8 +7,8 @@\n * https://www.openssl.org/source/license.html\n */\n \n-#ifndef HEADER_PACKET_LOCL_H\n-# define HEADER_PACKET_LOCL_H\n+#ifndef OSSL_SSL_PACKET_LOCAL_H\n+# define OSSL_SSL_PACKET_LOCAL_H\n \n # include \u003cstring.h\u003e\n # include \u003copenssl/bn.h\u003e\n@@ -871,4 +871,4 @@ unsigned char *WPACKET_get_curr(WPACKET *pkt);\n /* Release resources in a WPACKET if a failure has occurred. */\n void WPACKET_cleanup(WPACKET *pkt);\n \n-#endif /* HEADER_PACKET_LOCL_H */\n+#endif /* OSSL_SSL_PACKET_LOCAL_H */\ndiff --git a/ssl/ssl_local.h b/ssl/ssl_local.h\nindex ef9e153..d335df2 100644\n--- a/ssl/ssl_local.h\n+++ b/ssl/ssl_local.h\n@@ -9,8 +9,8 @@\n * https://www.openssl.org/source/license.html\n */\n \n-#ifndef HEADER_SSL_LOCL_H\n-# define HEADER_SSL_LOCL_H\n+#ifndef OSSL_SSL_LOCAL_H\n+# define OSSL_SSL_LOCAL_H\n \n # include \u0022e_os.h\u0022 /* struct timeval for DTLS */\n # include \u003cstdlib.h\u003e\ndiff --git a/test/drbg_cavs_data.h b/test/drbg_cavs_data.h\nindex d673375..c04b012 100644\n--- a/test/drbg_cavs_data.h\n+++ b/test/drbg_cavs_data.h\n@@ -13,8 +13,8 @@\n \n #include \u003cstddef.h\u003e\n \n-#ifndef DRBG_CAVS_DATA_H\n-# define DRBG_CAVS_DATA_H\n+#ifndef OSSL_TEST_DRBG_CAVS_DATA_H\n+# define OSSL_TEST_DRBG_CAVS_DATA_H\n \n enum drbg_kat_type {\n NO_RESEED,\ndiff --git a/test/ecdsatest.h b/test/ecdsatest.h\nindex 216e66e..63fe319 100644\n--- a/test/ecdsatest.h\n+++ b/test/ecdsatest.h\n@@ -7,8 +7,8 @@\n * https://www.openssl.org/source/license.html\n */\n \n-#ifndef ECDSATEST_CAVS_H\n-# define ECDSATEST_CAVS_H\n+#ifndef OSSL_TEST_ECDSATEST_H\n+# define OSSL_TEST_ECDSATEST_H\n \n /*-\n * NIST CAVP ECDSA KATs:\n@@ -10211,4 +10211,4 @@ static const ecdsa_cavs_kat_t ecdsa_cavs_kats[] \u003d {\n \u00221c8c4343a8ecbf7c4d4e48f7d76d5658bc027c77086ec8b10097deb307d6\u0022}\n # endif /* OPENSSL_NO_EC2M */\n };\n-#endif /* ECDSATEST_CAVS_H */\n+#endif /* OSSL_TEST_ECDSATEST_H */\ndiff --git a/test/handshake_helper.h b/test/handshake_helper.h\nindex ab6446a..96406dd 100644\n--- a/test/handshake_helper.h\n+++ b/test/handshake_helper.h\n@@ -7,8 +7,8 @@\n * https://www.openssl.org/source/license.html\n */\n \n-#ifndef HEADER_HANDSHAKE_HELPER_H\n-#define HEADER_HANDSHAKE_HELPER_H\n+#ifndef OSSL_TEST_HANDSHAKE_HELPER_H\n+#define OSSL_TEST_HANDSHAKE_HELPER_H\n \n #include \u0022ssl_test_ctx.h\u0022\n \n@@ -78,4 +78,4 @@ HANDSHAKE_RESULT *do_handshake(SSL_CTX *server_ctx, SSL_CTX *server2_ctx,\n SSL_CTX *resume_client_ctx,\n const SSL_TEST_CTX *test_ctx);\n \n-#endif /* HEADER_HANDSHAKE_HELPER_H */\n+#endif /* OSSL_TEST_HANDSHAKE_HELPER_H */\ndiff --git a/test/ossl_shim/async_bio.h b/test/ossl_shim/async_bio.h\nindex bb24ead..c09e236 100644\n--- a/test/ossl_shim/async_bio.h\n+++ b/test/ossl_shim/async_bio.h\n@@ -7,8 +7,8 @@\n * https://www.openssl.org/source/license.html\n */\n \n-#ifndef HEADER_ASYNC_BIO\n-#define HEADER_ASYNC_BIO\n+#ifndef OSSL_TEST_SHIM_ASYNC_BIO_H\n+#define OSSL_TEST_SHIM_ASYNC_BIO_H\n \n #include \u003copenssl/base.h\u003e\n #include \u003copenssl/bio.h\u003e\n@@ -36,4 +36,4 @@ void AsyncBioAllowWrite(BIO *bio, size_t count);\n void AsyncBioEnforceWriteQuota(BIO *bio, bool enforce);\n \n \n-#endif // HEADER_ASYNC_BIO\n+#endif // OSSL_TEST_SHIM_ASYNC_BIO_H\ndiff --git a/test/ossl_shim/include/openssl/base.h b/test/ossl_shim/include/openssl/base.h\nindex f725cd9..a8d47b8 100644\n--- a/test/ossl_shim/include/openssl/base.h\n+++ b/test/ossl_shim/include/openssl/base.h\n@@ -7,8 +7,8 @@\n * https://www.openssl.org/source/license.html\n */\n \n-#ifndef OPENSSL_HEADER_BASE_H\n-#define OPENSSL_HEADER_BASE_H\n+#ifndef OSSL_TEST_SHIM_INCLUDE_OPENSSL_BASE_H\n+#define OSSL_TEST_SHIM_INCLUDE_OPENSSL_BASE_H\n \n /* Needed for BORINGSSL_MAKE_DELETER */\n # include \u003copenssl/bio.h\u003e\n@@ -108,4 +108,4 @@ BORINGSSL_MAKE_DELETER(SSL_SESSION, SSL_SESSION_free)\n } /* extern C++ */\n \n \n-#endif /* OPENSSL_HEADER_BASE_H */\n+#endif /* OSSL_TEST_SHIM_INCLUDE_OPENSSL_BASE_H */\ndiff --git a/test/ossl_shim/packeted_bio.h b/test/ossl_shim/packeted_bio.h\nindex 436cf90..895bd37 100644\n--- a/test/ossl_shim/packeted_bio.h\n+++ b/test/ossl_shim/packeted_bio.h\n@@ -7,8 +7,8 @@\n * https://www.openssl.org/source/license.html\n */\n \n-#ifndef HEADER_PACKETED_BIO\n-#define HEADER_PACKETED_BIO\n+#ifndef OSSL_TEST_SHIM_PACKETED_BIO_H\n+#define OSSL_TEST_SHIM_PACKETED_BIO_H\n \n #include \u003copenssl/base.h\u003e\n #include \u003copenssl/bio.h\u003e\n@@ -32,4 +32,4 @@ timeval PacketedBioGetClock(const BIO *bio);\n bool PacketedBioAdvanceClock(BIO *bio);\n \n \n-#endif // HEADER_PACKETED_BIO\n+#endif // OSSL_TEST_SHIM_PACKETED_BIO_H\ndiff --git a/test/ossl_shim/test_config.h b/test/ossl_shim/test_config.h\nindex b4efa45..f95475a 100644\n--- a/test/ossl_shim/test_config.h\n+++ b/test/ossl_shim/test_config.h\n@@ -7,8 +7,8 @@\n * https://www.openssl.org/source/license.html\n */\n \n-#ifndef HEADER_TEST_CONFIG\n-#define HEADER_TEST_CONFIG\n+#ifndef OSSL_TEST_SHIM_TEST_CONFIG_H\n+#define OSSL_TEST_SHIM_TEST_CONFIG_H\n \n #include \u003cstring\u003e\n #include \u003cvector\u003e\n@@ -85,4 +85,4 @@ struct TestConfig {\n bool ParseConfig(int argc, char **argv, TestConfig *out_config);\n \n \n-#endif // HEADER_TEST_CONFIG\n+#endif // OSSL_TEST_SHIM_TEST_CONFIG_H\ndiff --git a/test/ssl_test_ctx.h b/test/ssl_test_ctx.h\nindex 36d73f7..7e670c9 100644\n--- a/test/ssl_test_ctx.h\n+++ b/test/ssl_test_ctx.h\n@@ -7,8 +7,8 @@\n * https://www.openssl.org/source/license.html\n */\n \n-#ifndef HEADER_SSL_TEST_CTX_H\n-#define HEADER_SSL_TEST_CTX_H\n+#ifndef OSSL_TEST_SSL_TEST_CTX_H\n+#define OSSL_TEST_SSL_TEST_CTX_H\n \n #include \u003copenssl/conf.h\u003e\n #include \u003copenssl/ssl.h\u003e\n@@ -250,4 +250,4 @@ SSL_TEST_CTX *SSL_TEST_CTX_new(void);\n \n void SSL_TEST_CTX_free(SSL_TEST_CTX *ctx);\n \n-#endif /* HEADER_SSL_TEST_CTX_H */\n+#endif /* OSSL_TEST_SSL_TEST_CTX_H */\ndiff --git a/test/ssltestlib.h b/test/ssltestlib.h\nindex 56e323f..17b2782 100644\n--- a/test/ssltestlib.h\n+++ b/test/ssltestlib.h\n@@ -7,8 +7,8 @@\n * https://www.openssl.org/source/license.html\n */\n \n-#ifndef HEADER_SSLTESTLIB_H\n-# define HEADER_SSLTESTLIB_H\n+#ifndef OSSL_TEST_SSLTESTLIB_H\n+# define OSSL_TEST_SSLTESTLIB_H\n \n # include \u003copenssl/ssl.h\u003e\n \n@@ -53,4 +53,4 @@ typedef struct mempacket_st MEMPACKET;\n \n DEFINE_STACK_OF(MEMPACKET)\n \n-#endif /* HEADER_SSLTESTLIB_H */\n+#endif /* OSSL_TEST_SSLTESTLIB_H */\ndiff --git a/test/testutil.h b/test/testutil.h\nindex 2a610d7..575be95 100644\n--- a/test/testutil.h\n+++ b/test/testutil.h\n@@ -7,8 +7,8 @@\n * https://www.openssl.org/source/license.html\n */\n \n-#ifndef HEADER_TESTUTIL_H\n-# define HEADER_TESTUTIL_H\n+#ifndef OSSL_TESTUTIL_H\n+# define OSSL_TESTUTIL_H\n \n #include \u003cstdarg.h\u003e\n \n@@ -465,4 +465,4 @@ void test_random_seed(uint32_t sd);\n /* Create a file path from a directory and a filename */\n char *test_mk_file_path(const char *dir, const char *file);\n \n-#endif /* HEADER_TESTUTIL_H */\n+#endif /* OSSL_TESTUTIL_H */\ndiff --git a/test/testutil/output.h b/test/testutil/output.h\nindex 8e2b2a3..f5be69e 100644\n--- a/test/testutil/output.h\n+++ b/test/testutil/output.h\n@@ -7,8 +7,8 @@\n * https://www.openssl.org/source/license.html\n */\n \n-#ifndef HEADER_TU_OUTPUT_H\n-# define HEADER_TU_OUTPUT_H\n+#ifndef OSSL_TESTUTIL_OUTPUT_H\n+# define OSSL_TESTUTIL_OUTPUT_H\n \n #include \u003cstdarg.h\u003e\n \n@@ -29,4 +29,4 @@ int test_flush_stderr(void);\n int test_printf_stdout(const char *fmt, ...);\n int test_printf_stderr(const char *fmt, ...);\n \n-#endif /* HEADER_TU_OUTPUT_H */\n+#endif /* OSSL_TESTUTIL_OUTPUT_H */\ndiff --git a/util/mkerr.pl b/util/mkerr.pl\nindex df085fb..dc652e0 100755\n--- a/util/mkerr.pl\n+++ b/util/mkerr.pl\n@@ -450,8 +450,8 @@ foreach my $lib ( keys %errorfile ) {\n * https://www.openssl.org/source/license.html\n */\n \n-#ifndef HEADER_${lib}ERR_H\n-# define HEADER_${lib}ERR_H\n+#ifndef OPENSSL_${lib}ERR_H\n+# define OPENSSL_${lib}ERR_H\n \n # include \u003copenssl/symhacks.h\u003e\n \n","s":{"c":1752659371,"u": 76947}} ],"g": 81817,"chitpc": 0,"ehitpc": 0,"indexed":0 , "ab": 0, "si": 0, "db":0, "di":0, "sat":0, "lfc": "0000"}