From ae4186b00487762f581b2276ba83e5214e0e7ee1 Mon Sep 17 00:00:00 2001 From: "Dr. Matthias St. Pierre" Date: Sat, 28 Sep 2019 00:45:57 +0200 Subject: 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 (Merged from https://github.com/openssl/openssl/pull/9333) --- crypto/aes/aes_local.h | 6 +++--- crypto/arm_arch.h | 4 ++-- crypto/async/arch/async_posix.h | 6 +++--- crypto/bf/bf_local.h | 4 ++-- crypto/bio/bio_local.h | 4 ++-- crypto/bn/bn_local.h | 4 ++-- crypto/bn/rsaz_exp.h | 4 ++-- crypto/camellia/cmll_local.h | 6 +++--- crypto/cmp/cmp_local.h | 6 +++--- crypto/cms/cms_local.h | 4 ++-- crypto/crmf/crmf_local.h | 4 ++-- crypto/des/des_local.h | 4 ++-- crypto/ec/curve448/arch_32/arch_intrinsics.h | 6 +++--- crypto/ec/curve448/arch_32/f_impl.h | 6 +++--- crypto/ec/curve448/curve448_local.h | 6 +++--- crypto/ec/curve448/curve448utils.h | 4 ++-- crypto/ec/curve448/ed448.h | 6 +++--- crypto/ec/curve448/field.h | 6 +++--- crypto/ec/curve448/point_448.h | 6 +++--- crypto/ec/curve448/word.h | 6 +++--- crypto/engine/eng_local.h | 6 +++--- crypto/hmac/hmac_local.h | 4 ++-- crypto/mips_arch.h | 4 ++-- crypto/ppc_arch.h | 4 ++-- crypto/rand/rand_local.h | 4 ++-- crypto/rc4/rc4_local.h | 4 ++-- crypto/rsa/rsa_local.h | 6 +++--- crypto/s390x_arch.h | 4 ++-- crypto/seed/seed_local.h | 6 +++--- crypto/sparc_arch.h | 6 +++--- crypto/ui/ui_local.h | 4 ++-- crypto/x509/v3_admis.h | 4 ++-- 32 files changed, 79 insertions(+), 79 deletions(-) (limited to 'crypto') diff --git a/crypto/aes/aes_local.h b/crypto/aes/aes_local.h index 273c4fd288..b201905831 100644 --- 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 # include @@ -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 5b156d3c44..2d279d6459 100644 --- 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 528733e1aa..aba713e759 100644 --- 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 #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 a59ceae8a9..080f37a5f9 100644 --- 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 /* NOTE - c is not incremented as per n2l */ diff --git a/crypto/bio/bio_local.h b/crypto/bio/bio_local.h index 024120feae..30e56cba8d 100644 --- 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 2640f3416f..4c86986804 100644 --- 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 c92af6ff13..c05a5d937e 100644 --- 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 cf3d38db45..c1d940d3d8 100644 --- 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 48734649a0..1a7dcca3bd 100644 --- 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 40d9c4bb7d..6cb31955eb 100644 --- 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 diff --git a/crypto/crmf/crmf_local.h b/crypto/crmf/crmf_local.h index 0eba3a15c8..577187f55b 100644 --- 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 # include diff --git a/crypto/des/des_local.h b/crypto/des/des_local.h index 230a30f1e5..f888cb8001 100644 --- 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 diff --git a/crypto/ec/curve448/arch_32/arch_intrinsics.h b/crypto/ec/curve448/arch_32/arch_intrinsics.h index 80b4d39828..7a54903ac9 100644 --- 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 4ca283fe86..5cd25c04e1 100644 --- 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 9459f002cb..197627f6b8 100644 --- 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 0ac69a6688..fa06cb02ec 100644 --- 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 diff --git a/crypto/ec/curve448/ed448.h b/crypto/ec/curve448/ed448.h index b198f36e3a..4f99fe6901 100644 --- 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 1bade8b1ab..9d6ee1cacc 100644 --- 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 @@ -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 1708b57fe8..9f09aea13f 100644 --- 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 250720bea9..d3e6ff863b 100644 --- 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 # include @@ -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 4600531843..1862920157 100644 --- 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 # 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 4d8ef6f690..788721ef1f 100644 --- 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 df4ff7aeba..12a27615f1 100644 --- 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 ce98f5b757..0241878ea7 100644 --- 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 0f8a81f311..7817df80d0 100644 --- 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 # include diff --git a/crypto/rc4/rc4_local.h b/crypto/rc4/rc4_local.h index 20afa1334e..f8cf9a89b3 100644 --- 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 # include "internal/cryptlib.h" diff --git a/crypto/rsa/rsa_local.h b/crypto/rsa/rsa_local.h index 5dcd6eab7b..204fde29fa 100644 --- 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 #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 77f327d4de..0123de9477 100644 --- 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 9be89b21a6..ed3cebc6b1 100644 --- 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 @@ -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 4207afea5e..f57f0e145b 100644 --- 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 6506cba52f..36b3e6194b 100644 --- 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 # include diff --git a/crypto/x509/v3_admis.h b/crypto/x509/v3_admis.h index 9d1535c3ae..1e82c0f4a3 100644 --- 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; -- cgit v1.2.3