Fix header file include guard names

Make the include guards consistent by renaming them systematically according
to the naming conventions below

For the public header files (in the 'include/openssl' directory), the guard
names try to match the path specified in the include directives, with
all letters converted to upper case and '/' and '.' replaced by '_'. For the
private header files files, an extra 'OSSL_' is added as prefix.

Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/9333)

diff --git a/apps/include/apps.h b/apps/include/apps.h
index b2151e9ebd34b5b15282f7228fb2406c1a37c8d7..41db80740b0cc2292d1ab3af39da3913ec90e0ae 100644 (file)
--- a/apps/include/apps.h
+++ b/apps/include/apps.h
@@ -7,8 +7,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_APPS_H
-# define HEADER_APPS_H
+#ifndef OSSL_APPS_H
+# define OSSL_APPS_H
 
 # include "e_os.h" /* struct timeval for DTLS */
 # include "internal/nelem.h"

diff --git a/apps/include/apps_ui.h b/apps/include/apps_ui.h
index 36e0864a081187ef5ea24ba1fa491ea917c3f2f8..55a6b510a44e583b9b1b719d8668709b3d7e98ed 100644 (file)
--- a/apps/include/apps_ui.h
+++ b/apps/include/apps_ui.h
@@ -7,8 +7,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_APPS_UI_H
-# define HEADER_APPS_UI_H
+#ifndef OSSL_APPS_UI_H
+# define OSSL_APPS_UI_H
 
 
 # define PW_MIN_LENGTH 4

diff --git a/apps/include/fmt.h b/apps/include/fmt.h
index e3da9a44cd684ccabbe8d0415cf751906e0e6763..01acf8669430c87791d05a46b2a5755253fb91df 100644 (file)
--- a/apps/include/fmt.h
+++ b/apps/include/fmt.h
@@ -14,8 +14,8 @@
  * shared fields have been moved into this file.
  */
 
-#ifndef HEADER_FMT_H
-#define HEADER_FMT_H
+#ifndef OSSL_APPS_FMT_H
+#define OSSL_APPS_FMT_H
 
 /* On some platforms, it's important to distinguish between text and binary
  * files.  On some, there might even be specific file formats for different
@@ -41,4 +41,4 @@
 
 int FMT_istext(int format);
 
-#endif /* HEADER_FMT_H_ */
+#endif /* OSSL_APPS_FMT_H_ */

diff --git a/apps/include/function.h b/apps/include/function.h
index 41259793050b6c5af5ec6d5408e2f9aaacc4a5b3..1911a649477aa7cdc40fa8d8b0d07c47a001cc10 100644 (file)
--- a/apps/include/function.h
+++ b/apps/include/function.h
@@ -7,8 +7,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef APPS_FUNCTION_H
-# define APPS_FUNCTION_H
+#ifndef OSSL_APPS_FUNCTION_H
+# define OSSL_APPS_FUNCTION_H
 
 # include <openssl/lhash.h>
 # include "opt.h"

diff --git a/apps/include/opt.h b/apps/include/opt.h
index 9415dd797b2b19d0a420ba0e22467c025dce1ca0..5493563004b5b225cc0374a7886b393e9957fe25 100644 (file)
--- a/apps/include/opt.h
+++ b/apps/include/opt.h
@@ -6,8 +6,8 @@
  * in the file LICENSE in the source distribution or at
  * https://www.openssl.org/source/license.html
  */
-#ifndef HEADER_OPT_H
-#define HEADER_OPT_H
+#ifndef OSSL_APPS_OPT_H
+#define OSSL_APPS_OPT_H
 
 #include <sys/types.h>
 #include <openssl/e_os2.h>
@@ -347,4 +347,4 @@ int opt_format_error(const char *s, unsigned long flags);
 int opt_isdir(const char *name);
 int opt_printf_stderr(const char *fmt, ...);
 
-#endif /* HEADER_OPT_H */
+#endif /* OSSL_APPS_OPT_H */

diff --git a/apps/include/platform.h b/apps/include/platform.h
index 49276b6fc989b61bd3af4aebb16289c528594c6e..491559df31528fe5ff3f2c593fc976f8902b79fe 100644 (file)
--- a/apps/include/platform.h
+++ b/apps/include/platform.h
@@ -7,8 +7,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_PLATFORM_H
-# define HEADER_PLATFORM_H
+#ifndef OSSL_APPS_PLATFORM_H
+# define OSSL_APPS_PLATFORM_H
 
 # include <openssl/e_os2.h>
 

diff --git a/apps/include/vms_term_sock.h b/apps/include/vms_term_sock.h
index d4c7c3d16076fff96cdeef19c93b3522b99bb5d7..eae37b1af931f74b31517dfacb1d109ce031f574 100644 (file)
--- a/apps/include/vms_term_sock.h
+++ b/apps/include/vms_term_sock.h
@@ -8,8 +8,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef TERM_SOCK_H
-# define TERM_SOCK_H
+#ifndef OSSL_APPS_VMS_TERM_SOCK_H
+# define OSSL_APPS_VMS_TERM_SOCK_H
 
 /*
 ** Terminal Socket Function Codes

diff --git a/apps/timeouts.h b/apps/timeouts.h
index 932be1cc30d85491cc5185e9a4bd14f3741cf313..002852724763d8aa6ab9b8ffe124b5a98b1e2870 100644 (file)
--- a/apps/timeouts.h
+++ b/apps/timeouts.h
@@ -7,11 +7,11 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef INCLUDED_TIMEOUTS_H
-# define INCLUDED_TIMEOUTS_H
+#ifndef OSSL_APPS_TIMEOUTS_H
+# define OSSL_APPS_TIMEOUTS_H
 
 /* numbers in us */
 # define DGRAM_RCV_TIMEOUT         250000
 # define DGRAM_SND_TIMEOUT         250000
 
-#endif                          /* ! INCLUDED_TIMEOUTS_H */
+#endif                          /* ! OSSL_APPS_TIMEOUTS_H */

diff --git a/crypto/aes/aes_local.h b/crypto/aes/aes_local.h
index 273c4fd2884e8c0d86bb5402bc452da762a6b96f..b201905831ec94198ae35c75bf392cde12128323 100644 (file)
--- a/crypto/aes/aes_local.h
+++ b/crypto/aes/aes_local.h
@@ -7,8 +7,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_AES_LOCL_H
-# define HEADER_AES_LOCL_H
+#ifndef OSSL_CRYPTO_AES_LOCAL_H
+# define OSSL_CRYPTO_AES_LOCAL_H
 
 # include <openssl/e_os2.h>
 # include <stdio.h>
@@ -39,4 +39,4 @@ typedef unsigned char u8;
 /* This controls loop-unrolling in aes_core.c */
 # undef FULL_UNROLL
 
-#endif                          /* !HEADER_AES_LOCL_H */
+#endif                          /* !OSSL_CRYPTO_AES_LOCAL_H */

diff --git a/crypto/arm_arch.h b/crypto/arm_arch.h
index 5b156d3c448b7c5d6fea4049e4ce4bd4863a6930..2d279d64595f4c823d6a116b0abbc63de396bd09 100644 (file)
--- a/crypto/arm_arch.h
+++ b/crypto/arm_arch.h
@@ -7,8 +7,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef __ARM_ARCH_H__
-# define __ARM_ARCH_H__
+#ifndef OSSL_CRYPTO_ARM_ARCH_H
+# define OSSL_CRYPTO_ARM_ARCH_H
 
 # if !defined(__ARM_ARCH__)
 #  if defined(__CC_ARM)

diff --git a/crypto/async/arch/async_posix.h b/crypto/async/arch/async_posix.h
index 528733e1aa83f0686476b4f00bcc46b8c7d269ed..aba713e75906eee85726f9098281031bb5c67343 100644 (file)
--- a/crypto/async/arch/async_posix.h
+++ b/crypto/async/arch/async_posix.h
@@ -7,8 +7,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef OPENSSL_ASYNC_ARCH_ASYNC_POSIX_H
-#define OPENSSL_ASYNC_ARCH_ASYNC_POSIX_H
+#ifndef OSSL_CRYPTO_ASYNC_POSIX_H
+#define OSSL_CRYPTO_ASYNC_POSIX_H
 #include <openssl/e_os2.h>
 
 #if defined(OPENSSL_SYS_UNIX) \
@@ -55,4 +55,4 @@ void async_fibre_free(async_fibre *fibre);
 
 # endif
 #endif
-#endif /* OPENSSL_ASYNC_ARCH_ASYNC_POSIX_H */
+#endif /* OSSL_CRYPTO_ASYNC_POSIX_H */

diff --git a/crypto/bf/bf_local.h b/crypto/bf/bf_local.h
index a59ceae8a9bfdd401739076dc907bbb6ac0c4f41..080f37a5f94cb5821c80f0ba60ac602689140046 100644 (file)
--- a/crypto/bf/bf_local.h
+++ b/crypto/bf/bf_local.h
@@ -7,8 +7,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_BF_LOCL_H
-# define HEADER_BF_LOCL_H
+#ifndef OSSL_CRYPTO_BF_LOCAL_H
+# define OSSL_CRYPTO_BF_LOCAL_H
 # include <openssl/opensslconf.h>
 
 /* NOTE - c is not incremented as per n2l */

diff --git a/crypto/bio/bio_local.h b/crypto/bio/bio_local.h
index 024120feaeb823fe4214878756a4fa1b0d2b5134..30e56cba8d3d4295eb6e321380277f5243de787a 100644 (file)
--- a/crypto/bio/bio_local.h
+++ b/crypto/bio/bio_local.h
@@ -27,10 +27,10 @@
  * For clarity, we check for internal/cryptlib.h since it's a common header
  * that also includes bio.h.
  */
-# ifdef HEADER_CRYPTLIB_H
+# ifdef OSSL_INTERNAL_CRYPTLIB_H
 #  error internal/cryptlib.h included before bio_local.h
 # endif
-# ifdef HEADER_BIO_H
+# ifdef OPENSSL_BIO_H
 #  error openssl/bio.h included before bio_local.h
 # endif
 

diff --git a/crypto/bn/bn_local.h b/crypto/bn/bn_local.h
index 2640f3416fa972b649f7d592b89d5266769de740..4c86986804b4739691e1d38f8fed26da29815605 100644 (file)
--- a/crypto/bn/bn_local.h
+++ b/crypto/bn/bn_local.h
@@ -7,8 +7,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_BN_LCL_H
-# define HEADER_BN_LCL_H
+#ifndef OSSL_CRYPTO_BN_LOCAL_H
+# define OSSL_CRYPTO_BN_LOCAL_H
 
 /*
  * The EDK2 build doesn't use bn_conf.h; it sets THIRTY_TWO_BIT or

diff --git a/crypto/bn/rsaz_exp.h b/crypto/bn/rsaz_exp.h
index c92af6ff13c3d33106569c8bfb308453aba30a0e..c05a5d937e94692bb9cdc3dae8828480cd056d83 100644 (file)
--- a/crypto/bn/rsaz_exp.h
+++ b/crypto/bn/rsaz_exp.h
@@ -12,8 +12,8 @@
  * (2) University of Haifa, Israel
  */
 
-#ifndef RSAZ_EXP_H
-# define RSAZ_EXP_H
+#ifndef OSSL_CRYPTO_BN_RSAZ_EXP_H
+# define OSSL_CRYPTO_BN_RSAZ_EXP_H
 
 # undef RSAZ_ENABLED
 # if defined(OPENSSL_BN_ASM_MONT) && \

diff --git a/crypto/camellia/cmll_local.h b/crypto/camellia/cmll_local.h
index cf3d38db45229841537373c4c63187a3876aac87..c1d940d3d8f80540ffae079644071f79bfd804e3 100644 (file)
--- a/crypto/camellia/cmll_local.h
+++ b/crypto/camellia/cmll_local.h
@@ -22,8 +22,8 @@
  * to the OpenSSL project.
  */
 
-#ifndef HEADER_CAMELLIA_LOCL_H
-# define HEADER_CAMELLIA_LOCL_H
+#ifndef OSSL_CRYPTO_CAMELLIA_CMLL_LOCAL_H
+# define OSSL_CRYPTO_CAMELLIA_CMLL_LOCAL_H
 
 typedef unsigned int u32;
 typedef unsigned char u8;
@@ -40,4 +40,4 @@ void Camellia_EncryptBlock(int keyBitLength, const u8 plaintext[],
                            const KEY_TABLE_TYPE keyTable, u8 ciphertext[]);
 void Camellia_DecryptBlock(int keyBitLength, const u8 ciphertext[],
                            const KEY_TABLE_TYPE keyTable, u8 plaintext[]);
-#endif                          /* #ifndef HEADER_CAMELLIA_LOCL_H */
+#endif                          /* #ifndef OSSL_CRYPTO_CAMELLIA_CMLL_LOCAL_H */

diff --git a/crypto/cmp/cmp_local.h b/crypto/cmp/cmp_local.h
index 48734649a0f453cdf7f25c17f3b89836cf9bf061..1a7dcca3bd99bff897afe33e0206d8c064d6780c 100644 (file)
--- a/crypto/cmp/cmp_local.h
+++ b/crypto/cmp/cmp_local.h
@@ -9,8 +9,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef OSSL_HEADER_CMP_INT_H
-# define OSSL_HEADER_CMP_INT_H
+#ifndef OSSL_CRYPTO_CMP_LOCAL_H
+# define OSSL_CRYPTO_CMP_LOCAL_H
 
 # include "internal/cryptlib.h"
 
@@ -722,4 +722,4 @@ int ossl_cmp_ctx_set1_recipNonce(OSSL_CMP_CTX *ctx,
 
 #  define OSSL_CMP_TRANSACTIONID_LENGTH 16
 
-#endif /* !defined OSSL_HEADER_CMP_INT_H */
+#endif /* !defined OSSL_CRYPTO_CMP_LOCAL_H */

diff --git a/crypto/cms/cms_local.h b/crypto/cms/cms_local.h
index 40d9c4bb7d2946b6a6373029fcc3899e40c4cbe3..6cb31955eb420b8e1899184aaf9615885e778484 100644 (file)
--- a/crypto/cms/cms_local.h
+++ b/crypto/cms/cms_local.h
@@ -7,8 +7,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_CMS_LCL_H
-# define HEADER_CMS_LCL_H
+#ifndef OSSL_CRYPTO_CMS_LOCAL_H
+# define OSSL_CRYPTO_CMS_LOCAL_H
 
 # include <openssl/x509.h>
 

diff --git a/crypto/crmf/crmf_local.h b/crypto/crmf/crmf_local.h
index 0eba3a15c81a3ec9ee8483ae517ab80f6c5c5c21..577187f55b7d322e78f7799e3a56ddd7f439fbc0 100644 (file)
--- a/crypto/crmf/crmf_local.h
+++ b/crypto/crmf/crmf_local.h
@@ -11,8 +11,8 @@
  * CRMF implementation by Martin Peylo, Miikka Viljanen, and David von Oheimb.
  */
 
-#ifndef OSSL_HEADER_CRMF_INT_H
-# define OSSL_HEADER_CRMF_INT_H
+#ifndef OSSL_CRYPTO_CRMF_LOCAL_H
+# define OSSL_CRYPTO_CRMF_LOCAL_H
 
 # include <openssl/crmf.h>
 # include <openssl/err.h>

diff --git a/crypto/des/des_local.h b/crypto/des/des_local.h
index 230a30f1e579ae3ceefc7e9b8086e410b2f49a19..f888cb800169347094ddc9b413f78e58385cdfd4 100644 (file)
--- a/crypto/des/des_local.h
+++ b/crypto/des/des_local.h
@@ -7,8 +7,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_DES_LOCL_H
-# define HEADER_DES_LOCL_H
+#ifndef OSSL_CRYPTO_DES_LOCAL_H
+# define OSSL_CRYPTO_DES_LOCAL_H
 
 # include <openssl/e_os2.h>
 

diff --git a/crypto/ec/curve448/arch_32/arch_intrinsics.h b/crypto/ec/curve448/arch_32/arch_intrinsics.h
index 80b4d3982873a3c96dddbddddd2bb5724766319e..7a54903ac95aa59e4a01a15714af69b8f943cc41 100644 (file)
--- a/crypto/ec/curve448/arch_32/arch_intrinsics.h
+++ b/crypto/ec/curve448/arch_32/arch_intrinsics.h
@@ -10,8 +10,8 @@
  * Originally written by Mike Hamburg
  */
 
-#ifndef HEADER_ARCH_32_ARCH_INTRINSICS_H
-# define HEADER_ARCH_32_ARCH_INTRINSICS_H
+#ifndef OSSL_CRYPTO_EC_CURVE448_ARCH_32_INTRINSICS_H
+# define OSSL_CRYPTO_EC_CURVE448_ARCH_32_INTRINSICS_H
 
 #include "internal/constant_time.h"
 
@@ -24,4 +24,4 @@ static ossl_inline uint64_t widemul(uint32_t a, uint32_t b)
     return ((uint64_t)a) * b;
 }
 
-#endif                          /* HEADER_ARCH_32_ARCH_INTRINSICS_H */
+#endif                          /* OSSL_CRYPTO_EC_CURVE448_ARCH_32_INTRINSICS_H */

diff --git a/crypto/ec/curve448/arch_32/f_impl.h b/crypto/ec/curve448/arch_32/f_impl.h
index 4ca283fe86552917c5737d42bdabb58ed3a23292..5cd25c04e1236810e75c9b7e9171a1e6f0371920 100644 (file)
--- a/crypto/ec/curve448/arch_32/f_impl.h
+++ b/crypto/ec/curve448/arch_32/f_impl.h
@@ -10,8 +10,8 @@
  * Originally written by Mike Hamburg
  */
 
