diff options
author | Dr. Matthias St. Pierre <Matthias.St.Pierre@ncp-e.com> | 2019-09-28 00:45:57 +0200 |
---|---|---|
committer | Dr. Matthias St. Pierre <Matthias.St.Pierre@ncp-e.com> | 2019-09-28 20:26:36 +0200 |
commit | ae4186b00487762f581b2276ba83e5214e0e7ee1 (patch) | |
tree | 78787c492eea42ddde78a9423aa1b507ffee162a /include/openssl | |
parent | 8c78f0ec63f3e16bac1b888dbabf2b6c2d53a1ae (diff) | |
download | openssl-ae4186b00487762f581b2276ba83e5214e0e7ee1.zip openssl-ae4186b00487762f581b2276ba83e5214e0e7ee1.tar.gz openssl-ae4186b00487762f581b2276ba83e5214e0e7ee1.tar.bz2 |
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)
Diffstat (limited to 'include/openssl')
113 files changed, 239 insertions, 239 deletions
diff --git a/include/openssl/aes.h b/include/openssl/aes.h index 060aa0f..672bcfb 100644 --- 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 ca00430..6389722 100644 --- 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 d2d271b..944f7ca 100644 --- 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 568b347..0556d3c 100644 --- 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 910c144..9ed41db 100644 --- 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 9612190..3c2e14d 100644 --- 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 3e4fbd3..e841656 100644 --- 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 79a6c9e..f2ed705 100644 --- 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 2a6bda4..1445a5f 100644 --- 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 0244442..8ece005 100644 --- 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 fa5398c..9e32edb 100644 --- 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 39e34d9..f5cc3c5 100644 --- 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 6408123..24a0a36 100644 --- 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 42c557a..5b6648b 100644 --- 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 5656ecd..c14c697 100644 --- 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 029b3e2..c8802ec 100644 --- 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 daffc29..fe138bd 100644 --- 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 5e06a3a..fa5cee5 100644 --- 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 18c56ef..0c1ce25 100644 --- 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 608b6d7..5209d39 100644 --- 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 fe26195..472ca3d 100644 --- 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 6965597..eac825f 100644 --- 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 45e1448..6fb872a 100644 --- 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 ed10412..c987c42 100644 --- 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 3120915..7856ca0 100644 --- 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 69110cb..848a6ce 100644 --- 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 d07a2ac..2377169 100644 --- 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 8ca7577..6656a7f 100644 --- 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 d3189a3..cec3806 100644 --- 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 7490a1d..160ad32 100644 --- 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 59c5243..715b78c 100644 --- 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 5cdb831..6e5dae8 100644 --- 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 15071e2..497735e 100644 --- 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 940e66c..084fd36 100644 --- 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 3989996..69e08a9 100644 --- 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 84b65e0..c0361dd 100644 --- 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 1b9d216..64189ed 100644 --- 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 13bd036..4003f79 100644 --- 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 32d6a7d..c5a3635 100644 --- 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 76ef96a..3d16c09 100644 --- 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 ef01d8b..b4c3631 100644 --- 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 b1a99f3..740cf55 100644 --- 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 9994928..6805806 100644 --- 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 4e1af5e..2a66928 100644 --- 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 50e23bb..17b418b 100644 --- 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 8a2b96f..fc294ec 100644 --- 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 14188be..2db61b5 100644 --- 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 6f75b32..f837c3a 100644 --- 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 f13b539..c20bf82 100644 --- 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 0fb676b..ee3041a 100644 --- 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 2d9dcb7..857d685 100644 --- 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 64ed5a3..b7c2a71 100644 --- 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 28226f5..aeb9670 100644 --- 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 7bf4e23..93e6a86 100644 --- 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 fb42443..2fcee23 100644 --- 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 5568c4f..0521f72 100644 --- 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 6144fdd..c7197c5 100644 --- 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 e2f4c8e..35531ff 100644 --- 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 104aeee..893c465 100644 --- 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 d5ade5f..b039055 100644 --- 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 576695c..e6c0c45 100644 --- 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 7465c71..6b75684 100644 --- 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 9416df2..3fee895 100644 --- 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 fac142b..a684200 100644 --- 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 e427325..bb3fcfb 100644 --- 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 220befd..a732138 100644 --- 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 73bda5a..c344833 100644 --- 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 6a62b49..a4fb47e 100644 --- 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 8293ee2..aec3bc1 100644 --- 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 8f6e6a2..d6e8dca 100644 --- 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 fea32df..c5d4b35 100644 --- 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 7f2d6e7..1ca4cea 100644 --- 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 83caaee..9310672 100644 --- 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 c599700..e08a44b 100644 --- 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 682c340..f5b2e08 100644 --- 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 01d9dc2..24bff6d 100644 --- 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 db8e714..86dabf4 100644 --- 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 05ea8a7..e2cf49f 100644 --- 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 984c40d..b557670 100644 --- 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 cd7ae66..74fac69 100644 --- 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 0693db6..909e5b0 100644 --- 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 95da746..37509b9 100644 --- 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 97e22f7..9550df9 100644 --- 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 ef334ff..dfd2ec1 100644 --- 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 8750e19..302596c 100644 --- 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 da092fb..d449186 100644 --- 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 1fbe6cb..520f2b4 100644 --- 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 6ef0e80..795c915 100644 --- 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 1d55845..9448713 100644 --- 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 8da92ca..e65ec36 100644 --- 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 2a00d08..fbc6487 100644 --- 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 93f6bbc..7783f94 100644 --- 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 ed70be5..41aad9a 100644 --- 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 cf0b51d..b89c911 100644 --- 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 d8d3cea..ad5cd56 100644 --- 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 638b3af..8683e53 100644 --- 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 0d75035..affa16a 100644 --- 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 192a240..940beee 100644 --- 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 046c2a4..6a477b4 100644 --- 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 f587f2a..85871ae 100644 --- 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 cc1888b..31e6fcc 100644 --- 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 3165a78..4af1feb 100644 --- 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 b15c7cf..8846343 100644 --- 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 34fb0d5..39d4a3a 100644 --- 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 70d9144..73bf88d 100644 --- 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 5901d23..23e27bc 100644 --- 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 b3f7871..55340de 100644 --- 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 a0b4d9d..84bdabf 100644 --- 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 89ec365..1b0278f 100644 --- 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 e9a70f5..81b5052 100644 --- 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 2a237dd..e28caa2 100644 --- 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 bd60fcc..e276f1d 100644 --- 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 4ccc76b..74e5954 100644 --- 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> |