Skip to content

T
Third Party Openssl

OpenHarmony / Third Party Openssl
1 年多 前同步成功

通知 9
Star 18
Fork 1
T
Third Party Openssl
提交 fbbfd128 编写于 作者: D Dr. Matthias St. Pierre
浏览文件
操作

Fix header file include guard names 

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

The public header files (in the 'include/openssl' directory) are not changed
in 1.1.1, because it is a stable release.

For the private header files files, the guard names try to match the path
specified in the include directives, with all letters converted to upper case
and '/' and '.' replaced by '_'. An extra 'OSSL_' is added as prefix.
Reviewed-by: NRichard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/9681)
上级 b5acbf91
隐藏空白更改
内联 并排
Showing with 190 addition and 190 deletion
apps/apps.h
浏览文件 @ fbbfd128
......@@ -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"
......
apps/timeouts.h
浏览文件 @ fbbfd128
......@@ -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 */
apps/vms_term_sock.h
浏览文件 @ fbbfd128
......@@ -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
......
crypto/aes/aes_local.h
浏览文件 @ fbbfd128
......@@ -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 */
crypto/arm_arch.h
浏览文件 @ fbbfd128
......@@ -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)
......
crypto/async/arch/async_posix.h
浏览文件 @ fbbfd128
......@@ -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 */
crypto/bf/bf_local.h
浏览文件 @ fbbfd128
......@@ -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 */
......
crypto/bio/bio_local.h
浏览文件 @ fbbfd128
......@@ -27,7 +27,7 @@
* 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
......
crypto/bn/bn_local.h
浏览文件 @ fbbfd128
......@@ -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
......
crypto/bn/rsaz_exp.h
浏览文件 @ fbbfd128
......@@ -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) && \
......
crypto/camellia/cmll_local.h
浏览文件 @ fbbfd128
......@@ -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 */
crypto/cms/cms_local.h
浏览文件 @ fbbfd128
......@@ -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>
......
crypto/des/des_local.h
浏览文件 @ fbbfd128
......@@ -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>
......
crypto/ec/curve448/arch_32/arch_intrinsics.h
浏览文件 @ fbbfd128
......@@ -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 */
crypto/ec/curve448/arch_32/f_impl.h
浏览文件 @ fbbfd128
......@@ -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 */
crypto/ec/curve448/curve448_local.h
浏览文件 @ fbbfd128
......@@ -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],
......@@ -35,4 +35,4 @@ int ED448ph_verify(const uint8_t hash[64], const uint8_t signature[114],
int ED448_public_from_private(uint8_t out_public_key[57],
const uint8_t private_key[57]);
#endif /* HEADER_CURVE448_LCL_H */
#endif /* OSSL_CRYPTO_EC_CURVE448_LOCAL_H */
crypto/ec/curve448/curve448utils.h
浏览文件 @ fbbfd128
......@@ -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>
......
crypto/ec/curve448/ed448.h
浏览文件 @ fbbfd128
......@@ -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"
......@@ -192,4 +192,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 */
crypto/ec/curve448/field.h
浏览文件 @ fbbfd128
......@@ -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 */
crypto/ec/curve448/point_448.h
浏览文件 @ fbbfd128
......@@ -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 */
crypto/ec/curve448/word.h
浏览文件 @ fbbfd128
......@@ -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 */
crypto/engine/eng_local.h
浏览文件 @ fbbfd128
......@@ -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 "internal/cryptlib.h"
# include "crypto/engine.h"
......@@ -168,4 +168,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 */
crypto/hmac/hmac_local.h
浏览文件 @ fbbfd128
......@@ -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
......
crypto/mips_arch.h
浏览文件 @ fbbfd128
......@@ -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)) \
......
crypto/ppc_arch.h
浏览文件 @ fbbfd128
......@@ -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;
......
crypto/rand/rand_local.h
浏览文件 @ fbbfd128
......@@ -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>
......
crypto/rc4/rc4_local.h
浏览文件 @ fbbfd128
......@@ -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"
......
crypto/s390x_arch.h
浏览文件 @ fbbfd128
......@@ -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__
......
crypto/seed/seed_local.h
浏览文件 @ fbbfd128
......@@ -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 */
crypto/sparc_arch.h
浏览文件 @ fbbfd128
......@@ -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 */
crypto/ui/ui_local.h
浏览文件 @ fbbfd128
......@@ -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>
......
crypto/x509v3/v3_admis.h
浏览文件 @ fbbfd128
......@@ -7,8 +7,8 @@
* https://www.openssl.org/source/license.html
*/
#ifndef HEADER_V3_ADMISSION_H
# define HEADER_V3_ADMISSION_H
#ifndef OSSL_CRYPTO_X509V3_V3_ADMIS_H
# define OSSL_CRYPTO_X509V3_V3_ADMIS_H
struct NamingAuthority_st {
ASN1_OBJECT* namingAuthorityId;
......
e_os.h
浏览文件 @ fbbfd128
......@@ -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>
......
engines/e_afalg.h
浏览文件 @ fbbfd128
......@@ -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)
......
engines/e_afalg_err.h
浏览文件 @ fbbfd128
......@@ -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
# define AFALGerr(f, r) ERR_AFALG_error((f), (r), OPENSSL_FILE, OPENSSL_LINE)
......
engines/e_capi_err.h
浏览文件 @ fbbfd128
......@@ -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
# define CAPIerr(f, r) ERR_CAPI_error((f), (r), OPENSSL_FILE, OPENSSL_LINE)
......
engines/e_dasync_err.h
浏览文件 @ fbbfd128
......@@ -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
# define DASYNCerr(f, r) ERR_DASYNC_error((f), (r), OPENSSL_FILE, OPENSSL_LINE)
......
engines/e_ossltest_err.h
浏览文件 @ fbbfd128
......@@ -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
# define OSSLTESTerr(f, r) ERR_OSSLTEST_error((f), (r), OPENSSL_FILE, OPENSSL_LINE)
......
include/crypto/aria.h
浏览文件 @ fbbfd128
......@@ -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>
......
include/crypto/bn.h
浏览文件 @ fbbfd128
......@@ -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>
......
include/crypto/bn_conf.h.in
浏览文件 @ fbbfd128
......@@ -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
......
include/crypto/chacha.h
浏览文件 @ fbbfd128
......@@ -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>
......
include/crypto/ctype.h
浏览文件 @ fbbfd128
......@@ -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
......
include/crypto/dso_conf.h.in
浏览文件 @ fbbfd128
......@@ -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
......
include/crypto/ec.h
浏览文件 @ fbbfd128
......@@ -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
......
include/crypto/err.h
浏览文件 @ fbbfd128
......@@ -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);
......
include/crypto/lhash.h
浏览文件 @ fbbfd128
......@@ -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 *);
......
include/crypto/rand.h
浏览文件 @ fbbfd128
......@@ -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>
......
include/crypto/sha.h
浏览文件 @ fbbfd128
......@@ -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>
......
include/crypto/sm2.h
浏览文件 @ fbbfd128
......@@ -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
......
include/crypto/sm2err.h
浏览文件 @ fbbfd128
......@@ -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
# ifndef HEADER_SYMHACKS_H
# include <openssl/symhacks.h>
......
include/crypto/sm3.h
浏览文件 @ fbbfd128
......@@ -8,8 +8,8 @@
* https://www.openssl.org/source/license.html
*/
#ifndef HEADER_SM3_H
# define HEADER_SM3_H
#ifndef OSSL_CRYPTO_SM3_H
# define OSSL_CRYPTO_SM3_H
# include <openssl/opensslconf.h>
......
include/crypto/sm4.h
浏览文件 @ fbbfd128
......@@ -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>
......
include/crypto/store.h
浏览文件 @ fbbfd128
......@@ -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>
......
include/internal/conf.h
浏览文件 @ fbbfd128
......@@ -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>
......
include/internal/constant_time.h
浏览文件 @ fbbfd128
......@@ -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 */
include/internal/cryptlib.h
浏览文件 @ fbbfd128
......@@ -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>
......
include/internal/dane.h
浏览文件 @ fbbfd128
......@@ -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 */
include/internal/dso.h
浏览文件 @ fbbfd128
......@@ -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"
......
include/internal/dsoerr.h
浏览文件 @ fbbfd128
......@@ -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
# ifndef HEADER_SYMHACKS_H
# include <openssl/symhacks.h>
......
include/internal/err.h
浏览文件 @ fbbfd128
......@@ -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);
......
include/internal/nelem.h
浏览文件 @ fbbfd128
......@@ -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
include/internal/numbers.h
浏览文件 @ fbbfd128
......@@ -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>
......
include/internal/o_dir.h
浏览文件 @ fbbfd128
......@@ -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;
......
include/internal/o_str.h
浏览文件 @ fbbfd128
......@@ -7,8 +7,8 @@
* https://www.openssl.org/source/license.html
*/
#ifndef HEADER_O_STR_H
# define HEADER_O_STR_H
#ifndef OSSL_INTERNAL_O_STR_H
# define OSSL_INTERNAL_O_STR_H
# include <stddef.h> /* to get size_t */
......
include/internal/refcount.h
浏览文件 @ fbbfd128
......@@ -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)
......
include/internal/sockets.h
浏览文件 @ fbbfd128
......@@ -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
......
include/internal/sslconf.h
浏览文件 @ fbbfd128
......@@ -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;
......
ssl/packet_local.h
浏览文件 @ fbbfd128
......@@ -7,8 +7,8 @@
* https://www.openssl.org/source/license.html
*/
#ifndef HEADER_PACKET_LOCL_H
# define HEADER_PACKET_LOCL_H
#ifndef OSSL_SSL_PACKET_LOCAL_H
# define OSSL_SSL_PACKET_LOCAL_H
# include <string.h>
# include <openssl/bn.h>
......@@ -871,4 +871,4 @@ unsigned char *WPACKET_get_curr(WPACKET *pkt);
/* Release resources in a WPACKET if a failure has occurred. */
void WPACKET_cleanup(WPACKET *pkt);
#endif /* HEADER_PACKET_LOCL_H */
#endif /* OSSL_SSL_PACKET_LOCAL_H */
ssl/ssl_local.h
浏览文件 @ fbbfd128
......@@ -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>
......
test/drbg_cavs_data.h
浏览文件 @ fbbfd128
......@@ -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,
......
test/ecdsatest.h
浏览文件 @ fbbfd128
......@@ -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 */
test/handshake_helper.h
浏览文件 @ fbbfd128
......@@ -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 */
test/ossl_shim/async_bio.h
浏览文件 @ fbbfd128
......@@ -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
test/ossl_shim/include/openssl/base.h
浏览文件 @ fbbfd128
......@@ -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 */
test/ossl_shim/packeted_bio.h
浏览文件 @ fbbfd128
......@@ -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
test/ossl_shim/test_config.h
浏览文件 @ fbbfd128
......@@ -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
test/ssl_test_ctx.h
浏览文件 @ fbbfd128
......@@ -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 */
test/ssltestlib.h
浏览文件 @ fbbfd128
......@@ -7,8 +7,8 @@
* https://www.openssl.org/source/license.html
*/
#ifndef HEADER_SSLTESTLIB_H
# define HEADER_SSLTESTLIB_H
#ifndef OSSL_TEST_SSLTESTLIB_H
# define OSSL_TEST_SSLTESTLIB_H
# include <openssl/ssl.h>
......@@ -53,4 +53,4 @@ typedef struct mempacket_st MEMPACKET;
DEFINE_STACK_OF(MEMPACKET)
#endif /* HEADER_SSLTESTLIB_H */
#endif /* OSSL_TEST_SSLTESTLIB_H */
test/testutil.h
浏览文件 @ fbbfd128
......@@ -7,8 +7,8 @@
* https://www.openssl.org/source/license.html
*/
#ifndef HEADER_TESTUTIL_H
# define HEADER_TESTUTIL_H
#ifndef OSSL_TESTUTIL_H
# define OSSL_TESTUTIL_H
#include <stdarg.h>
......@@ -465,4 +465,4 @@ void test_random_seed(uint32_t sd);
/* Create a file path from a directory and a filename */
char *test_mk_file_path(const char *dir, const char *file);
#endif /* HEADER_TESTUTIL_H */
#endif /* OSSL_TESTUTIL_H */
test/testutil/output.h
浏览文件 @ fbbfd128
......@@ -7,8 +7,8 @@
* https://www.openssl.org/source/license.html
*/
#ifndef HEADER_TU_OUTPUT_H
# define HEADER_TU_OUTPUT_H
#ifndef OSSL_TESTUTIL_OUTPUT_H
# define OSSL_TESTUTIL_OUTPUT_H
#include <stdarg.h>
......@@ -29,4 +29,4 @@ int test_flush_stderr(void);
int test_printf_stdout(const char *fmt, ...);
int test_printf_stderr(const char *fmt, ...);
#endif /* HEADER_TU_OUTPUT_H */
#endif /* OSSL_TESTUTIL_OUTPUT_H */
util/mkerr.pl
浏览文件 @ fbbfd128
......@@ -450,8 +450,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/symhacks.h>
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或