-#ifndef HEADER_ARCH_32_F_IMPL_H
-# define HEADER_ARCH_32_F_IMPL_H
+#ifndef OSSL_CRYPTO_EC_CURVE448_ARCH_32_F_IMPL_H
+# define OSSL_CRYPTO_EC_CURVE448_ARCH_32_F_IMPL_H
 
 # define GF_HEADROOM 2
 # define LIMB(x) ((x) & ((1 << 28) - 1)), ((x) >> 28)
@@ -57,4 +57,4 @@ void gf_weak_reduce(gf a)
     a->limb[0] = (a->limb[0] & mask) + tmp;
 }
 
-#endif                  /* HEADER_ARCH_32_F_IMPL_H */
+#endif                  /* OSSL_CRYPTO_EC_CURVE448_ARCH_32_F_IMPL_H */

diff --git a/crypto/ec/curve448/curve448_local.h b/crypto/ec/curve448/curve448_local.h
index 9459f002cb606b0e52646a9d44553f18cd8e4380..197627f6b808f49747eb91e380423166f60e1a60 100644 (file)
--- a/crypto/ec/curve448/curve448_local.h
+++ b/crypto/ec/curve448/curve448_local.h
@@ -6,8 +6,8 @@
  * in the file LICENSE in the source distribution or at
  * https://www.openssl.org/source/license.html
  */
-#ifndef HEADER_CURVE448_LCL_H
-# define HEADER_CURVE448_LCL_H
+#ifndef OSSL_CRYPTO_EC_CURVE448_LOCAL_H
+# define OSSL_CRYPTO_EC_CURVE448_LOCAL_H
 # include "curve448utils.h"
 
 int X448(uint8_t out_shared_key[56], const uint8_t private_key[56],
@@ -36,4 +36,4 @@ int ED448ph_verify(OPENSSL_CTX *ctx, const uint8_t hash[64],
 int ED448_public_from_private(OPENSSL_CTX *ctx, uint8_t out_public_key[57],
                               const uint8_t private_key[57]);
 
-#endif              /* HEADER_CURVE448_LCL_H */
+#endif              /* OSSL_CRYPTO_EC_CURVE448_LOCAL_H */

diff --git a/crypto/ec/curve448/curve448utils.h b/crypto/ec/curve448/curve448utils.h
index 0ac69a6688154fc48678a83bb54556f909919934..fa06cb02ec5d464e5572ecc7b7390f9c7fc4313b 100644 (file)
--- a/crypto/ec/curve448/curve448utils.h
+++ b/crypto/ec/curve448/curve448utils.h
@@ -10,8 +10,8 @@
  * Originally written by Mike Hamburg
  */
 
-#ifndef HEADER_CURVE448UTILS_H
-# define HEADER_CURVE448UTILS_H
+#ifndef OSSL_CRYPTO_EC_CURVE448UTILS_H
+# define OSSL_CRYPTO_EC_CURVE448UTILS_H
 
 # include <openssl/e_os2.h>
 

diff --git a/crypto/ec/curve448/ed448.h b/crypto/ec/curve448/ed448.h
index b198f36e3abc3063e4b92b7f0be4702c18ba6809..4f99fe6901a193f7d0b6f372ef1c1b0b9a0cbac7 100644 (file)
--- a/crypto/ec/curve448/ed448.h
+++ b/crypto/ec/curve448/ed448.h
@@ -10,8 +10,8 @@
  * Originally written by Mike Hamburg
  */
 
-#ifndef HEADER_ED448_H
-# define HEADER_ED448_H
+#ifndef OSSL_CRYPTO_EC_CURVE448_ED448_H
+# define OSSL_CRYPTO_EC_CURVE448_ED448_H
 
 # include "point_448.h"
 
@@ -198,4 +198,4 @@ c448_error_t c448_ed448_convert_private_key_to_x448(
                             uint8_t x[X448_PRIVATE_BYTES],
                             const uint8_t ed[EDDSA_448_PRIVATE_BYTES]);
 
-#endif                          /* HEADER_ED448_H */
+#endif                          /* OSSL_CRYPTO_EC_CURVE448_ED448_H */

diff --git a/crypto/ec/curve448/field.h b/crypto/ec/curve448/field.h
index 1bade8b1ab41ab7ebcef2e1ef08cc6e4bf243636..9d6ee1cacc8d15798462dc6e52149fbbe8e334e1 100644 (file)
--- a/crypto/ec/curve448/field.h
+++ b/crypto/ec/curve448/field.h
@@ -10,8 +10,8 @@
  * Originally written by Mike Hamburg
  */
 
-#ifndef HEADER_FIELD_H
-# define HEADER_FIELD_H
+#ifndef OSSL_CRYPTO_EC_CURVE448_FIELD_H
+# define OSSL_CRYPTO_EC_CURVE448_FIELD_H
 
 # include "internal/constant_time.h"
 # include <string.h>
@@ -165,4 +165,4 @@ static ossl_inline void gf_cond_swap(gf x, gf_s * RESTRICT y, mask_t swap)
     }
 }
 
-#endif                          /* HEADER_FIELD_H */
+#endif                          /* OSSL_CRYPTO_EC_CURVE448_FIELD_H */

diff --git a/crypto/ec/curve448/point_448.h b/crypto/ec/curve448/point_448.h
index 1708b57fe82456bef1af6482dfe3a4ab6c9e5433..9f09aea13f6c2e7593d94fa925e03caca67bff1e 100644 (file)
--- a/crypto/ec/curve448/point_448.h
+++ b/crypto/ec/curve448/point_448.h
@@ -10,8 +10,8 @@
  * Originally written by Mike Hamburg
  */
 
-#ifndef HEADER_POINT_448_H
-# define HEADER_POINT_448_H
+#ifndef OSSL_CRYPTO_EC_CURVE448_POINT_448_H
+# define OSSL_CRYPTO_EC_CURVE448_POINT_448_H
 
 # include "curve448utils.h"
 # include "field.h"
@@ -298,4 +298,4 @@ void curve448_scalar_destroy(curve448_scalar_t scalar);
 /* Overwrite point with zeros. */
 void curve448_point_destroy(curve448_point_t point);
 
-#endif                          /* HEADER_POINT_448_H */
+#endif                          /* OSSL_CRYPTO_EC_CURVE448_POINT_448_H */

diff --git a/crypto/ec/curve448/word.h b/crypto/ec/curve448/word.h
index 250720bea9b8522dfe5121407ac6e6534c720773..d3e6ff863b3bb5757ce27b3fcc88389f0d69c56c 100644 (file)
--- a/crypto/ec/curve448/word.h
+++ b/crypto/ec/curve448/word.h
@@ -10,8 +10,8 @@
  * Originally written by Mike Hamburg
  */
 
-#ifndef HEADER_WORD_H
-# define HEADER_WORD_H
+#ifndef OSSL_CRYPTO_EC_CURVE448_WORD_H
+# define OSSL_CRYPTO_EC_CURVE448_WORD_H
 
 # include <string.h>
 # include <assert.h>
@@ -78,4 +78,4 @@ static ossl_inline mask_t bool_to_mask(c448_bool_t m)
     return ret;
 }
 
-#endif                          /* HEADER_WORD_H */
+#endif                          /* OSSL_CRYPTO_EC_CURVE448_WORD_H */

diff --git a/crypto/engine/eng_local.h b/crypto/engine/eng_local.h
index 460053184344aecd987a9584dcdc74ed17c2a08d..1862920157c4de704a99af6ac22fe6521986a0fd 100644 (file)
--- a/crypto/engine/eng_local.h
+++ b/crypto/engine/eng_local.h
@@ -8,8 +8,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_ENGINE_INT_H
-# define HEADER_ENGINE_INT_H
+#ifndef OSSL_CRYPTO_ENGINE_ENG_LOCAL_H
+# define OSSL_CRYPTO_ENGINE_ENG_LOCAL_H
 
 # include <openssl/trace.h>
 # include "internal/cryptlib.h"
@@ -151,4 +151,4 @@ typedef struct st_engine_pile ENGINE_PILE;
 
 DEFINE_LHASH_OF(ENGINE_PILE);
 
-#endif                          /* HEADER_ENGINE_INT_H */
+#endif                          /* OSSL_CRYPTO_ENGINE_ENG_LOCAL_H */

diff --git a/crypto/hmac/hmac_local.h b/crypto/hmac/hmac_local.h
index 4d8ef6f6908187f649e1acae3ef51cf123d162d2..788721ef1fb23cf1d4fd623d4a6f5a651af5c6c0 100644 (file)
--- a/crypto/hmac/hmac_local.h
+++ b/crypto/hmac/hmac_local.h
@@ -7,8 +7,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_HMAC_LCL_H
-# define HEADER_HMAC_LCL_H
+#ifndef OSSL_CRYPTO_HMAC_LOCAL_H
+# define OSSL_CRYPTO_HMAC_LOCAL_H
 
 /* The current largest case is for SHA3-224 */
 #define HMAC_MAX_MD_CBLOCK_SIZE     144

diff --git a/crypto/mips_arch.h b/crypto/mips_arch.h
index df4ff7aebaf88d113a30c7ee0532ebddf57d6891..12a27615f14f7916e92f8a7f997dea8ef0ebd6c5 100644 (file)
--- a/crypto/mips_arch.h
+++ b/crypto/mips_arch.h
@@ -7,8 +7,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef __MIPS_ARCH_H__
-# define __MIPS_ARCH_H__
+#ifndef OSSL_CRYPTO_MIPS_ARCH_H
+# define OSSL_CRYPTO_MIPS_ARCH_H
 
 # if (defined(__mips_smartmips) || defined(_MIPS_ARCH_MIPS32R3) || \
       defined(_MIPS_ARCH_MIPS32R5) || defined(_MIPS_ARCH_MIPS32R6)) \

diff --git a/crypto/ppc_arch.h b/crypto/ppc_arch.h
index ce98f5b757cc9ef7dc0eb136df1ab0f276199af0..0241878ea791e12869ee5e467378a290d521d323 100644 (file)
--- a/crypto/ppc_arch.h
+++ b/crypto/ppc_arch.h
@@ -7,8 +7,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_PPC_ARCH_H
-# define HEADER_PPC_ARCH_H
+#ifndef OSSL_CRYPTO_PPC_ARCH_H
+# define OSSL_CRYPTO_PPC_ARCH_H
 
 extern unsigned int OPENSSL_ppccap_P;
 

diff --git a/crypto/rand/rand_local.h b/crypto/rand/rand_local.h
index 0f8a81f311045c39868915fd243642059230d1e6..7817df80d06c0596ee2e584bee6de9543354a131 100644 (file)
--- a/crypto/rand/rand_local.h
+++ b/crypto/rand/rand_local.h
@@ -7,8 +7,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_RAND_LCL_H
-# define HEADER_RAND_LCL_H
+#ifndef OSSL_CRYPTO_RAND_LOCAL_H
+# define OSSL_CRYPTO_RAND_LOCAL_H
 
 # include <openssl/aes.h>
 # include <openssl/evp.h>

diff --git a/crypto/rc4/rc4_local.h b/crypto/rc4/rc4_local.h
index 20afa1334e34530a8c4edaa2d8516fff0ed1448e..f8cf9a89b3eb2fc4d713956ab7895db010ec53ce 100644 (file)
--- a/crypto/rc4/rc4_local.h
+++ b/crypto/rc4/rc4_local.h
@@ -7,8 +7,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_RC4_LOCL_H
-# define HEADER_RC4_LOCL_H
+#ifndef OSSL_CRYPTO_RC4_LOCAL_H
+# define OSSL_CRYPTO_RC4_LOCAL_H
 
 # include <openssl/opensslconf.h>
 # include "internal/cryptlib.h"

diff --git a/crypto/rsa/rsa_local.h b/crypto/rsa/rsa_local.h
index 5dcd6eab7b8a8237f9c4b0f0e1e38ab37685325f..204fde29fa433046fafe73ebef8f04d444d32a4c 100644 (file)
--- a/crypto/rsa/rsa_local.h
+++ b/crypto/rsa/rsa_local.h
@@ -7,8 +7,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef RSA_LOCAL_HEADER_H
-#define RSA_LOCAL_HEADER_H
+#ifndef OSSL_CRYPTO_RSA_LOCAL_H
+#define OSSL_CRYPTO_RSA_LOCAL_H
 
 #include <openssl/rsa.h>
 #include "internal/refcount.h"
@@ -167,4 +167,4 @@ int rsa_fips186_4_gen_prob_primes(RSA *rsa, BIGNUM *p1, BIGNUM *p2,
                                   const BIGNUM *Xq2, int nbits,
                                   const BIGNUM *e, BN_CTX *ctx, BN_GENCB *cb);
 
-#endif /* RSA_LOCAL_HEADER_H */
+#endif /* OSSL_CRYPTO_RSA_LOCAL_H */

diff --git a/crypto/s390x_arch.h b/crypto/s390x_arch.h
index 77f327d4deefedfb3a02f37f7dd467544c8ac90e..0123de947704cfdaecb1e38998bc18d0cb9f32f3 100644 (file)
--- a/crypto/s390x_arch.h
+++ b/crypto/s390x_arch.h
@@ -7,8 +7,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef S390X_ARCH_H
-# define S390X_ARCH_H
+#ifndef OSSL_CRYPTO_S390X_ARCH_H
+# define OSSL_CRYPTO_S390X_ARCH_H
 
 # ifndef __ASSEMBLER__
 

diff --git a/crypto/seed/seed_local.h b/crypto/seed/seed_local.h
index 9be89b21a66003c4d970a0dfd26dff01dddc251f..ed3cebc6b1a0e9ff9ab39649995ab97a95c434d1 100644 (file)
--- a/crypto/seed/seed_local.h
+++ b/crypto/seed/seed_local.h
@@ -32,8 +32,8 @@
  * SUCH DAMAGE.
  *
  */
-#ifndef HEADER_SEED_LOCL_H
-# define HEADER_SEED_LOCL_H
+#ifndef OSSL_CRYPTO_SEED_LOCAL_H
+# define OSSL_CRYPTO_SEED_LOCAL_H
 
 # include "openssl/e_os2.h"
 # include <openssl/seed.h>
@@ -109,4 +109,4 @@ typedef unsigned int seed_word;
         (X1) ^= (T0);                            \
         (X2) ^= (T1)
 
-#endif                          /* HEADER_SEED_LOCL_H */
+#endif                          /* OSSL_CRYPTO_SEED_LOCAL_H */

diff --git a/crypto/sparc_arch.h b/crypto/sparc_arch.h
index 4207afea5e1f5da5c00d7567ec59686da8d75a36..f57f0e145b118ab66c8f6363eb598b42b12ae63b 100644 (file)
--- a/crypto/sparc_arch.h
+++ b/crypto/sparc_arch.h
@@ -7,8 +7,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef __SPARC_ARCH_H__
-# define __SPARC_ARCH_H__
+#ifndef OSSL_CRYPTO_SPARC_ARCH_H
+# define OSSL_CRYPTO_SPARC_ARCH_H
 
 # define SPARCV9_TICK_PRIVILEGED (1<<0)
 # define SPARCV9_PREFER_FPU      (1<<1)
@@ -115,4 +115,4 @@
         mov     tmp, %o7;
 # endif
 
-#endif                          /* __SPARC_ARCH_H__ */
+#endif                          /* OSSL_CRYPTO_SPARC_ARCH_H */

diff --git a/crypto/ui/ui_local.h b/crypto/ui/ui_local.h
index 6506cba52f840f0ea39596cf09ad5d8948526c46..36b3e6194b0a1769388651b18cd3a9b38a24e5c2 100644 (file)
--- a/crypto/ui/ui_local.h
+++ b/crypto/ui/ui_local.h
@@ -7,8 +7,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_UI_LOCL_H
-# define HEADER_UI_LOCL_H
+#ifndef OSSL_CRYPTO_UI_LOCAL_H
+# define OSSL_CRYPTO_UI_LOCAL_H
 
 # include <openssl/ui.h>
 # include <openssl/crypto.h>

diff --git a/crypto/x509/v3_admis.h b/crypto/x509/v3_admis.h
index 9d1535c3aef556ace3f451c4fb451cd635276efe..1e82c0f4a33fec9099eefd35dc1a239c4f65ad4c 100644 (file)
--- a/crypto/x509/v3_admis.h
+++ b/crypto/x509/v3_admis.h
@@ -7,8 +7,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_V3_ADMISSION_H
-# define HEADER_V3_ADMISSION_H
+#ifndef OSSL_CRYPTO_X509_V3_ADMIS_H
+# define OSSL_CRYPTO_X509_V3_ADMIS_H
 
 struct NamingAuthority_st {
     ASN1_OBJECT* namingAuthorityId;

diff --git a/e_os.h b/e_os.h
index 6cd7476296b643506b888f700cfd68e58a2d0f20..6ae3b2cca18390a7d43e39d06a81efc192bf616e 100644 (file)
--- a/e_os.h
+++ b/e_os.h
@@ -7,8 +7,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_E_OS_H
-# define HEADER_E_OS_H
+#ifndef OSSL_E_OS_H
+# define OSSL_E_OS_H
 
 # include <limits.h>
 # include <openssl/opensslconf.h>

diff --git a/engines/e_afalg.h b/engines/e_afalg.h
index 42b48301ac0444459c66d0b7249766cae118f3b5..b8e4911d21ef0c502339cfa4e90abafe53252e57 100644 (file)
--- a/engines/e_afalg.h
+++ b/engines/e_afalg.h
@@ -7,8 +7,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_AFALG_H
-# define HEADER_AFALG_H
+#ifndef OSSL_ENGINES_E_AFALG_H
+# define OSSL_ENGINES_E_AFALG_H
 
 # if defined(__GNUC__) && __GNUC__ >= 4 && \
      (!defined(__STDC_VERSION__) || __STDC_VERSION__ < 199901L)

diff --git a/engines/e_afalg_err.h b/engines/e_afalg_err.h
index 27cdcd3ebfc9a13d9c94075ad414714caa43e144..371723535b99d3d568cfa137a2f1f1a2a9656fac 100644 (file)
--- a/engines/e_afalg_err.h
+++ b/engines/e_afalg_err.h
@@ -8,8 +8,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_AFALGERR_H
-# define HEADER_AFALGERR_H
+#ifndef OSSL_ENGINES_E_AFALG_ERR_H
+# define OSSL_ENGINES_E_AFALG_ERR_H
 
 # include <openssl/opensslconf.h>
 # include <openssl/symhacks.h>

diff --git a/engines/e_capi_err.h b/engines/e_capi_err.h
index a9389ecf962a2858a48ae65c89902c4abedc7a79..048b6d171a3e57ba0c8f334d3128c4520e73cb4d 100644 (file)
--- a/engines/e_capi_err.h
+++ b/engines/e_capi_err.h
@@ -8,8 +8,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_CAPIERR_H
-# define HEADER_CAPIERR_H
+#ifndef OSSL_ENGINES_E_CAPI_ERR_H
+# define OSSL_ENGINES_E_CAPI_ERR_H
 
 # include <openssl/opensslconf.h>
 # include <openssl/symhacks.h>

diff --git a/engines/e_dasync_err.h b/engines/e_dasync_err.h
index 907ba88c1698435a6c2780d53c5f3698ea965036..a9db187f1db91cad250f6fdb019e87808157fd72 100644 (file)
--- a/engines/e_dasync_err.h
+++ b/engines/e_dasync_err.h
@@ -8,8 +8,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_DASYNCERR_H
-# define HEADER_DASYNCERR_H
+#ifndef OSSL_ENGINES_E_DASYNC_ERR_H
+# define OSSL_ENGINES_E_DASYNC_ERR_H
 
 # include <openssl/opensslconf.h>
 # include <openssl/symhacks.h>

diff --git a/engines/e_ossltest_err.h b/engines/e_ossltest_err.h
index b575a80ada501d871c725358a261f760d2064630..70a0bc667f6fb97c310917c6ce2da51b5835cf71 100644 (file)
--- a/engines/e_ossltest_err.h
+++ b/engines/e_ossltest_err.h
@@ -8,8 +8,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_OSSLTESTERR_H
-# define HEADER_OSSLTESTERR_H
+#ifndef OSSL_ENGINES_E_OSSLTEST_ERR_H
+# define OSSL_ENGINES_E_OSSLTEST_ERR_H
 
 # include <openssl/opensslconf.h>
 # include <openssl/symhacks.h>

diff --git a/include/crypto/aria.h b/include/crypto/aria.h
index 4bfbd5a74ae534f22ab7b4bd15de4f634a56a1b1..3bbb30ef3e29ffb7f5804a0f8493dce5c59ee07a 100644 (file)
--- a/include/crypto/aria.h
+++ b/include/crypto/aria.h
@@ -10,8 +10,8 @@
 
  /* Copyright (c) 2017 National Security Research Institute.  All rights reserved. */
 
-#ifndef HEADER_ARIA_H
-# define HEADER_ARIA_H
+#ifndef OSSL_CRYPTO_ARIA_H
+# define OSSL_CRYPTO_ARIA_H
 
 # include <openssl/opensslconf.h>
 

diff --git a/include/crypto/asn1_dsa.h b/include/crypto/asn1_dsa.h
index d2570516a107f6c20ee24b4e3c7fc489aeefacf2..caf0349968b3d9646c05f839eed34c09fa88e115 100644 (file)
--- a/include/crypto/asn1_dsa.h
+++ b/include/crypto/asn1_dsa.h
@@ -7,8 +7,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_ASN1_DSA_H
-# define HEADER_ASN1_DSA_H
+#ifndef OSSL_CRYPTO_ASN1_DSA_H
+# define OSSL_CRYPTO_ASN1_DSA_H
 
 #include "internal/packet.h"
 

diff --git a/include/crypto/bn.h b/include/crypto/bn.h
index cb8b17662a5f56fa969d948c64a2155e0b6ef92c..91c6cd5dcc9f0ec239a65a8ec3cf8d50119fa486 100644 (file)
--- a/include/crypto/bn.h
+++ b/include/crypto/bn.h
@@ -7,8 +7,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_BN_INT_H
-# define HEADER_BN_INT_H
+#ifndef OSSL_CRYPTO_BN_H
+# define OSSL_CRYPTO_BN_H
 
 # include <openssl/bn.h>
 # include <limits.h>

diff --git a/include/crypto/bn_conf.h.in b/include/crypto/bn_conf.h.in
index 9061d20d826c59bc24e5005a5ff921d24db74759..c8fdf36cae227698aaa636dea7573257acf2ef6e 100644 (file)
--- a/include/crypto/bn_conf.h.in
+++ b/include/crypto/bn_conf.h.in
@@ -8,8 +8,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_BN_CONF_H
-# define HEADER_BN_CONF_H
+#ifndef OSSL_CRYPTO_BN_CONF_H
+# define OSSL_CRYPTO_BN_CONF_H
 
 /*
  * The contents of this file are not used in the UEFI build, as

diff --git a/include/crypto/chacha.h b/include/crypto/chacha.h
index e095522c50670743c8a18082db1aedd10887dde1..77cfd3b2817269a142f36dfb35269426d6269e97 100644 (file)
--- a/include/crypto/chacha.h
+++ b/include/crypto/chacha.h
@@ -7,8 +7,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_CHACHA_H
-#define HEADER_CHACHA_H
+#ifndef OSSL_CRYPTO_CHACHA_H
+#define OSSL_CRYPTO_CHACHA_H
 
 #include <stddef.h>
 

diff --git a/include/crypto/ciphermode_platform.h b/include/crypto/ciphermode_platform.h
index b16062fa9346f5d06d1bf33c33626b442c9b093e..b1868e1a6df2288e28181917dfa4340a152a551d 100644 (file)
--- a/include/crypto/ciphermode_platform.h
+++ b/include/crypto/ciphermode_platform.h
@@ -7,8 +7,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_INTERNAL_CIPHERMODE_PLATFORM_H
-# define HEADER_INTERNAL_CIPHERMODE_PLATFORM_H
+#ifndef OSSL_CRYPTO_CIPHERMODE_PLATFORM_H
+# define OSSL_CRYPTO_CIPHERMODE_PLATFORM_H
 
 # include "openssl/aes.h"
 
@@ -445,4 +445,4 @@ void HWAES_ocb_decrypt(const unsigned char *in, unsigned char *out,
 
 # endif /* HWAES_CAPABLE */
 
-#endif /* HEADER_INTERNAL_CIPHERMODE_PLATFORM_H */
+#endif /* OSSL_CRYPTO_CIPHERMODE_PLATFORM_H */

diff --git a/include/crypto/ctype.h b/include/crypto/ctype.h
index d0660cf9c455c7d1c7e295826950025d59f91b87..f3ab678e145f24cda044dfebad425a0b54b915f4 100644 (file)
--- a/include/crypto/ctype.h
+++ b/include/crypto/ctype.h
@@ -18,8 +18,8 @@
  * throughout the rest of the source code.  Refer to issue #4154 for
  * details.
  */
-#ifndef INTERNAL_CTYPE_H
-# define INTERNAL_CTYPE_H
+#ifndef OSSL_CRYPTO_CTYPE_H
+# define OSSL_CRYPTO_CTYPE_H
 
 # define CTYPE_MASK_lower       0x1
 # define CTYPE_MASK_upper       0x2

diff --git a/include/crypto/dso_conf.h.in b/include/crypto/dso_conf.h.in
index 9a373b203247df66adae4220a552daed036aab0a..fd0e16b3f94fb8e6f0d11587b51b7ff054b915eb 100644 (file)
--- a/include/crypto/dso_conf.h.in
+++ b/include/crypto/dso_conf.h.in
@@ -8,8 +8,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_DSO_CONF_H
-# define HEADER_DSO_CONF_H
+#ifndef OSSL_CRYPTO_DSO_CONF_H
+# define OSSL_CRYPTO_DSO_CONF_H
 {-  # The DSO code currently always implements all functions so that no
     # applications will have to worry about that from a compilation point
     # of view. However, the "method"s may return zero unless that platform

diff --git a/include/crypto/ec.h b/include/crypto/ec.h
index 9d8882df2e5995e5d2a05bd2c75aca5d0b22e796..4a0a967629a96273d76c5cf5e1e29fef477d5e38 100644 (file)
--- a/include/crypto/ec.h
+++ b/include/crypto/ec.h
@@ -9,8 +9,8 @@
 
 /* Internal EC functions for other submodules: not for application use */
 
-#ifndef HEADER_OSSL_EC_INTERNAL_H
-# define HEADER_OSSL_EC_INTERNAL_H
+#ifndef OSSL_CRYPTO_EC_H
+# define OSSL_CRYPTO_EC_H
 # include <openssl/opensslconf.h>
 
 # ifndef OPENSSL_NO_EC

diff --git a/include/crypto/err.h b/include/crypto/err.h
index 68c6d62e30e9a403aa8992d521bdd9bf16b06d64..527f19667d9aa8af73a8128f254b583888d3c007 100644 (file)
--- a/include/crypto/err.h
+++ b/include/crypto/err.h
@@ -7,8 +7,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef INTERNAL_ERR_INT_H
-# define INTERNAL_ERR_INT_H
+#ifndef OSSL_CRYPTO_ERR_H
+# define OSSL_CRYPTO_ERR_H
 
 int err_load_crypto_strings_int(void);
 void err_cleanup(void);

diff --git a/include/crypto/lhash.h b/include/crypto/lhash.h
index de0c8b0408b240867d1b750f4590735430d96a7e..962993626221fb14d0afb30fb2b6520141513dde 100644 (file)
--- a/include/crypto/lhash.h
+++ b/include/crypto/lhash.h
@@ -7,8 +7,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef INTERNAL_LHASH_H
-# define INTERNAL_LHASH_H
+#ifndef OSSL_CRYPTO_LHASH_H
+# define OSSL_CRYPTO_LHASH_H
 
 unsigned long openssl_lh_strcasehash(const char *);
 

diff --git a/include/crypto/rand.h b/include/crypto/rand.h
index bc427e3cf47b90f7c251055c2c64c5c48cf53a17..e808c30820e5f532f40a5572c04780a1ce7be76a 100644 (file)
--- a/include/crypto/rand.h
+++ b/include/crypto/rand.h
@@ -15,8 +15,8 @@
  * or in the file LICENSE in the source distribution.
  */
 
-#ifndef HEADER_RAND_INT_H
-# define HEADER_RAND_INT_H
+#ifndef OSSL_CRYPTO_RAND_H
+# define OSSL_CRYPTO_RAND_H
 
 # include <openssl/rand.h>
 

diff --git a/include/crypto/sha.h b/include/crypto/sha.h
index 386326156396e4ec5b219b8a4b8a7151d0495cc8..57a3d20d0e9812da9d3325064bf6281f633a5a53 100644 (file)
--- a/include/crypto/sha.h
+++ b/include/crypto/sha.h
@@ -8,8 +8,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_INTERNAL_SHA_H
-# define HEADER_INTERNAL_SHA_H
+#ifndef OSSL_CRYPTO_SHA_H
+# define OSSL_CRYPTO_SHA_H
 
 # include <openssl/opensslconf.h>
 

diff --git a/include/crypto/sm2.h b/include/crypto/sm2.h
index dad70e65473e7488c854f00fd1b738977e02ceda..4a65ce4332a10cd95d7743a1fd42f9039d1253b2 100644 (file)
--- a/include/crypto/sm2.h
+++ b/include/crypto/sm2.h
@@ -9,8 +9,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_SM2_H
-# define HEADER_SM2_H
+#ifndef OSSL_CRYPTO_SM2_H
+# define OSSL_CRYPTO_SM2_H
 # include <openssl/opensslconf.h>
 
 # ifndef OPENSSL_NO_SM2

diff --git a/include/crypto/sm2err.h b/include/crypto/sm2err.h
index 923bb6c4b81eacbbc9aa10a7104a6ec6db05f310..3b86c38c3c53ff0e7befc8a80559663f39e93255 100644 (file)
--- a/include/crypto/sm2err.h
+++ b/include/crypto/sm2err.h
@@ -8,8 +8,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_SM2ERR_H
-# define HEADER_SM2ERR_H
+#ifndef OSSL_CRYPTO_SM2ERR_H
+# define OSSL_CRYPTO_SM2ERR_H
 
 # include <openssl/opensslconf.h>
 # include <openssl/symhacks.h>

diff --git a/include/crypto/sm4.h b/include/crypto/sm4.h
index f2e172877352d8f8571f3d7e01dae70d4b927a4a..fb5253d857b660320d7614b7760cf0c077f391c0 100644 (file)
--- a/include/crypto/sm4.h
+++ b/include/crypto/sm4.h
@@ -8,8 +8,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_SM4_H
-# define HEADER_SM4_H
+#ifndef OSSL_CRYPTO_SM4_H
+# define OSSL_CRYPTO_SM4_H
 
 # include <openssl/opensslconf.h>
 # include <openssl/e_os2.h>

diff --git a/include/crypto/sparse_array.h b/include/crypto/sparse_array.h
index 037ccfeee9ebacad6fa2dcd2bf518de5d4be191b..a8031cd3f128bdf157770ea87d2c7a38f0f43e1d 100644 (file)
--- a/include/crypto/sparse_array.h
+++ b/include/crypto/sparse_array.h
@@ -8,8 +8,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_SPARSE_ARRAY_H
-# define HEADER_SPARSE_ARRAY_H
+#ifndef OSSL_CRYPTO_SPARSE_ARRAY_H
+# define OSSL_CRYPTO_SPARSE_ARRAY_H
 
 # include <openssl/e_os2.h>
 

diff --git a/include/crypto/store.h b/include/crypto/store.h
index afad09c7780c08447f368dc6383b1ade0b7f078f..8f4757d9c25f250812c71e1ba268fa65199bfbba 100644 (file)
--- a/include/crypto/store.h
+++ b/include/crypto/store.h
@@ -7,8 +7,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_STORE_H
-# define HEADER_STORE_H
+#ifndef OSSL_CRYPTO_STORE_H
+# define OSSL_CRYPTO_STORE_H
 
 # include <openssl/bio.h>
 # include <openssl/store.h>

diff --git a/include/internal/bio.h b/include/internal/bio.h
index 8f368e36b3b128e8fe5977ae8de34c9c023609e0..2fb0d5cb76f458533bd1c617fe37761f968663c2 100644 (file)
--- a/include/internal/bio.h
+++ b/include/internal/bio.h
@@ -7,8 +7,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_INTERNAL_BIO_H
-# define HEADER_INTERNAL_BIO_H
+#ifndef OSSL_INTERNAL_BIO_H
+# define OSSL_INTERNAL_BIO_H
 
 #include <openssl/bio.h>
 

diff --git a/include/internal/conf.h b/include/internal/conf.h
index 389cdfd75b658cc024ef78c012b843d17c96e78d..1e7ab2cedf085e1868d1da670eed09e186b37aed 100644 (file)
--- a/include/internal/conf.h
+++ b/include/internal/conf.h
@@ -7,8 +7,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_INTERNAL_CONF_H
-# define HEADER_INTERNAL_CONF_H
+#ifndef OSSL_INTERNAL_CONF_H
+# define OSSL_INTERNAL_CONF_H
 
 #include <openssl/conf.h>
 

diff --git a/include/internal/constant_time.h b/include/internal/constant_time.h
index f7b264ee702e444aa2e91691620397825c8c1ce4..d98dae95453319051a4b8437d1b2bb2c5ce103f5 100644 (file)
--- a/include/internal/constant_time.h
+++ b/include/internal/constant_time.h
@@ -7,8 +7,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_CONSTANT_TIME_LOCL_H
-# define HEADER_CONSTANT_TIME_LOCL_H
+#ifndef OSSL_INTERNAL_CONSTANT_TIME_H
+# define OSSL_INTERNAL_CONSTANT_TIME_H
 
 # include <stdlib.h>
 # include <string.h>
@@ -384,4 +384,4 @@ static ossl_inline void constant_time_lookup(void *out,
  */
 void err_clear_last_constant_time(int clear);
 
-#endif                          /* HEADER_CONSTANT_TIME_LOCL_H */
+#endif                          /* OSSL_INTERNAL_CONSTANT_TIME_H */

diff --git a/include/internal/cryptlib.h b/include/internal/cryptlib.h
index cfac74a328c44ee60122de67c97a2ab51d5f9edd..f17816425db13fa273982c9991823a765d41bd24 100644 (file)
--- a/include/internal/cryptlib.h
+++ b/include/internal/cryptlib.h
@@ -7,8 +7,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_CRYPTLIB_H
-# define HEADER_CRYPTLIB_H
+#ifndef OSSL_INTERNAL_CRYPTLIB_H
+# define OSSL_INTERNAL_CRYPTLIB_H
 
 # include <stdlib.h>
 # include <string.h>

diff --git a/include/internal/dane.h b/include/internal/dane.h
index 9a6432dad02d63746b87e139817442668d4e9a3d..d9bae2b9f7b514b1aee31d91feacfff207235201 100644 (file)
--- a/include/internal/dane.h
+++ b/include/internal/dane.h
@@ -7,8 +7,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_INTERNAL_DANE_H
-#define HEADER_INTERNAL_DANE_H
+#ifndef OSSL_INTERNAL_DANE_H
+#define OSSL_INTERNAL_DANE_H
 
 #include <openssl/safestack.h>
 
@@ -100,4 +100,4 @@ struct ssl_dane_st {
 #define DANETLS_HAS_DANE_TA(dane) ((dane)&&((dane)->umask & DANETLS_DANE_TA_MASK))
 #define DANETLS_HAS_DANE_EE(dane) ((dane)&&((dane)->umask & DANETLS_DANE_EE_MASK))
 
-#endif /* HEADER_INTERNAL_DANE_H */
+#endif /* OSSL_INTERNAL_DANE_H */

diff --git a/include/internal/dso.h b/include/internal/dso.h
index 63881beffb25329dfe23131fabfda1d2d3638363..76cb3c6e0af7a938d92e8821bd9b78a96f1f1a0e 100644 (file)
--- a/include/internal/dso.h
+++ b/include/internal/dso.h
@@ -7,8 +7,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_DSO_H
-# define HEADER_DSO_H
+#ifndef OSSL_INTERNAL_DSO_H
+# define OSSL_INTERNAL_DSO_H
 
 # include <openssl/crypto.h>
 # include "internal/dsoerr.h"

diff --git a/include/internal/dsoerr.h b/include/internal/dsoerr.h
index da51e5f6fdb7ee7e4cb327b1dc6a644457eea893..9ddb9cff4d9a377163d11502f87ba5e6132b9ee5 100644 (file)
--- a/include/internal/dsoerr.h
+++ b/include/internal/dsoerr.h
@@ -8,8 +8,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_DSOERR_H
-# define HEADER_DSOERR_H
+#ifndef OSSL_INTERNAL_DSOERR_H
+# define OSSL_INTERNAL_DSOERR_H
 
 # include <openssl/opensslconf.h>
 # include <openssl/symhacks.h>

diff --git a/include/internal/err.h b/include/internal/err.h
index 15511c7bec4b4570d8b0312f8bb7cd2168bca252..8cb72ae370aace6babfc021692c7cf3428413341 100644 (file)
--- a/include/internal/err.h
+++ b/include/internal/err.h
@@ -7,8 +7,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef INTERNAL_ERR_H
-# define INTERNAL_ERR_H
+#ifndef OSSL_INTERNAL_ERR_H
+# define OSSL_INTERNAL_ERR_H
 
 void err_free_strings_int(void);
 

diff --git a/include/internal/md5_sha1.h b/include/internal/md5_sha1.h
index 0f1f7350fb7fa8349eda8a8f4a5e42fd3b468f75..3e80fdcf97991c10da33d93db9b04d29b1928d5c 100644 (file)
--- a/include/internal/md5_sha1.h
+++ b/include/internal/md5_sha1.h
@@ -8,8 +8,8 @@
  */
 
 /* TODO(3.0) Move this header into provider when dependencies are removed */
-#ifndef HEADER_MD5_SHA1_H
-# define HEADER_MD5_SHA1_H
+#ifndef OSSL_INTERNAL_MD5_SHA1_H
+# define OSSL_INTERNAL_MD5_SHA1_H
 
 # include <openssl/opensslconf.h>
 
@@ -34,4 +34,4 @@ int md5_sha1_ctrl(MD5_SHA1_CTX *mctx, int cmd, int mslen, void *ms);
 
 # endif /* OPENSSL_NO_MD5 */
 
-#endif /* HEADER_MD5_SHA1_H */
+#endif /* OSSL_INTERNAL_MD5_SHA1_H */

diff --git a/include/internal/nelem.h b/include/internal/nelem.h
index e599242508c9d2f1e5065a1fdda00b487ff61146..0c32483fc581952a11723b80579aed0e67fc52e3 100644 (file)
--- a/include/internal/nelem.h
+++ b/include/internal/nelem.h
@@ -7,8 +7,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_NELEM_H
-# define HEADER_NELEM_H
+#ifndef OSSL_INTERNAL_NELEM_H
+# define OSSL_INTERNAL_NELEM_H
 
 # define OSSL_NELEM(x)    (sizeof(x)/sizeof((x)[0]))
 #endif

diff --git a/include/internal/numbers.h b/include/internal/numbers.h
index f3c6bbc970f24756b965179c0e253cc4bff4e534..db65559c6b4cf689918c8e279972a140f299cf8c 100644 (file)
--- a/include/internal/numbers.h
+++ b/include/internal/numbers.h
@@ -7,8 +7,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_NUMBERS_H
-# define HEADER_NUMBERS_H
+#ifndef OSSL_INTERNAL_NUMBERS_H
+# define OSSL_INTERNAL_NUMBERS_H
 
 # include <limits.h>
 

diff --git a/include/internal/o_dir.h b/include/internal/o_dir.h
index 72cdb5530caaa033c31372319fa4e9305fd9d3b5..220cf173e65319b495b7b788b41e88a46cfae403 100644 (file)
--- a/include/internal/o_dir.h
+++ b/include/internal/o_dir.h
@@ -36,8 +36,8 @@
  * SUCH DAMAGE.
  */
 
-#ifndef O_DIR_H
-# define O_DIR_H
+#ifndef OSSL_INTERNAL_O_DIR_H
+# define OSSL_INTERNAL_O_DIR_H
 
 typedef struct OPENSSL_dir_context_st OPENSSL_DIR_CTX;
 

diff --git a/include/internal/packet.h b/include/internal/packet.h
index 69a6bd1308095c07e3dad73a38a9021113e0949b..c03d917da7569e62e6dc9f0c6917f93076bf0d06 100644 (file)
--- a/include/internal/packet.h
+++ b/include/internal/packet.h
@@ -7,8 +7,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_PACKET_LOCL_H
-# define HEADER_PACKET_LOCL_H
+#ifndef OSSL_INTERNAL_PACKET_H
+# define OSSL_INTERNAL_PACKET_H
 
 # include <string.h>
 # include <openssl/bn.h>
@@ -881,4 +881,4 @@ int WPACKET_is_null_buf(WPACKET *pkt);
 /* Release resources in a WPACKET if a failure has occurred. */
 void WPACKET_cleanup(WPACKET *pkt);
 
-#endif                          /* HEADER_PACKET_LOCL_H */
+#endif                          /* OSSL_INTERNAL_PACKET_H */

diff --git a/include/internal/property.h b/include/internal/property.h
index 842c7dea173ef35dd4f0f98e45e11e3c95d1f773..a3a4a62be6a24b2876b1f99236d53cf9fa0cb8ec 100644 (file)
--- a/include/internal/property.h
+++ b/include/internal/property.h
@@ -8,8 +8,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_PROPERTY_H
-# define HEADER_PROPERTY_H
+#ifndef OSSL_INTERNAL_PROPERTY_H
+# define OSSL_INTERNAL_PROPERTY_H
 
 #include "internal/cryptlib.h"
 

diff --git a/include/internal/propertyerr.h b/include/internal/propertyerr.h
index a5d5125770439c59434c24fecbc28e5a92adb476..ebbd8619b23a8b717d5527af81d6f4e42967fa58 100644 (file)
--- a/include/internal/propertyerr.h
+++ b/include/internal/propertyerr.h
@@ -8,8 +8,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_PROPERR_H
-# define HEADER_PROPERR_H
+#ifndef OSSL_INTERNAL_PROPERTYERR_H
+# define OSSL_INTERNAL_PROPERTYERR_H
 
 # include <openssl/opensslconf.h>
 # include <openssl/symhacks.h>

diff --git a/include/internal/refcount.h b/include/internal/refcount.h
index 1619b289326dfd29bd72d2d3837a6b7146484c07..4feecf971cecbef50ac59e660bc2334538bf646f 100644 (file)
--- a/include/internal/refcount.h
+++ b/include/internal/refcount.h
@@ -6,8 +6,8 @@
  * in the file LICENSE in the source distribution or at
  * https://www.openssl.org/source/license.html
  */
-#ifndef HEADER_INTERNAL_REFCOUNT_H
-# define HEADER_INTERNAL_REFCOUNT_H
+#ifndef OSSL_INTERNAL_REFCOUNT_H
+# define OSSL_INTERNAL_REFCOUNT_H
 
 /* Used to checking reference counts, most while doing perl5 stuff :-) */
 # if defined(OPENSSL_NO_STDIO)

diff --git a/include/internal/sha3.h b/include/internal/sha3.h
index b07d50c6c26e9b4f84f18ad28aab727f1f98129b..81ba41ac0dc5c6c3e899c08a0b5b685bae8fdd16 100644 (file)
--- a/include/internal/sha3.h
+++ b/include/internal/sha3.h
@@ -8,8 +8,8 @@
  */
 
 /* TODO(3.0) Move this header into provider when dependencies are removed */
-#ifndef HEADER_INTERNAL_SHA3_H
-# define HEADER_INTERNAL_SHA3_H
+#ifndef OSSL_INTERNAL_SHA3_H
+# define OSSL_INTERNAL_SHA3_H
 
 # include <openssl/e_os2.h>
 # include <stddef.h>
@@ -49,4 +49,4 @@ int sha3_final(unsigned char *md, KECCAK1600_CTX *ctx);
 size_t SHA3_absorb(uint64_t A[5][5], const unsigned char *inp, size_t len,
                    size_t r);
 
-#endif /* HEADER_INTERNAL_SHA3_H */
+#endif /* OSSL_INTERNAL_SHA3_H */

diff --git a/include/internal/sm3.h b/include/internal/sm3.h
index 2aef712e6a51ec24293396965bed6b7de3c2303b..51bb265fff5aec1d50427118127677a7737a4383 100644 (file)
--- a/include/internal/sm3.h
+++ b/include/internal/sm3.h
@@ -9,8 +9,8 @@
  */
 
 /* TODO(3.0) Move this header into provider when dependencies are removed */
-#ifndef HEADER_SM3_H
-# define HEADER_SM3_H
+#ifndef OSSL_INTERNAL_SM3_H
+# define OSSL_INTERNAL_SM3_H
 
 # include <openssl/opensslconf.h>
 
@@ -35,4 +35,4 @@ int sm3_init(SM3_CTX *c);
 int sm3_update(SM3_CTX *c, const void *data, size_t len);
 int sm3_final(unsigned char *md, SM3_CTX *c);
 
-#endif /* HEADER_SM3_H */
+#endif /* OSSL_INTERNAL_SM3_H */

diff --git a/include/internal/sockets.h b/include/internal/sockets.h
index 8e84f0b0f7ae5716e5d3f3f032c32aceb9a0e732..e444766dec78573e36c917eaea119cc197164b64 100644 (file)
--- a/include/internal/sockets.h
+++ b/include/internal/sockets.h
@@ -8,8 +8,8 @@
  */
 
 
-#ifndef HEADER_INTERNAL_SOCKETS
-# define HEADER_INTERNAL_SOCKETS
+#ifndef OSSL_INTERNAL_SOCKETS_H
+# define OSSL_INTERNAL_SOCKETS_H
 
 # if defined(OPENSSL_SYS_VXWORKS) || defined(OPENSSL_SYS_UEFI)
 #  define NO_SYS_PARAM_H

diff --git a/include/internal/sslconf.h b/include/internal/sslconf.h
index 94e6724e61171469fe7bc115fcb85c3e57772cd3..9e635da98a6953934ea56350301981b2bd838967 100644 (file)
--- a/include/internal/sslconf.h
+++ b/include/internal/sslconf.h
@@ -7,8 +7,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_SSLCONF_H
-# define HEADER_SSLCONF_H
+#ifndef OSSL_INTERNAL_SSLCONF_H
+# define OSSL_INTERNAL_SSLCONF_H
 
 typedef struct ssl_conf_cmd_st SSL_CONF_CMD;
 

diff --git a/include/openssl/aes.h b/include/openssl/aes.h
index 060aa0f67c75136ae62605f2155c8d577de206f0..672bcfbe50a0d46ef2e3eb03fb6c45e954db7444 100644 (file)
--- a/include/openssl/aes.h
+++ b/include/openssl/aes.h
@@ -7,8 +7,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_AES_H
-# define HEADER_AES_H
+#ifndef OPENSSL_AES_H
+# define OPENSSL_AES_H
 
 # include <openssl/opensslconf.h>
 

diff --git a/include/openssl/asn1.h b/include/openssl/asn1.h
index ca00430eaf451f578a22ea4b34697abec551b477..6389722e15b0f41966dfef0af8af178275a5e0ba 100644 (file)
--- a/include/openssl/asn1.h
+++ b/include/openssl/asn1.h
@@ -7,8 +7,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_ASN1_H
-# define HEADER_ASN1_H
+#ifndef OPENSSL_ASN1_H
+# define OPENSSL_ASN1_H
 
 # include <time.h>
 # include <openssl/e_os2.h>

diff --git a/include/openssl/asn1err.h b/include/openssl/asn1err.h
index d2d271b9952c1d080f9c3d91b2621165f0daf48d..944f7ca4569dcd092e78c05686102e9150f98740 100644 (file)
--- a/include/openssl/asn1err.h
+++ b/include/openssl/asn1err.h
@@ -8,8 +8,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_ASN1ERR_H
-# define HEADER_ASN1ERR_H
+#ifndef OPENSSL_ASN1ERR_H
+# define OPENSSL_ASN1ERR_H
 
 # include <openssl/opensslconf.h>
 # include <openssl/symhacks.h>

diff --git a/include/openssl/asn1t.h b/include/openssl/asn1t.h
index 568b347ce282fdf30cf106ea182ed8a309bf4e9b..0556d3c6c4217068d9feaac5bff5d6fbd6103724 100644 (file)
--- a/include/openssl/asn1t.h
+++ b/include/openssl/asn1t.h
@@ -7,8 +7,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_ASN1T_H
-# define HEADER_ASN1T_H
+#ifndef OPENSSL_ASN1T_H
+# define OPENSSL_ASN1T_H
 
 # include <stddef.h>
 # include <openssl/e_os2.h>

diff --git a/include/openssl/async.h b/include/openssl/async.h
index 910c144c6b8281790385a0b86c30230900bc1ae0..9ed41dbc1dd9f87f7f4d54ee898d2225a60f5943 100644 (file)
--- a/include/openssl/async.h
+++ b/include/openssl/async.h
@@ -9,8 +9,8 @@
 
 #include <stdlib.h>
 
-#ifndef HEADER_ASYNC_H
-# define HEADER_ASYNC_H
+#ifndef OPENSSL_ASYNC_H
+# define OPENSSL_ASYNC_H
 
 #if defined(_WIN32)
 # if defined(BASETYPES) || defined(_WINDEF_H)

diff --git a/include/openssl/asyncerr.h b/include/openssl/asyncerr.h
index 9612190400c5c45d1dfefee926e3143f7e0e1bbd..3c2e14d6b79073270aa6ba9535716ba00d5c54f5 100644 (file)
--- a/include/openssl/asyncerr.h
+++ b/include/openssl/asyncerr.h
@@ -8,8 +8,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_ASYNCERR_H
-# define HEADER_ASYNCERR_H
+#ifndef OPENSSL_ASYNCERR_H
+# define OPENSSL_ASYNCERR_H
 
 # include <openssl/opensslconf.h>
 # include <openssl/symhacks.h>

diff --git a/include/openssl/bio.h b/include/openssl/bio.h
index 3e4fbd35b0bb054de667aed3f92334504ad959fb..e8416560cd2dcaebcf3a0a87f2fe87d9aca23673 100644 (file)
--- a/include/openssl/bio.h
+++ b/include/openssl/bio.h
@@ -7,8 +7,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_BIO_H
-# define HEADER_BIO_H
+#ifndef OPENSSL_BIO_H
+# define OPENSSL_BIO_H
 
 # include <openssl/e_os2.h>
 

diff --git a/include/openssl/bioerr.h b/include/openssl/bioerr.h
index 79a6c9e67644ae4ed1d96d2a191ed73adf7d609c..f2ed705759961d2f440bba034654b1273aad9fab 100644 (file)
--- a/include/openssl/bioerr.h
+++ b/include/openssl/bioerr.h
@@ -8,8 +8,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_BIOERR_H
-# define HEADER_BIOERR_H
+#ifndef OPENSSL_BIOERR_H
+# define OPENSSL_BIOERR_H
 
 # include <openssl/opensslconf.h>
 # include <openssl/symhacks.h>

diff --git a/include/openssl/blowfish.h b/include/openssl/blowfish.h
index 2a6bda4edfdad7a1210c20715cd0830d9482ab32..1445a5fd871c103fee859fe39b0e2708fd821744 100644 (file)
--- a/include/openssl/blowfish.h
+++ b/include/openssl/blowfish.h
@@ -7,8 +7,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_BLOWFISH_H
-# define HEADER_BLOWFISH_H
+#ifndef OPENSSL_BLOWFISH_H
+# define OPENSSL_BLOWFISH_H
 
 # include <openssl/opensslconf.h>
 

diff --git a/include/openssl/bn.h b/include/openssl/bn.h
index 02444422dff16bedd6bd8f9d682d733429ea9448..8ece0051956dbf52eac09e2925777652d712d433 100644 (file)
--- a/include/openssl/bn.h
+++ b/include/openssl/bn.h
@@ -8,8 +8,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_BN_H
-# define HEADER_BN_H
+#ifndef OPENSSL_BN_H
+# define OPENSSL_BN_H
 
 # include <openssl/e_os2.h>
 # ifndef OPENSSL_NO_STDIO

diff --git a/include/openssl/bnerr.h b/include/openssl/bnerr.h
index fa5398cf8c754d8b18e6d3317206b66a3e8bbc60..9e32edbcab4e2d0e9162baab4b43c8cd005b9222 100644 (file)
--- a/include/openssl/bnerr.h
+++ b/include/openssl/bnerr.h
@@ -8,8 +8,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_BNERR_H
-# define HEADER_BNERR_H
+#ifndef OPENSSL_BNERR_H
+# define OPENSSL_BNERR_H
 
 # include <openssl/opensslconf.h>
 # include <openssl/symhacks.h>

diff --git a/include/openssl/buffer.h b/include/openssl/buffer.h
index 39e34d996e59b1dd17571e734b2dea93d9d587fb..f5cc3c51a665761762808319010d6c77e53aff25 100644 (file)
--- a/include/openssl/buffer.h
+++ b/include/openssl/buffer.h
@@ -7,11 +7,11 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_BUFFER_H
-# define HEADER_BUFFER_H
+#ifndef OPENSSL_BUFFER_H
+# define OPENSSL_BUFFER_H
 
 # include <openssl/types.h>
-# ifndef HEADER_CRYPTO_H
+# ifndef OPENSSL_CRYPTO_H
 #  include <openssl/crypto.h>
 # endif
 # include <openssl/buffererr.h>

diff --git a/include/openssl/buffererr.h b/include/openssl/buffererr.h
index 64081234b91c292111926ba80f5dc30fcdc6d15c..24a0a36b4867f6bbaea2cd854e2d3926f2ae7153 100644 (file)
--- a/include/openssl/buffererr.h
+++ b/include/openssl/buffererr.h
@@ -8,8 +8,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_BUFERR_H
-# define HEADER_BUFERR_H
+#ifndef OPENSSL_BUFFERERR_H
+# define OPENSSL_BUFFERERR_H
 
 # include <openssl/opensslconf.h>
 # include <openssl/symhacks.h>

diff --git a/include/openssl/camellia.h b/include/openssl/camellia.h
index 42c557a73993e08c2907e1db1c06a2f16756a107..5b6648b673c45a76c4466dc619415f000b7ae1ac 100644 (file)
--- a/include/openssl/camellia.h
+++ b/include/openssl/camellia.h
@@ -7,8 +7,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_CAMELLIA_H
-# define HEADER_CAMELLIA_H
+#ifndef OPENSSL_CAMELLIA_H
+# define OPENSSL_CAMELLIA_H
 
 # include <openssl/opensslconf.h>
 

diff --git a/include/openssl/cast.h b/include/openssl/cast.h
index 5656ecd2c72dc43460af2e08ce929bc4e27367d3..c14c6979c402429e6e53eb476901def76f667095 100644 (file)
--- a/include/openssl/cast.h
+++ b/include/openssl/cast.h
@@ -7,8 +7,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_CAST_H
-# define HEADER_CAST_H
+#ifndef OPENSSL_CAST_H
+# define OPENSSL_CAST_H
 
 # include <openssl/opensslconf.h>
 

diff --git a/include/openssl/cmac.h b/include/openssl/cmac.h
index 029b3e2f3606387e8640424f26164fdaa8712c68..c8802ec7336b55cae641f5f927708ebcfa58ba70 100644 (file)
--- a/include/openssl/cmac.h
+++ b/include/openssl/cmac.h
@@ -7,8 +7,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_CMAC_H
-# define HEADER_CMAC_H
+#ifndef OPENSSL_CMAC_H
+# define OPENSSL_CMAC_H
 
 # ifndef OPENSSL_NO_CMAC
 

diff --git a/include/openssl/cmp.h b/include/openssl/cmp.h
index daffc2996accf5131ccd6e306e32fd5ff22e3190..fe138bd060c52a78084acd831d237d93cab97499 100644 (file)
--- a/include/openssl/cmp.h
+++ b/include/openssl/cmp.h
@@ -9,8 +9,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef OSSL_HEADER_CMP_H
-# define OSSL_HEADER_CMP_H
+#ifndef OPENSSL_CMP_H
+# define OPENSSL_CMP_H
 
 # include <openssl/opensslconf.h>
 # ifndef OPENSSL_NO_CMP
@@ -341,4 +341,4 @@ int OSSL_CMP_CTX_set1_senderNonce(OSSL_CMP_CTX *ctx,
 }
 #   endif
 # endif /* !defined OPENSSL_NO_CMP */
-#endif /* !defined OSSL_HEADER_CMP_H */
+#endif /* !defined OPENSSL_CMP_H */

diff --git a/include/openssl/cmp_util.h b/include/openssl/cmp_util.h
index 5e06a3aaae9f9fc07f9caaa07b36306f8cdd2c1e..fa5cee5e0ca632f6a21e2745f0a1516f0a8ca814 100644 (file)
--- a/include/openssl/cmp_util.h
+++ b/include/openssl/cmp_util.h
@@ -9,8 +9,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef OSSL_HEADER_CMP_UTIL_H
-# define OSSL_HEADER_CMP_UTIL_H
+#ifndef OPENSSL_CMP_UTIL_H
+# define OPENSSL_CMP_UTIL_H
 
 # include <openssl/opensslconf.h>
 # ifndef OPENSSL_NO_CMP
@@ -76,4 +76,4 @@ void OSSL_CMP_print_errors_cb(OSSL_cmp_log_cb_t log_fn);
 }
 #   endif
 # endif /* !defined OPENSSL_NO_CMP */
-#endif /* !defined OSSL_HEADER_CMP_UTIL_H */
+#endif /* !defined OPENSSL_CMP_UTIL_H */

diff --git a/include/openssl/cmperr.h b/include/openssl/cmperr.h
index 18c56efbef8f7478a2cf916e7ffd96bebd7cd176..0c1ce259b62a965afed969817e15a083bd82b2e5 100644 (file)
--- a/include/openssl/cmperr.h
+++ b/include/openssl/cmperr.h
@@ -8,8 +8,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_CMPERR_H
-# define HEADER_CMPERR_H
+#ifndef OPENSSL_CMPERR_H
+# define OPENSSL_CMPERR_H
 
 # include <openssl/opensslconf.h>
 # include <openssl/symhacks.h>

diff --git a/include/openssl/cms.h b/include/openssl/cms.h
index 608b6d7cac25cfbb690caa4148dcfef480589235..5209d39ee362e3a48ab655992cb97b5a26d3a170 100644 (file)
--- a/include/openssl/cms.h
+++ b/include/openssl/cms.h
@@ -7,8 +7,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_CMS_H
-# define HEADER_CMS_H
+#ifndef OPENSSL_CMS_H
+# define OPENSSL_CMS_H
 
 # include <openssl/opensslconf.h>
 
@@ -84,7 +84,7 @@ ASN1_OCTET_STRING **CMS_get0_content(CMS_ContentInfo *cms);
 int CMS_is_detached(CMS_ContentInfo *cms);
 int CMS_set_detached(CMS_ContentInfo *cms, int detached);
 
-# ifdef HEADER_PEM_H
+# ifdef OPENSSL_PEM_H
 DECLARE_PEM_rw_const(CMS, CMS_ContentInfo)
 # endif
 int CMS_stream(unsigned char ***boundary, CMS_ContentInfo *cms);

diff --git a/include/openssl/cmserr.h b/include/openssl/cmserr.h
index fe2619557dc1ab119fe3157780d0bb00b36cb49b..472ca3d916d585fedc57c476b37f30bb386ce244 100644 (file)
--- a/include/openssl/cmserr.h
+++ b/include/openssl/cmserr.h
@@ -8,8 +8,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_CMSERR_H
-# define HEADER_CMSERR_H
+#ifndef OPENSSL_CMSERR_H
+# define OPENSSL_CMSERR_H
 
 # include <openssl/opensslconf.h>
 # include <openssl/symhacks.h>

diff --git a/include/openssl/comp.h b/include/openssl/comp.h
index 69655977e79a26fbc17db02c4c5b965df749652a..eac825f169f63670db438d2983b95e11ade9e88d 100644 (file)
--- a/include/openssl/comp.h
+++ b/include/openssl/comp.h
@@ -7,8 +7,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_COMP_H
-# define HEADER_COMP_H
+#ifndef OPENSSL_COMP_H
+# define OPENSSL_COMP_H
 
 # include <openssl/opensslconf.h>
 
@@ -39,7 +39,7 @@ COMP_METHOD *COMP_zlib(void);
 #define COMP_zlib_cleanup() while(0) continue
 #endif
 
-# ifdef HEADER_BIO_H
+# ifdef OPENSSL_BIO_H
 #  ifdef ZLIB
 const BIO_METHOD *BIO_f_zlib(void);
 #  endif

diff --git a/include/openssl/comperr.h b/include/openssl/comperr.h
index 45e14488ba5e99fa812b3d606c6db032e8202cbe..6fb872a4f80cd7279691b48e5dcc678f56cb3da0 100644 (file)
--- a/include/openssl/comperr.h
+++ b/include/openssl/comperr.h
@@ -8,8 +8,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_COMPERR_H
-# define HEADER_COMPERR_H
+#ifndef OPENSSL_COMPERR_H
+# define OPENSSL_COMPERR_H
 
 # include <openssl/opensslconf.h>
 # include <openssl/symhacks.h>

diff --git a/include/openssl/conf.h b/include/openssl/conf.h
index ed10412367f200dcf3d67c2f72d71cce917b5480..c987c428d12829b6e0923aade997227c2aeaa464 100644 (file)
--- a/include/openssl/conf.h
+++ b/include/openssl/conf.h
@@ -7,8 +7,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef  HEADER_CONF_H
-# define HEADER_CONF_H
+#ifndef  OPENSSL_CONF_H
+# define OPENSSL_CONF_H
 
 # include <openssl/bio.h>
 # include <openssl/lhash.h>

diff --git a/include/openssl/conf_api.h b/include/openssl/conf_api.h
index 312091543855902ce8296b5f85a6fe9eaac7ab15..7856ca0dcbbdaeb30a593dbb66301740ce819856 100644 (file)
--- a/include/openssl/conf_api.h
+++ b/include/openssl/conf_api.h
@@ -7,8 +7,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef  HEADER_CONF_API_H
-# define HEADER_CONF_API_H
+#ifndef  OPENSSL_CONF_API_H
+# define OPENSSL_CONF_API_H
 
 # include <openssl/lhash.h>
 # include <openssl/conf.h>

diff --git a/include/openssl/conferr.h b/include/openssl/conferr.h
index 69110cbd07ce87463961359695d183b678d47a51..848a6cef25e5f1f03034c4f5f7e69ad540dd44aa 100644 (file)
--- a/include/openssl/conferr.h
+++ b/include/openssl/conferr.h
@@ -8,8 +8,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_CONFERR_H
-# define HEADER_CONFERR_H
+#ifndef OPENSSL_CONFERR_H
+# define OPENSSL_CONFERR_H
 
 # include <openssl/opensslconf.h>
 # include <openssl/symhacks.h>

diff --git a/include/openssl/core.h b/include/openssl/core.h
index d07a2accfd7b2b1ed688df568b4b41fda6a17e40..2377169a33c1f41610b799425a2443091098eec6 100644 (file)
--- a/include/openssl/core.h
+++ b/include/openssl/core.h
@@ -7,8 +7,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef OSSL_CORE_H
-# define OSSL_CORE_H
+#ifndef OPENSSL_CORE_H
+# define OPENSSL_CORE_H
 
 # include <stddef.h>
 # include <openssl/types.h>

diff --git a/include/openssl/core_names.h b/include/openssl/core_names.h
index 8ca7577867133cbf4ed061c8c81d2fd3e42e4e1f..6656a7fb432ed95ae2251c6dd9e052ebd4c325b0 100644 (file)
--- a/include/openssl/core_names.h
+++ b/include/openssl/core_names.h
@@ -7,8 +7,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef OSSL_CORE_NAMES_H
-# define OSSL_CORE_NAMES_H
+#ifndef OPENSSL_CORE_NAMES_H
+# define OPENSSL_CORE_NAMES_H
 
 # ifdef __cplusplus
 extern "C" {

diff --git a/include/openssl/core_numbers.h b/include/openssl/core_numbers.h
index d3189a3c186d7f41cb987ffbbcad9120f8f28b78..cec38069f278bdea819c1f29c54e0e9dc421f966 100644 (file)
--- a/include/openssl/core_numbers.h
+++ b/include/openssl/core_numbers.h
@@ -7,8 +7,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef OSSL_CORE_NUMBERS_H
-# define OSSL_CORE_NUMBERS_H
+#ifndef OPENSSL_CORE_NUMBERS_H
+# define OPENSSL_CORE_NUMBERS_H
 
 # include <stdarg.h>
 # include <openssl/core.h>

diff --git a/include/openssl/crmf.h b/include/openssl/crmf.h
index 7490a1d87a8f6fbb352a684b1dc93d929d556b53..160ad326b0c665bf8d1f3f8b5961cfa16b26e577 100644 (file)
--- a/include/openssl/crmf.h
+++ b/include/openssl/crmf.h
@@ -11,8 +11,8 @@
  * CRMF (RFC 4211) implementation by M. Peylo, M. Viljanen, and D. von Oheimb.
  */
 
-#ifndef OSSL_HEADER_CRMF_H
-# define OSSL_HEADER_CRMF_H
+#ifndef OPENSSL_CRMF_H
+# define OPENSSL_CRMF_H
 
 # include <openssl/opensslconf.h>
 
@@ -136,4 +136,4 @@ X509 *OSSL_CRMF_ENCRYPTEDVALUE_get1_encCert(OSSL_CRMF_ENCRYPTEDVALUE *ecert,
 }
 #  endif
 # endif /* !defined OPENSSL_NO_CRMF */
-#endif /* !defined OSSL_HEADER_CRMF_H */
+#endif /* !defined OPENSSL_CRMF_H */

diff --git a/include/openssl/crmferr.h b/include/openssl/crmferr.h
index 59c5243454ae26bd62ee6d8cd0e82795f2b529b7..715b78c2e65a2badee74c5a957d2fea5041e4bca 100644 (file)
--- a/include/openssl/crmferr.h
+++ b/include/openssl/crmferr.h
@@ -8,8 +8,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_CRMFERR_H
-# define HEADER_CRMFERR_H
+#ifndef OPENSSL_CRMFERR_H
+# define OPENSSL_CRMFERR_H
 
 # include <openssl/opensslconf.h>
 # include <openssl/symhacks.h>

diff --git a/include/openssl/crypto.h b/include/openssl/crypto.h
index 5cdb83107e6e1b27248ff01f2af26c7aa42e3782..6e5dae89c7922cfd3a17898d349c09c130a9ac7d 100644 (file)
--- a/include/openssl/crypto.h
+++ b/include/openssl/crypto.h
@@ -8,8 +8,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_CRYPTO_H
-# define HEADER_CRYPTO_H
+#ifndef OPENSSL_CRYPTO_H
+# define OPENSSL_CRYPTO_H
 
 # include <stdlib.h>
 # include <time.h>

diff --git a/include/openssl/cryptoerr.h b/include/openssl/cryptoerr.h
index 15071e27417c4026f259543b1d67bd53ee0c0c61..497735e67e510e1355132010a0849d6558c19863 100644 (file)
--- a/include/openssl/cryptoerr.h
+++ b/include/openssl/cryptoerr.h
@@ -8,8 +8,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_CRYPTOERR_H
-# define HEADER_CRYPTOERR_H
+#ifndef OPENSSL_CRYPTOERR_H
+# define OPENSSL_CRYPTOERR_H
 
 # include <openssl/opensslconf.h>
 # include <openssl/symhacks.h>

diff --git a/include/openssl/ct.h b/include/openssl/ct.h
index 940e66c9a866757c355a32f9a1f6780542cd5006..084fd368fddca74e9ce9e524787a60c45efc0d5c 100644 (file)
--- a/include/openssl/ct.h
+++ b/include/openssl/ct.h
@@ -7,8 +7,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_CT_H
-# define HEADER_CT_H
+#ifndef OPENSSL_CT_H
+# define OPENSSL_CT_H
 
 # include <openssl/opensslconf.h>
 

diff --git a/include/openssl/cterr.h b/include/openssl/cterr.h
index 3989996968492d8c75b090f6a5e3790f3b9d5cc1..69e08a9973e8a13c04b6578f20a316697e859b2c 100644 (file)
--- a/include/openssl/cterr.h
+++ b/include/openssl/cterr.h
@@ -8,8 +8,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_CTERR_H
-# define HEADER_CTERR_H
+#ifndef OPENSSL_CTERR_H
+# define OPENSSL_CTERR_H
 
 # include <openssl/opensslconf.h>
 # include <openssl/symhacks.h>

diff --git a/include/openssl/des.h b/include/openssl/des.h
index 84b65e0096a75c604b81c232d3b23b219f70096f..c0361dd533c26ae9a33a0f2b34f1a64406fcaa27 100644 (file)
--- a/include/openssl/des.h
+++ b/include/openssl/des.h
@@ -7,8 +7,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_DES_H
-# define HEADER_DES_H
+#ifndef OPENSSL_DES_H
+# define OPENSSL_DES_H
 
 # include <openssl/opensslconf.h>
 

diff --git a/include/openssl/dh.h b/include/openssl/dh.h
index 1b9d2163fdf005d53629206d09a8602ad4cd9001..64189ed7d71dcf2225106fdf319bf0947c8fb4a8 100644 (file)
--- a/include/openssl/dh.h
+++ b/include/openssl/dh.h
@@ -7,8 +7,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_DH_H
-# define HEADER_DH_H
+#ifndef OPENSSL_DH_H
+# define OPENSSL_DH_H
 
 # include <openssl/opensslconf.h>
 

diff --git a/include/openssl/dherr.h b/include/openssl/dherr.h
index 13bd0361e0ea93135d718f115a4d2f3c14d3db16..4003f79c6209fce08f71acd3b43f8c25e5bb1ba4 100644 (file)
--- a/include/openssl/dherr.h
+++ b/include/openssl/dherr.h
@@ -8,8 +8,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_DHERR_H
-# define HEADER_DHERR_H
+#ifndef OPENSSL_DHERR_H
+# define OPENSSL_DHERR_H
 
 # include <openssl/opensslconf.h>
 # include <openssl/symhacks.h>

diff --git a/include/openssl/dsa.h b/include/openssl/dsa.h
index 32d6a7d42050ff0ca437ddd8358b9b91579928dd..c5a363588e68e729fd9e376505b5bcf73f22d9ff 100644 (file)
--- a/include/openssl/dsa.h
+++ b/include/openssl/dsa.h
@@ -7,8 +7,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_DSA_H
-# define HEADER_DSA_H
+#ifndef OPENSSL_DSA_H
+# define OPENSSL_DSA_H
 
 # include <openssl/opensslconf.h>
 

diff --git a/include/openssl/dsaerr.h b/include/openssl/dsaerr.h
index 76ef96acf7362741577cef76b005ceb0087cb1f3..3d16c09f182091d0d32086aca8a0663054605b48 100644 (file)
--- a/include/openssl/dsaerr.h
+++ b/include/openssl/dsaerr.h
@@ -8,8 +8,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_DSAERR_H
-# define HEADER_DSAERR_H
+#ifndef OPENSSL_DSAERR_H
+# define OPENSSL_DSAERR_H
 
 # include <openssl/opensslconf.h>
 # include <openssl/symhacks.h>

diff --git a/include/openssl/dtls1.h b/include/openssl/dtls1.h
index ef01d8b9db1cfb5f1b292355230791739cc1da51..b4c36313d1bf30d4f6f0dbf9f4adea558bcb2b41 100644 (file)
--- a/include/openssl/dtls1.h
+++ b/include/openssl/dtls1.h
@@ -7,8 +7,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_DTLS1_H
-# define HEADER_DTLS1_H
+#ifndef OPENSSL_DTLS1_H
+# define OPENSSL_DTLS1_H
 
 #ifdef  __cplusplus
 extern "C" {

diff --git a/include/openssl/e_os2.h b/include/openssl/e_os2.h
index b1a99f3c483c6478f0d941d438d4ae743ab18225..740cf5561ca33fb95523d7bca9d98068a16c9dab 100644 (file)
--- a/include/openssl/e_os2.h
+++ b/include/openssl/e_os2.h
@@ -7,8 +7,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_E_OS2_H
-# define HEADER_E_OS2_H
+#ifndef OPENSSL_E_OS2_H
+# define OPENSSL_E_OS2_H
 
 # include <openssl/opensslconf.h>
 

diff --git a/include/openssl/ebcdic.h b/include/openssl/ebcdic.h
index 9994928e30721033c26b5a07d7091cedef3b5b69..6805806e5fdcc9c32ba4be03668d6fdc7cf60fb0 100644 (file)
--- a/include/openssl/ebcdic.h
+++ b/include/openssl/ebcdic.h
@@ -7,8 +7,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_EBCDIC_H
-# define HEADER_EBCDIC_H
+#ifndef OPENSSL_EBCDIC_H
+# define OPENSSL_EBCDIC_H
 
 # include <stdlib.h>
 

diff --git a/include/openssl/ec.h b/include/openssl/ec.h
index 4e1af5ea33c7c38b6448ad4c4246c4f9c4c4c364..2a669285ffac0ee15ba53bfe8a13cd15fbf20629 100644 (file)
--- a/include/openssl/ec.h
+++ b/include/openssl/ec.h
@@ -8,8 +8,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_EC_H
-# define HEADER_EC_H
+#ifndef OPENSSL_EC_H
+# define OPENSSL_EC_H
 
 # include <openssl/opensslconf.h>
 

diff --git a/include/openssl/ecerr.h b/include/openssl/ecerr.h
index 50e23bb1e8773fb5df67051c4134e008525b5a42..17b418b0751666f2b35cfa59fc91c85dcd21120a 100644 (file)
--- a/include/openssl/ecerr.h
+++ b/include/openssl/ecerr.h
@@ -8,8 +8,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_ECERR_H
-# define HEADER_ECERR_H
+#ifndef OPENSSL_ECERR_H
+# define OPENSSL_ECERR_H
 
 # include <openssl/opensslconf.h>
 # include <openssl/symhacks.h>

diff --git a/include/openssl/engine.h b/include/openssl/engine.h
index 8a2b96f4e3bb0694d21ade7cb7b95d35abf2c3cd..fc294ec3e8970b5babd074a05fa1f54b763a9946 100644 (file)
--- a/include/openssl/engine.h
+++ b/include/openssl/engine.h
@@ -8,8 +8,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_ENGINE_H
-# define HEADER_ENGINE_H
+#ifndef OPENSSL_ENGINE_H
+# define OPENSSL_ENGINE_H
 
 # include <openssl/opensslconf.h>
 

diff --git a/include/openssl/engineerr.h b/include/openssl/engineerr.h
index 14188bebf32503ecd583c20556dd993ad6736055..2db61b58b9d1c45b609a5d9605aaf7a87bced802 100644 (file)
--- a/include/openssl/engineerr.h
+++ b/include/openssl/engineerr.h
@@ -8,8 +8,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_ENGINEERR_H
-# define HEADER_ENGINEERR_H
+#ifndef OPENSSL_ENGINEERR_H
+# define OPENSSL_ENGINEERR_H
 
 # include <openssl/opensslconf.h>
 # include <openssl/symhacks.h>

diff --git a/include/openssl/err.h b/include/openssl/err.h
index 6f75b3265482e60f99cab9e54fe1737a6d5f33ea..f837c3a21951f1f8d6b6d97e66f58318d3a810d8 100644 (file)
--- a/include/openssl/err.h
+++ b/include/openssl/err.h
@@ -7,8 +7,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_ERR_H
-# define HEADER_ERR_H
+#ifndef OPENSSL_ERR_H
+# define OPENSSL_ERR_H
 
 # include <openssl/e_os2.h>
 

diff --git a/include/openssl/ess.h b/include/openssl/ess.h
index f13b5395a878008e60904d6ed0dd9e05b7e5e77c..c20bf8201db946a91e30620feb7d03879c238bef 100644 (file)
--- a/include/openssl/ess.h
+++ b/include/openssl/ess.h
@@ -7,8 +7,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_ESS_H
-# define HEADER_ESS_H
+#ifndef OPENSSL_ESS_H
+# define OPENSSL_ESS_H
 
 # include <openssl/opensslconf.h>
 

diff --git a/include/openssl/esserr.h b/include/openssl/esserr.h
index 0fb676b78e70a170237bdb98071ba4f91da4c8a9..ee3041aa0b10aadadda41f13585e6dea405d79f1 100644 (file)
--- a/include/openssl/esserr.h
+++ b/include/openssl/esserr.h
@@ -8,8 +8,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_ESSERR_H
-# define HEADER_ESSERR_H
+#ifndef OPENSSL_ESSERR_H
+# define OPENSSL_ESSERR_H
 
 # include <openssl/opensslconf.h>
 # include <openssl/symhacks.h>

diff --git a/include/openssl/evp.h b/include/openssl/evp.h
index 2d9dcb765ef47000a1a49263eaf185447652acd2..857d685f155f8f2bb1e96b296c0dd00823925687 100644 (file)
--- a/include/openssl/evp.h
+++ b/include/openssl/evp.h
@@ -7,8 +7,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_ENVELOPE_H
-# define HEADER_ENVELOPE_H
+#ifndef OPENSSL_EVP_H
+# define OPENSSL_EVP_H
 
 # include <stdarg.h>
 

diff --git a/include/openssl/evperr.h b/include/openssl/evperr.h
index 64ed5a3b959517b5aa6979ffa0bdbfede739f018..b7c2a712b24b134a65d612e2853a595a8ea0106b 100644 (file)
--- a/include/openssl/evperr.h
+++ b/include/openssl/evperr.h
@@ -8,8 +8,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_EVPERR_H
-# define HEADER_EVPERR_H
+#ifndef OPENSSL_EVPERR_H
+# define OPENSSL_EVPERR_H
 
 # include <openssl/opensslconf.h>
 # include <openssl/symhacks.h>

diff --git a/include/openssl/fips_names.h b/include/openssl/fips_names.h
index 28226f5f8810a9df88ff2680429603901fe06783..aeb9670d15388def39d5d8c2841f91bcb0a126c6 100644 (file)
--- a/include/openssl/fips_names.h
+++ b/include/openssl/fips_names.h
@@ -7,8 +7,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef OSSL_FIPS_NAMES_H
-# define OSSL_FIPS_NAMES_H
+#ifndef OPENSSL_FIPS_NAMES_H
+# define OPENSSL_FIPS_NAMES_H
 
 # ifdef __cplusplus
 extern "C" {
@@ -43,4 +43,4 @@ extern "C" {
 }
 # endif
 
-#endif /* OSSL_FIPS_NAMES_H */
+#endif /* OPENSSL_FIPS_NAMES_H */

diff --git a/include/openssl/hmac.h b/include/openssl/hmac.h
index 7bf4e2305c8d4d5da170c2d4c2ef329716053038..93e6a862ef3bb4b7574dd57b9e4ba8b9229706f9 100644 (file)
--- a/include/openssl/hmac.h
+++ b/include/openssl/hmac.h
@@ -7,8 +7,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_HMAC_H
-# define HEADER_HMAC_H
+#ifndef OPENSSL_HMAC_H
+# define OPENSSL_HMAC_H
 
 # include <openssl/opensslconf.h>
 

diff --git a/include/openssl/idea.h b/include/openssl/idea.h
index fb42443b3cf5b18a74fd9bfddd873778c3b31e20..2fcee23cb104527c31ca4aeff9075bd7acd5b28d 100644 (file)
--- a/include/openssl/idea.h
+++ b/include/openssl/idea.h
@@ -7,8 +7,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_IDEA_H
-# define HEADER_IDEA_H
+#ifndef OPENSSL_IDEA_H
+# define OPENSSL_IDEA_H
 
 # include <openssl/opensslconf.h>
 

diff --git a/include/openssl/kdf.h b/include/openssl/kdf.h
index 5568c4f26889a03f93df9830f1b21e477e400283..0521f72218b930373c15c68cc77ef5a0a5cf435e 100644 (file)
--- a/include/openssl/kdf.h
+++ b/include/openssl/kdf.h
@@ -7,8 +7,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_KDF_H
-# define HEADER_KDF_H
+#ifndef OPENSSL_KDF_H
+# define OPENSSL_KDF_H
 
 # include <stdarg.h>
 # include <stddef.h>

diff --git a/include/openssl/lhash.h b/include/openssl/lhash.h
index 6144fddca5c1d44b900713a0c76cb945ad4c64d2..c7197c535afda2ef723198f2068061bef276f853 100644 (file)
--- a/include/openssl/lhash.h
+++ b/include/openssl/lhash.h
@@ -11,8 +11,8 @@
  * Header for dynamic hash table routines Author - Eric Young
  */
 
-#ifndef HEADER_LHASH_H
-# define HEADER_LHASH_H
+#ifndef OPENSSL_LHASH_H
+# define OPENSSL_LHASH_H
 
 # include <openssl/e_os2.h>
 # include <openssl/bio.h>

diff --git a/include/openssl/md2.h b/include/openssl/md2.h
index e2f4c8eef4b856c5c2bff6d0817bfbd62cfea5db..35531ffac65d4d4c7b173967d074851231302a12 100644 (file)
--- a/include/openssl/md2.h
+++ b/include/openssl/md2.h
@@ -7,8 +7,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_MD2_H
-# define HEADER_MD2_H
+#ifndef OPENSSL_MD2_H
+# define OPENSSL_MD2_H
 
 # include <openssl/opensslconf.h>
 

diff --git a/include/openssl/md4.h b/include/openssl/md4.h
index 104aeee701e2f7ad8bb90da5b896c5f805d3646b..893c4655fd32d7946c7762301cd032e1a28a4e61 100644 (file)
--- a/include/openssl/md4.h
+++ b/include/openssl/md4.h
@@ -7,8 +7,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_MD4_H
-# define HEADER_MD4_H
+#ifndef OPENSSL_MD4_H
+# define OPENSSL_MD4_H
 
 # include <openssl/opensslconf.h>
 

diff --git a/include/openssl/md5.h b/include/openssl/md5.h
index d5ade5f12b7be163bd244087e7df6ca1b51da4c8..b039055b87e9edb97df61d22448f212e4ede2f06 100644 (file)
--- a/include/openssl/md5.h
+++ b/include/openssl/md5.h
@@ -7,8 +7,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_MD5_H
-# define HEADER_MD5_H
+#ifndef OPENSSL_MD5_H
+# define OPENSSL_MD5_H
 
 # include <openssl/opensslconf.h>
 

diff --git a/include/openssl/mdc2.h b/include/openssl/mdc2.h
index 576695cf7bfd43a24e56ac73ce753775ea94bde7..e6c0c45b3a61fdf16e4c31d7ffdb4133308824fd 100644 (file)
--- a/include/openssl/mdc2.h
+++ b/include/openssl/mdc2.h
@@ -7,8 +7,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_MDC2_H
-# define HEADER_MDC2_H
+#ifndef OPENSSL_MDC2_H
+# define OPENSSL_MDC2_H
 
 # include <openssl/opensslconf.h>
 

diff --git a/include/openssl/modes.h b/include/openssl/modes.h
index 7465c71ba823448a96820b6a2b3883ecbf3e8785..6b756847f8d9fee3dd824c5aa4e6dcf69d500f78 100644 (file)
--- a/include/openssl/modes.h
+++ b/include/openssl/modes.h
@@ -7,8 +7,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_MODES_H
-# define HEADER_MODES_H
+#ifndef OPENSSL_MODES_H
+# define OPENSSL_MODES_H
 
 # include <stddef.h>
 # include <openssl/types.h>

diff --git a/include/openssl/objects.h b/include/openssl/objects.h
index 9416df23df88438f6a539817b73adc3db28c7680..3fee89549a45d9c1728638c556b0a22b63d9e933 100644 (file)
--- a/include/openssl/objects.h
+++ b/include/openssl/objects.h
@@ -7,8 +7,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_OBJECTS_H
-# define HEADER_OBJECTS_H
+#ifndef OPENSSL_OBJECTS_H
+# define OPENSSL_OBJECTS_H
 
 # include <openssl/obj_mac.h>
 # include <openssl/bio.h>

diff --git a/include/openssl/objectserr.h b/include/openssl/objectserr.h
index fac142b1e700f072aef4c9af9255bd97c4f629df..a68420008d3a96804bce1ea8a0ebbb2edf368ea1 100644 (file)
--- a/include/openssl/objectserr.h
+++ b/include/openssl/objectserr.h
@@ -8,8 +8,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_OBJERR_H
-# define HEADER_OBJERR_H
+#ifndef OPENSSL_OBJECTSERR_H
+# define OPENSSL_OBJECTSERR_H
 
 # include <openssl/opensslconf.h>
 # include <openssl/symhacks.h>

diff --git a/include/openssl/ocsp.h b/include/openssl/ocsp.h
index e427325870928e54a7d510ecbfaa9c0ba4187f8c..bb3fcfb3a1c788176f1a8d2743bd4fb324868b02 100644 (file)
--- a/include/openssl/ocsp.h
+++ b/include/openssl/ocsp.h
@@ -7,8 +7,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_OCSP_H
-# define HEADER_OCSP_H
+#ifndef OPENSSL_OCSP_H
+# define OPENSSL_OCSP_H
 
 #include <openssl/opensslconf.h>
 

diff --git a/include/openssl/ocsperr.h b/include/openssl/ocsperr.h
index 220befd4a89ad1fb2a684d54bb836af37ae7adb7..a732138731d5d588ebee9d9bdeb0ef745b7a8dc0 100644 (file)
--- a/include/openssl/ocsperr.h
+++ b/include/openssl/ocsperr.h
@@ -8,8 +8,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_OCSPERR_H
-# define HEADER_OCSPERR_H
+#ifndef OPENSSL_OCSPERR_H
+# define OPENSSL_OCSPERR_H
 
 # include <openssl/opensslconf.h>
 # include <openssl/symhacks.h>

diff --git a/include/openssl/opensslconf.h.in b/include/openssl/opensslconf.h.in
index 73bda5a81ad7e713d2814a9091241812d3bb5a6a..c3448338a2c83da3d32b65be7e84dbc452d45353 100644 (file)
--- a/include/openssl/opensslconf.h.in
+++ b/include/openssl/opensslconf.h.in
@@ -9,8 +9,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_OPENSSLCONF_H
-# define HEADER_OPENSSLCONF_H
+#ifndef OPENSSL_OPENSSLCONF_H
+# define OPENSSL_OPENSSLCONF_H
 
 # ifdef  __cplusplus
 extern "C" {
@@ -70,4 +70,4 @@ extern "C" {
 #  define HEADER_FILE_H /* deprecated in version 3.0 */
 # endif
 
-#endif                          /* HEADER_OPENSSLCONF_H */
+#endif                          /* OPENSSL_OPENSSLCONF_H */

diff --git a/include/openssl/opensslv.h b/include/openssl/opensslv.h
index 6a62b495b233ecfb33802bd7c5cf72a329c709b8..a4fb47e8a04b9d1dae6dcdbbfe49abe9dd5544bb 100644 (file)
--- a/include/openssl/opensslv.h
+++ b/include/openssl/opensslv.h
@@ -7,8 +7,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_OPENSSLV_H
-# define HEADER_OPENSSLV_H
+#ifndef OPENSSL_OPENSSLV_H
+# define OPENSSL_OPENSSLV_H
 
 # ifdef  __cplusplus
 extern "C" {
@@ -136,4 +136,4 @@ const char *OPENSSL_version_build_metadata(void);
 # ifdef  __cplusplus
 }
 # endif
-#endif                          /* HEADER_OPENSSLV_H */
+#endif                          /* OPENSSL_OPENSSLV_H */

diff --git a/include/openssl/params.h b/include/openssl/params.h
index 8293ee2cf03b8b0ea0b32d92eefcc74b6aa7ae7a..aec3bc18b8064d6feac72ad307a2f0eea5f0ad6e 100644 (file)
--- a/include/openssl/params.h
+++ b/include/openssl/params.h
@@ -8,8 +8,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_PARAMS_H
-# define HEADER_PARAMS_H
+#ifndef OPENSSL_PARAMS_H
+# define OPENSSL_PARAMS_H
 
 # include <openssl/core.h>
 # include <openssl/bn.h>

diff --git a/include/openssl/pem.h b/include/openssl/pem.h
index 8f6e6a2ce578c618700b95fe83f62a3f0f341bc1..d6e8dcae06c9b9c36e7dd8c951cffe6a557b4761 100644 (file)
--- a/include/openssl/pem.h
+++ b/include/openssl/pem.h
@@ -7,8 +7,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_PEM_H
-# define HEADER_PEM_H
+#ifndef OPENSSL_PEM_H
+# define OPENSSL_PEM_H
 
 # include <openssl/e_os2.h>
 # include <openssl/bio.h>

diff --git a/include/openssl/pem2.h b/include/openssl/pem2.h
index fea32df747ca2c3354a0a2a2ffb1fb3750d5d2b1..c5d4b355a2cd2fedf17584889ad9c670461b9b46 100644 (file)
--- a/include/openssl/pem2.h
+++ b/include/openssl/pem2.h
@@ -7,7 +7,7 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_PEM2_H
-# define HEADER_PEM2_H
+#ifndef OPENSSL_PEM2_H
+# define OPENSSL_PEM2_H
 # include <openssl/pemerr.h>
 #endif

diff --git a/include/openssl/pemerr.h b/include/openssl/pemerr.h
index 7f2d6e7a8935cc943a786802372d1b49a3a8c798..1ca4ceac6681e59a7e1c41b6cf0f60d137aa7766 100644 (file)
--- a/include/openssl/pemerr.h
+++ b/include/openssl/pemerr.h
@@ -8,8 +8,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_PEMERR_H
-# define HEADER_PEMERR_H
+#ifndef OPENSSL_PEMERR_H
+# define OPENSSL_PEMERR_H
 
 # include <openssl/opensslconf.h>
 # include <openssl/symhacks.h>

diff --git a/include/openssl/pkcs12.h b/include/openssl/pkcs12.h
index 83caaeed7db65e18c30dade921fd21be6ebb0a40..931067253ceecd17e47910d3ae10050af9b2b0f8 100644 (file)
--- a/include/openssl/pkcs12.h
+++ b/include/openssl/pkcs12.h
@@ -7,8 +7,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_PKCS12_H
-# define HEADER_PKCS12_H
+#ifndef OPENSSL_PKCS12_H
+# define OPENSSL_PKCS12_H
 
 # include <openssl/bio.h>
 # include <openssl/x509.h>

diff --git a/include/openssl/pkcs12err.h b/include/openssl/pkcs12err.h
index c599700162cb351c9cd3257c7dc120a0b67783b7..e08a44b8c5d934cb3c5fcde0eeb14f5e57825ee5 100644 (file)
--- a/include/openssl/pkcs12err.h
+++ b/include/openssl/pkcs12err.h
@@ -8,8 +8,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_PKCS12ERR_H
-# define HEADER_PKCS12ERR_H
+#ifndef OPENSSL_PKCS12ERR_H
+# define OPENSSL_PKCS12ERR_H
 
 # include <openssl/opensslconf.h>
 # include <openssl/symhacks.h>

diff --git a/include/openssl/pkcs7.h b/include/openssl/pkcs7.h
index 682c3404c4a2e9025ee4b1ef583532e0886376fd..f5b2e086b9e376e559bcad012a3d2dafbe20e269 100644 (file)
--- a/include/openssl/pkcs7.h
+++ b/include/openssl/pkcs7.h
@@ -7,8 +7,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_PKCS7_H
-# define HEADER_PKCS7_H
+#ifndef OPENSSL_PKCS7_H
+# define OPENSSL_PKCS7_H
 
 # include <openssl/asn1.h>
 # include <openssl/bio.h>

diff --git a/include/openssl/pkcs7err.h b/include/openssl/pkcs7err.h
index 01d9dc22fac079cbf5aa60a1e392a0496f0edbc7..24bff6d1ea74f1ac92e4e9b88ad453275413488e 100644 (file)
--- a/include/openssl/pkcs7err.h
+++ b/include/openssl/pkcs7err.h
@@ -8,8 +8,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_PKCS7ERR_H
-# define HEADER_PKCS7ERR_H
+#ifndef OPENSSL_PKCS7ERR_H
+# define OPENSSL_PKCS7ERR_H
 
 # include <openssl/opensslconf.h>
 # include <openssl/symhacks.h>

diff --git a/include/openssl/provider.h b/include/openssl/provider.h
index db8e714393746ae99fff1034be3682d89a9d5281..86dabf42ce7c21f795acd2c025e42fb1d85af710 100644 (file)
--- a/include/openssl/provider.h
+++ b/include/openssl/provider.h
@@ -7,8 +7,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef OSSL_PROVIDER_H
-# define OSSL_PROVIDER_H
+#ifndef OPENSSL_PROVIDER_H
+# define OPENSSL_PROVIDER_H
 
 # include <openssl/core.h>
 

diff --git a/include/openssl/rand.h b/include/openssl/rand.h
index 05ea8a7f8e55de8cf845ec56593011870bc3a388..e2cf49f97fa11aac11259265bb556cef290c4067 100644 (file)
--- a/include/openssl/rand.h
+++ b/include/openssl/rand.h
@@ -7,8 +7,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_RAND_H
-# define HEADER_RAND_H
+#ifndef OPENSSL_RAND_H
+# define OPENSSL_RAND_H
 
 # include <stdlib.h>
 # include <openssl/types.h>

diff --git a/include/openssl/rand_drbg.h b/include/openssl/rand_drbg.h
index 984c40df91e5531b79dcd59d50138adebff82132..b557670b8a5ab3c03cd46c062ced1163267c918d 100644 (file)
--- a/include/openssl/rand_drbg.h
+++ b/include/openssl/rand_drbg.h
@@ -7,8 +7,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_DRBG_RAND_H
-# define HEADER_DRBG_RAND_H
+#ifndef OPENSSL_RAND_DRBG_H
+# define OPENSSL_RAND_DRBG_H
 
 # include <time.h>
 # include <openssl/types.h>

diff --git a/include/openssl/randerr.h b/include/openssl/randerr.h
index cd7ae667bbf86c6073204f9ed703d500b77dc2a9..74fac69b2d4c5cfaf07cca25d8aa66f139a7a57f 100644 (file)
--- a/include/openssl/randerr.h
+++ b/include/openssl/randerr.h
@@ -8,8 +8,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_RANDERR_H
-# define HEADER_RANDERR_H
+#ifndef OPENSSL_RANDERR_H
+# define OPENSSL_RANDERR_H
 
 # include <openssl/opensslconf.h>
 # include <openssl/symhacks.h>

diff --git a/include/openssl/rc2.h b/include/openssl/rc2.h
index 0693db66b00d4c2f1c17b04829b8de5daa213b0f..909e5b0d5bddfaf10c9727e059854901a1d292e8 100644 (file)
--- a/include/openssl/rc2.h
+++ b/include/openssl/rc2.h
@@ -7,8 +7,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_RC2_H
-# define HEADER_RC2_H
+#ifndef OPENSSL_RC2_H
+# define OPENSSL_RC2_H
 
 # include <openssl/opensslconf.h>
 

diff --git a/include/openssl/rc4.h b/include/openssl/rc4.h
index 95da746c85a8965e2530e1519c92faa0df58d8d0..37509b9ffce20694a77193a38c4a62716babfad3 100644 (file)
--- a/include/openssl/rc4.h
+++ b/include/openssl/rc4.h
@@ -7,8 +7,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_RC4_H
-# define HEADER_RC4_H
+#ifndef OPENSSL_RC4_H
+# define OPENSSL_RC4_H
 
 # include <openssl/opensslconf.h>
 

diff --git a/include/openssl/rc5.h b/include/openssl/rc5.h
index 97e22f7ac9c1d88009ef840f1622a5d841a66541..9550df975eab34dd63a3efd6b0c52b70c72ca818 100644 (file)
--- a/include/openssl/rc5.h
+++ b/include/openssl/rc5.h
@@ -7,8 +7,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_RC5_H
-# define HEADER_RC5_H
+#ifndef OPENSSL_RC5_H
+# define OPENSSL_RC5_H
 
 # include <openssl/opensslconf.h>
 

diff --git a/include/openssl/ripemd.h b/include/openssl/ripemd.h
index ef334ffb7726719f01160acf4482afd5a354d4b5..dfd2ec1b425a517758d9870813ac552c60a9d3bc 100644 (file)
--- a/include/openssl/ripemd.h
+++ b/include/openssl/ripemd.h
@@ -7,8 +7,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_RIPEMD_H
-# define HEADER_RIPEMD_H
+#ifndef OPENSSL_RIPEMD_H
+# define OPENSSL_RIPEMD_H
 
 # include <openssl/opensslconf.h>
 

diff --git a/include/openssl/rsa.h b/include/openssl/rsa.h
index 8750e19ab92be942fef0a450a56afccc90710f13..302596c30de86ae5859a38b2107e60aa11d10963 100644 (file)
--- a/include/openssl/rsa.h
+++ b/include/openssl/rsa.h
@@ -7,8 +7,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_RSA_H
-# define HEADER_RSA_H
+#ifndef OPENSSL_RSA_H
+# define OPENSSL_RSA_H
 
 # include <openssl/opensslconf.h>
 

diff --git a/include/openssl/rsaerr.h b/include/openssl/rsaerr.h
index da092fb02f422791db62fec078e793182f3bcbbd..d4491866fe0f52c6ebb2d5aa5f6ac5aed1dc959c 100644 (file)
--- a/include/openssl/rsaerr.h
+++ b/include/openssl/rsaerr.h
@@ -8,8 +8,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_RSAERR_H
-# define HEADER_RSAERR_H
+#ifndef OPENSSL_RSAERR_H
+# define OPENSSL_RSAERR_H
 
 # include <openssl/opensslconf.h>
 # include <openssl/symhacks.h>

diff --git a/include/openssl/safestack.h b/include/openssl/safestack.h
index 1fbe6cbd9544202a4bf6ab9f977f8128a66cb0c9..520f2b4c479704552e191c585aef124bb3f6101f 100644 (file)
--- a/include/openssl/safestack.h
+++ b/include/openssl/safestack.h
@@ -7,8 +7,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_SAFESTACK_H
-# define HEADER_SAFESTACK_H
+#ifndef OPENSSL_SAFESTACK_H
+# define OPENSSL_SAFESTACK_H
 
 # include <openssl/stack.h>
 # include <openssl/e_os2.h>

diff --git a/include/openssl/seed.h b/include/openssl/seed.h
index 6ef0e8057c055d36a064ba82d322386f19f3480f..795c9158dea4dcd39d1a7d3f7e613f91d04c6195 100644 (file)
--- a/include/openssl/seed.h
+++ b/include/openssl/seed.h
@@ -32,8 +32,8 @@
  * SUCH DAMAGE.
  */
 
-#ifndef HEADER_SEED_H
-# define HEADER_SEED_H
+#ifndef OPENSSL_SEED_H
+# define OPENSSL_SEED_H
 
 # include <openssl/opensslconf.h>
 

diff --git a/include/openssl/sha.h b/include/openssl/sha.h
index 1d55845a4d821b83f59a0991ab5e9ff90b284370..94487133344a0f218a896260459486c0c72d9577 100644 (file)
--- a/include/openssl/sha.h
+++ b/include/openssl/sha.h
@@ -7,8 +7,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_SHA_H
-# define HEADER_SHA_H
+#ifndef OPENSSL_SHA_H
+# define OPENSSL_SHA_H
 
 # include <openssl/e_os2.h>
 # include <stddef.h>

diff --git a/include/openssl/srp.h b/include/openssl/srp.h
index 8da92ca2589aacc82e63ae7c3e111dc4643bda3f..e65ec36c90a752421f4bb3f25fbfea254fa48cf0 100644 (file)
--- a/include/openssl/srp.h
+++ b/include/openssl/srp.h
@@ -11,8 +11,8 @@
  * for the EdelKey project.
  */
 
-#ifndef HEADER_SRP_H
-# define HEADER_SRP_H
+#ifndef OPENSSL_SRP_H
+# define OPENSSL_SRP_H
 
 #include <openssl/opensslconf.h>
 

diff --git a/include/openssl/srtp.h b/include/openssl/srtp.h
index 2a00d08879b6631c13e5f984bd849fb12caccbb1..fbc64879015d901a59381435a39e80caef3dd718 100644 (file)
--- a/include/openssl/srtp.h
+++ b/include/openssl/srtp.h
@@ -13,8 +13,8 @@
  * Copyright (C) 2006, Network Resonance, Inc. Copyright (C) 2011, RTFM, Inc.
  */
 
-#ifndef HEADER_D1_SRTP_H
-# define HEADER_D1_SRTP_H
+#ifndef OPENSSL_SRTP_H
+# define OPENSSL_SRTP_H
 
 # include <openssl/ssl.h>
 

diff --git a/include/openssl/ssl.h b/include/openssl/ssl.h
index 93f6bbc8f830bdef30b874e04d8030ccb8720741..7783f9482c151ff49fcb7f8d9bcd541aac36d408 100644 (file)
--- a/include/openssl/ssl.h
+++ b/include/openssl/ssl.h
@@ -9,8 +9,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_SSL_H
-# define HEADER_SSL_H
+#ifndef OPENSSL_SSL_H
+# define OPENSSL_SSL_H
 
 # include <openssl/e_os2.h>
 # include <openssl/opensslconf.h>
@@ -1690,7 +1690,7 @@ __owur int SSL_has_matching_session_id(const SSL *s,
 SSL_SESSION *d2i_SSL_SESSION(SSL_SESSION **a, const unsigned char **pp,
                              long length);
 
-# ifdef HEADER_X509_H
+# ifdef OPENSSL_X509_H
 __owur X509 *SSL_get_peer_certificate(const SSL *s);
 # endif
 

diff --git a/include/openssl/ssl2.h b/include/openssl/ssl2.h
index ed70be58f67ecac7e0e94f0d6ef9bcf418af0663..41aad9ae5d519152845e1f347653dd726855b527 100644 (file)
--- a/include/openssl/ssl2.h
+++ b/include/openssl/ssl2.h
@@ -7,8 +7,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_SSL2_H
-# define HEADER_SSL2_H
+#ifndef OPENSSL_SSL2_H
+# define OPENSSL_SSL2_H
 
 #ifdef  __cplusplus
 extern "C" {

diff --git a/include/openssl/ssl3.h b/include/openssl/ssl3.h
index cf0b51ddb5c4ac4c68af59f53ffd079bc483f6f1..b89c91176ceb366c189f4c76d81d4d06148aaf4e 100644 (file)
--- a/include/openssl/ssl3.h
+++ b/include/openssl/ssl3.h
@@ -8,8 +8,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_SSL3_H
-# define HEADER_SSL3_H
+#ifndef OPENSSL_SSL3_H
+# define OPENSSL_SSL3_H
 
 # include <openssl/comp.h>
 # include <openssl/buffer.h>

diff --git a/include/openssl/sslerr.h b/include/openssl/sslerr.h
index d8d3cea5d8ef923a77d13ff76b157e2d2f72a311..ad5cd561f558f1afc083eebf90c0817ad3fd5ce9 100644 (file)
--- a/include/openssl/sslerr.h
+++ b/include/openssl/sslerr.h
@@ -8,8 +8,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_SSLERR_H
-# define HEADER_SSLERR_H
+#ifndef OPENSSL_SSLERR_H
+# define OPENSSL_SSLERR_H
 
 # include <openssl/opensslconf.h>
 # include <openssl/symhacks.h>

diff --git a/include/openssl/stack.h b/include/openssl/stack.h
index 638b3afc88200660fa79c9a62ecff46cc3af23ae..8683e53b48cf390fc278fd1c067a15f24b8aafbf 100644 (file)
--- a/include/openssl/stack.h
+++ b/include/openssl/stack.h
@@ -7,8 +7,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_STACK_H
-# define HEADER_STACK_H
+#ifndef OPENSSL_STACK_H
+# define OPENSSL_STACK_H
 
 #ifdef  __cplusplus
 extern "C" {

diff --git a/include/openssl/store.h b/include/openssl/store.h
index 0d750351dac7d09d973e07c9d356d89cf931dd4b..affa16a0b1cf0902ed25a9f2ccc7d2b64cff2c41 100644 (file)
--- a/include/openssl/store.h
+++ b/include/openssl/store.h
@@ -7,8 +7,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_OSSL_STORE_H
-# define HEADER_OSSL_STORE_H
+#ifndef OPENSSL_STORE_H
+# define OPENSSL_STORE_H
 
 # include <stdarg.h>
 # include <openssl/types.h>

diff --git a/include/openssl/storeerr.h b/include/openssl/storeerr.h
index 192a240899f07b39e6958459ce87c378c80a457e..940beeec68ddd0dc19c791c49c3349c0e80c7a60 100644 (file)
--- a/include/openssl/storeerr.h
+++ b/include/openssl/storeerr.h
@@ -8,8 +8,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_OSSL_STOREERR_H
-# define HEADER_OSSL_STOREERR_H
+#ifndef OPENSSL_STOREERR_H
+# define OPENSSL_STOREERR_H
 
 # include <openssl/opensslconf.h>
 # include <openssl/symhacks.h>

diff --git a/include/openssl/symhacks.h b/include/openssl/symhacks.h
index 046c2a402a05d4161f75a9e5d3666c030ce9742f..6a477b4adaf9920854963caccbb89854b9f4a28c 100644 (file)
--- a/include/openssl/symhacks.h
+++ b/include/openssl/symhacks.h
@@ -7,8 +7,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_SYMHACKS_H
-# define HEADER_SYMHACKS_H
+#ifndef OPENSSL_SYMHACKS_H
+# define OPENSSL_SYMHACKS_H
 
 # include <openssl/e_os2.h>
 

diff --git a/include/openssl/tls1.h b/include/openssl/tls1.h
index f587f2a4887db5d8813cd6b574bc1a63b4424ee2..85871aed9ce25c94cc89d97244c6d102b8ca41f1 100644 (file)
--- a/include/openssl/tls1.h
+++ b/include/openssl/tls1.h
@@ -9,8 +9,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_TLS1_H
-# define HEADER_TLS1_H
+#ifndef OPENSSL_TLS1_H
+# define OPENSSL_TLS1_H
 
 # include <openssl/buffer.h>
 # include <openssl/x509.h>

diff --git a/include/openssl/trace.h b/include/openssl/trace.h
index cc1888b579baf9733fa59f82774e8d4159936076..31e6fcc3f5f33ef524a47fab0d5afa3adb56c2cd 100644 (file)
--- a/include/openssl/trace.h
+++ b/include/openssl/trace.h
@@ -7,8 +7,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef OSSL_TRACE_H
-# define OSSL_TRACE_H
+#ifndef OPENSSL_TRACE_H
+# define OPENSSL_TRACE_H
 
 # include <stdarg.h>
 

diff --git a/include/openssl/ts.h b/include/openssl/ts.h
index 3165a786e22aa59558322b8a85474dbdf30bc136..4af1feb52dacc25d30bb7c7ce4120fcca273c41c 100644 (file)
--- a/include/openssl/ts.h
+++ b/include/openssl/ts.h
@@ -7,8 +7,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_TS_H
-# define HEADER_TS_H
+#ifndef OPENSSL_TS_H
+# define OPENSSL_TS_H
 
 # include <openssl/opensslconf.h>
 

diff --git a/include/openssl/tserr.h b/include/openssl/tserr.h
index b15c7cfa38d822c50e927d4c341b0f13422f7ff2..8846343aecd2219a0a5ab1174a2aa6ba77dc66e1 100644 (file)
--- a/include/openssl/tserr.h
+++ b/include/openssl/tserr.h
@@ -8,8 +8,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_TSERR_H
-# define HEADER_TSERR_H
+#ifndef OPENSSL_TSERR_H
+# define OPENSSL_TSERR_H
 
 # include <openssl/opensslconf.h>
 # include <openssl/symhacks.h>

diff --git a/include/openssl/txt_db.h b/include/openssl/txt_db.h
index 34fb0d5ddbc877d23821767995c17b9e3ddddd82..39d4a3a48755244e98841c1fa7c067d3eff44d66 100644 (file)
--- a/include/openssl/txt_db.h
+++ b/include/openssl/txt_db.h
@@ -7,8 +7,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_TXT_DB_H
-# define HEADER_TXT_DB_H
+#ifndef OPENSSL_TXT_DB_H
+# define OPENSSL_TXT_DB_H
 
 # include <openssl/opensslconf.h>
 # include <openssl/bio.h>

diff --git a/include/openssl/types.h b/include/openssl/types.h
index 70d9144ba1aab5ca7e99a7f40a77a961fde0be7a..73bf88d92d7666c1b975f543c48d3404f774e655 100644 (file)
--- a/include/openssl/types.h
+++ b/include/openssl/types.h
@@ -7,8 +7,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_OPENSSL_TYPES_H
-# define HEADER_OPENSSL_TYPES_H
+#ifndef OPENSSL_TYPES_H
+# define OPENSSL_TYPES_H
 
 #include <limits.h>
 
@@ -215,4 +215,4 @@ typedef unsigned long ossl_uintmax_t;
 #ifdef  __cplusplus
 }
 #endif
-#endif                          /* def HEADER_OPENSSL_TYPES_H */
+#endif                          /* def OPENSSL_TYPES_H */

diff --git a/include/openssl/ui.h b/include/openssl/ui.h
index 5901d232084e2d334b236de0d78231776bc77488..23e27bc0532c2aeda94fd087ab794561072cc120 100644 (file)
--- a/include/openssl/ui.h
+++ b/include/openssl/ui.h
@@ -7,8 +7,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_UI_H
-# define HEADER_UI_H
+#ifndef OPENSSL_UI_H
+# define OPENSSL_UI_H
 
 # include <openssl/opensslconf.h>
 

diff --git a/include/openssl/uierr.h b/include/openssl/uierr.h
index b3f7871995e21b024d5aed6eec2e31486881e4f9..55340de8991cec7813690343387dbd9c1e90a478 100644 (file)
--- a/include/openssl/uierr.h
+++ b/include/openssl/uierr.h
@@ -8,8 +8,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_UIERR_H
-# define HEADER_UIERR_H
+#ifndef OPENSSL_UIERR_H
+# define OPENSSL_UIERR_H
 
 # include <openssl/opensslconf.h>
 # include <openssl/symhacks.h>

diff --git a/include/openssl/whrlpool.h b/include/openssl/whrlpool.h
index a0b4d9d8572913d26b550e665ecdd576973414bc..84bdabf9d4e73b33ebcb5002ef1be2fe256c6dc7 100644 (file)
--- a/include/openssl/whrlpool.h
+++ b/include/openssl/whrlpool.h
@@ -7,8 +7,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_WHRLPOOL_H
-# define HEADER_WHRLPOOL_H
+#ifndef OPENSSL_WHRLPOOL_H
+# define OPENSSL_WHRLPOOL_H
 
 #include <openssl/opensslconf.h>
 

diff --git a/include/openssl/x509.h b/include/openssl/x509.h
index 89ec365c6a0ca9ba50fbafecb68b8e90da38620a..1b0278fd67fa445bb642a8ac58b17ba43e984b3e 100644 (file)
--- a/include/openssl/x509.h
+++ b/include/openssl/x509.h
@@ -8,8 +8,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_X509_H
-# define HEADER_X509_H
+#ifndef OPENSSL_X509_H
+# define OPENSSL_X509_H
 
 # include <openssl/e_os2.h>
 # include <openssl/types.h>

diff --git a/include/openssl/x509_vfy.h b/include/openssl/x509_vfy.h
index e9a70f57f73493083b86756d4f7a3f83fbcd064a..81b50521d185e9195512fd3d029c57562843481c 100644 (file)
--- a/include/openssl/x509_vfy.h
+++ b/include/openssl/x509_vfy.h
@@ -7,13 +7,13 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_X509_VFY_H
-# define HEADER_X509_VFY_H
+#ifndef OPENSSL_X509_VFY_H
+# define OPENSSL_X509_VFY_H
 
 /*
  * Protect against recursion, x509.h and x509_vfy.h each include the other.
  */
-# ifndef HEADER_X509_H
+# ifndef OPENSSL_X509_H
 #  include <openssl/x509.h>
 # endif
 

diff --git a/include/openssl/x509err.h b/include/openssl/x509err.h
index 2a237dd6a406fdc4adae8522ad27591fb632a9cf..e28caa297ec32744dd6fe0a7810f3292d74ecd87 100644 (file)
--- a/include/openssl/x509err.h
+++ b/include/openssl/x509err.h
@@ -8,8 +8,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_X509ERR_H
-# define HEADER_X509ERR_H
+#ifndef OPENSSL_X509ERR_H
+# define OPENSSL_X509ERR_H
 
 # include <openssl/opensslconf.h>
 # include <openssl/symhacks.h>

diff --git a/include/openssl/x509v3.h b/include/openssl/x509v3.h
index bd60fcc8b71fe81aa1576e190154cc3b7a9843a1..e276f1d2f5b630f7e3302877ad7d4d382d86d047 100644 (file)
--- a/include/openssl/x509v3.h
+++ b/include/openssl/x509v3.h
@@ -7,8 +7,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_X509V3_H
-# define HEADER_X509V3_H
+#ifndef OPENSSL_X509V3_H
+# define OPENSSL_X509V3_H
 
 # include <openssl/bio.h>
 # include <openssl/x509.h>
@@ -550,7 +550,7 @@ GENERAL_NAME *a2i_GENERAL_NAME(GENERAL_NAME *out,
                                X509V3_CTX *ctx, int gen_type,
                                const char *value, int is_nc);
 
-# ifdef HEADER_CONF_H
+# ifdef OPENSSL_CONF_H
 GENERAL_NAME *v2i_GENERAL_NAME(const X509V3_EXT_METHOD *method,
                                X509V3_CTX *ctx, CONF_VALUE *cnf);
 GENERAL_NAME *v2i_GENERAL_NAME_ex(GENERAL_NAME *out,

diff --git a/include/openssl/x509v3err.h b/include/openssl/x509v3err.h
index 4ccc76b171f5fb23e991d2951f57382ba3a3f026..74e59540b96a1a5411a40345fe4da16f8626acfa 100644 (file)
--- a/include/openssl/x509v3err.h
+++ b/include/openssl/x509v3err.h
@@ -8,8 +8,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_X509V3ERR_H
-# define HEADER_X509V3ERR_H
+#ifndef OPENSSL_X509V3ERR_H
+# define OPENSSL_X509V3ERR_H
 
 # include <openssl/opensslconf.h>
 # include <openssl/symhacks.h>

diff --git a/providers/common/include/internal/digestcommon.h b/providers/common/include/internal/digestcommon.h
index 88caccf7cdb23981a1b9eba0dfc2d96091be1caf..868cbbf79f0f69681f2b577a039472d3f1da8d45 100644 (file)
--- a/providers/common/include/internal/digestcommon.h
+++ b/providers/common/include/internal/digestcommon.h
@@ -7,8 +7,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef OSSL_DIGESTCOMMON_H
-# define OSSL_DIGESTCOMMON_H
+#ifndef OSSL_PROVIDERS_DIGESTCOMMON_H
+# define OSSL_PROVIDERS_DIGESTCOMMON_H
 
 # include <openssl/core_numbers.h>
 # include <openssl/core_names.h>
@@ -100,4 +100,4 @@ int digest_default_get_params(OSSL_PARAM params[], size_t blksz, size_t paramsz,
 }
 # endif
 
-#endif /* OSSL_DIGESTCOMMON_H */
+#endif /* OSSL_PROVIDERS_DIGESTCOMMON_H */

diff --git a/providers/common/include/internal/providercommonerr.h b/providers/common/include/internal/providercommonerr.h
index a9f79762b5aaa504edbb9347a0d690e217200711..5ce5f32e7d7c7d5eea46ec5a6778f971a7370d5d 100644 (file)
--- a/providers/common/include/internal/providercommonerr.h
+++ b/providers/common/include/internal/providercommonerr.h
@@ -8,8 +8,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_PROVERR_H
-# define HEADER_PROVERR_H
+#ifndef OSSL_PROVIDERS_PROVIDERCOMMONERR_H
+# define OSSL_PROVIDERS_PROVIDERCOMMONERR_H
 
 # include <openssl/opensslconf.h>
 # include <openssl/symhacks.h>

diff --git a/providers/default/include/internal/blake2.h b/providers/default/include/internal/blake2.h
index 1c2808bacc2c5347093f2bb3da6ef636fcd4df9e..895cfb87f08f6194014994cec696b51ca11c145e 100644 (file)
--- a/providers/default/include/internal/blake2.h
+++ b/providers/default/include/internal/blake2.h
@@ -8,8 +8,8 @@
  */
 
 /* TODO(3.0) Move this header into provider when dependencies are removed */
-#ifndef HEADER_BLAKE2_H
-# define HEADER_BLAKE2_H
+#ifndef OSSL_PROVIDERS_DEFAULT_INCLUDE_INTERNAL_BLAKE2_H
+# define OSSL_PROVIDERS_DEFAULT_INCLUDE_INTERNAL_BLAKE2_H
 
 # include <openssl/opensslconf.h>
 
@@ -113,4 +113,4 @@ void blake2s_param_set_key_length(BLAKE2S_PARAM *P, uint8_t keylen);
 void blake2s_param_set_personal(BLAKE2S_PARAM *P, const uint8_t *personal, size_t length);
 void blake2s_param_set_salt(BLAKE2S_PARAM *P, const uint8_t *salt, size_t length);
 
-#endif /* HEADER_BLAKE2_H */
+#endif /* OSSL_PROVIDERS_DEFAULT_INCLUDE_INTERNAL_BLAKE2_H */

diff --git a/ssl/ssl_local.h b/ssl/ssl_local.h
index b66979b4dad0eabb023f18dabae2712250bd8800..c6f0af7922487358664b5a919a6d088ba330af7f 100644 (file)
--- a/ssl/ssl_local.h
+++ b/ssl/ssl_local.h
@@ -9,8 +9,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_SSL_LOCL_H
-# define HEADER_SSL_LOCL_H
+#ifndef OSSL_SSL_LOCAL_H
+# define OSSL_SSL_LOCAL_H
 
 # include "e_os.h"              /* struct timeval for DTLS */
 # include <stdlib.h>

diff --git a/test/cmp_testlib.h b/test/cmp_testlib.h
index 462ec399671f5bd70cb47a177f4fd428c65b0f7f..22b96bf1133c08afd41cdbcac4938c663c52f1b9 100644 (file)
--- a/test/cmp_testlib.h
+++ b/test/cmp_testlib.h
@@ -9,8 +9,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_CMP_TEST_LIB_H
-# define HEADER_CMP_TEST_LIB_H
+#ifndef OSSL_TEST_CMP_TESTLIB_H
+# define OSSL_TEST_CMP_TESTLIB_H
 
 # include <openssl/cmp.h>
 # include <openssl/pem.h>
@@ -31,4 +31,4 @@ int STACK_OF_X509_cmp(const STACK_OF(X509) *sk1, const STACK_OF(X509) *sk2);
 int STACK_OF_X509_push1(STACK_OF(X509) *sk, X509 *cert);
 # endif
 
-#endif /* HEADER_CMP_TEST_LIB_H */
+#endif /* OSSL_TEST_CMP_TESTLIB_H */

diff --git a/test/drbg_cavs_data.h b/test/drbg_cavs_data.h
index 1a83b64f066417c215de805ea25790a47cda8ba0..f37af3a2a89cbd8cf8e34658f994e05c126c5ead 100644 (file)
--- 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 216e66e277e7c791fc7c777630b5cdf083974ff9..63fe31902582f79f6ea818fa0cbeb35b64574c85 100644 (file)
--- 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 9d0427486902191d6955303afe4cd1d8447dbf1d..f0ae5a8d7e1a8340e478a675dc4b02ccf48dfd65 100644 (file)
--- 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 d1b0462e65b2b681dd511ba452714de15b4605cd..0d3b0ebc6e96411f5e410c58d56e38b96c2f2694 100644 (file)
--- 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 464d910aa28560626b5619e62a6ad309def873e4..92e3648e1cc8210a8019d2592ec27c48d57b0105 100644 (file)
--- 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 e46d9dcb33d09a2b9ad8e52e78184710674810a5..27678bd7e627d0bca3e505f2c75fbde2456379be 100644 (file)
--- 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 87b540d495ddf6cbe7ec0dd24f3bf54529b0ac5d..83677df52b90177348ca012e6cbecd98fb9e75d5 100644 (file)
--- 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/ossl_test_endian.h b/test/ossl_test_endian.h
index 0bcec047e6f7f5d79bfa1e394ce1fc8d25fd0811..38711d0d7607be41a873c13d54459a3509186336 100644 (file)
--- a/test/ossl_test_endian.h
+++ b/test/ossl_test_endian.h
@@ -7,8 +7,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_INTERNAL_ENDIAN_H
-# define HEADER_INTERNAL_ENDIAN_H
+#ifndef OSSL_TEST_OSSL_TEST_ENDIAN_H
+# define OSSL_TEST_OSSL_TEST_ENDIAN_H
 
 # define DECLARE_IS_ENDIAN \
     const union { \

diff --git a/test/ssl_test_ctx.h b/test/ssl_test_ctx.h
index 3a21ac52d9992837eb40ca0fab4363fdf1c9662f..29a989abc81147eb25956e57fbdf8ca4ddd4e55f 100644 (file)
--- 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 32d3bfb3f67a4db4da68f44179d9ecd4ab0eede9..a45aaf81de65762bae73075eab201e512d00f609 100644 (file)
--- 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>
 
@@ -56,4 +56,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 f7d00dc813998fd76affaae0931c8d118aaf1026..57ab15356c1ce22ea4959a59f06c3e2206f42a2f 100644 (file)
--- 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>
 
@@ -548,4 +548,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 e637c7bd4b162b2207c2194fe2037afcea3f5a15..def76af151df5347ea2aa4589a00680e81dfc5d0 100644 (file)
--- 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>
 
@@ -53,4 +53,4 @@ int test_printf_stderr(const char *fmt, ...)
 # undef ossl_test__printf__
 # undef ossl_test__attr__
 
-#endif                          /* HEADER_TU_OUTPUT_H */
+#endif                          /* OSSL_TESTUTIL_OUTPUT_H */

diff --git a/util/mkerr.pl b/util/mkerr.pl
index c2888890cd30517424e4c413e10fb0c6aaa50efc..c8ec94d288ac6f016af09bbc0d80581b782cd995 100755 (executable)
--- a/util/mkerr.pl
+++ b/util/mkerr.pl
@@ -447,8 +447,8 @@ foreach my $lib ( keys %errorfile ) {
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_${lib}ERR_H
-# define HEADER_${lib}ERR_H
+#ifndef OPENSSL_${lib}ERR_H
+# define OPENSSL_${lib}ERR_H
 
 # include <openssl/opensslconf.h>
 # include <openssl/symhacks.h>