From d86167ec7513265bbafaf5c13fa60bd7c23aa732 Mon Sep 17 00:00:00 2001 From: "Dr. Matthias St. Pierre" Date: Sat, 28 Sep 2019 00:46:00 +0200 Subject: [PATCH] Add legacy include guards to public header files For every public header file, the old include guard definition needs to be added in addition to the new one include/openssl/file.h: #ifndef OPENSSL_FILE_H # define OPENSSL_FILE_H # pragma once # include # if !OPENSSL_API_3 # define HEADER_FILE_H # endif ... This is going to ensure that applications which use the old include guards externally, for example like this #ifndef HEADER_FILE_H # include #endif will not fail to compile. In addition to the legacy guard, the public header files also receive a '# pragma once' directive. Reviewed-by: Richard Levitte (Merged from https://github.com/openssl/openssl/pull/9333) --- include/openssl/aes.h | 6 ++++++ include/openssl/asn1.h | 6 ++++++ include/openssl/asn1err.h | 6 ++++++ include/openssl/asn1t.h | 6 ++++++ include/openssl/async.h | 6 ++++++ include/openssl/asyncerr.h | 6 ++++++ include/openssl/bio.h | 6 ++++++ include/openssl/bioerr.h | 6 ++++++ include/openssl/blowfish.h | 6 ++++++ include/openssl/bn.h | 6 ++++++ include/openssl/bnerr.h | 6 ++++++ include/openssl/buffer.h | 6 ++++++ include/openssl/buffererr.h | 6 ++++++ include/openssl/camellia.h | 6 ++++++ include/openssl/cast.h | 6 ++++++ include/openssl/cmac.h | 6 ++++++ include/openssl/cms.h | 6 ++++++ include/openssl/cmserr.h | 6 ++++++ include/openssl/comp.h | 6 ++++++ include/openssl/comperr.h | 6 ++++++ include/openssl/conf.h | 6 ++++++ include/openssl/conf_api.h | 6 ++++++ include/openssl/conferr.h | 6 ++++++ include/openssl/crypto.h | 6 ++++++ include/openssl/cryptoerr.h | 6 ++++++ include/openssl/ct.h | 6 ++++++ include/openssl/cterr.h | 6 ++++++ include/openssl/des.h | 6 ++++++ include/openssl/dh.h | 6 ++++++ include/openssl/dherr.h | 6 ++++++ include/openssl/dsa.h | 6 ++++++ include/openssl/dsaerr.h | 6 ++++++ include/openssl/dtls1.h | 6 ++++++ include/openssl/e_os2.h | 6 ++++++ include/openssl/ebcdic.h | 6 ++++++ include/openssl/ec.h | 6 ++++++ include/openssl/ecerr.h | 6 ++++++ include/openssl/engine.h | 6 ++++++ include/openssl/engineerr.h | 6 ++++++ include/openssl/err.h | 6 ++++++ include/openssl/evp.h | 6 ++++++ include/openssl/evperr.h | 6 ++++++ include/openssl/hmac.h | 6 ++++++ include/openssl/idea.h | 6 ++++++ include/openssl/kdf.h | 6 ++++++ include/openssl/lhash.h | 6 ++++++ include/openssl/md2.h | 6 ++++++ include/openssl/md4.h | 6 ++++++ include/openssl/md5.h | 6 ++++++ include/openssl/mdc2.h | 6 ++++++ include/openssl/modes.h | 6 ++++++ include/openssl/objects.h | 6 ++++++ include/openssl/objectserr.h | 6 ++++++ include/openssl/ocsp.h | 6 ++++++ include/openssl/ocsperr.h | 6 ++++++ include/openssl/opensslv.h | 6 ++++++ include/openssl/pem.h | 6 ++++++ include/openssl/pem2.h | 6 ++++++ include/openssl/pemerr.h | 6 ++++++ include/openssl/pkcs12.h | 6 ++++++ include/openssl/pkcs12err.h | 6 ++++++ include/openssl/pkcs7.h | 6 ++++++ include/openssl/pkcs7err.h | 6 ++++++ include/openssl/rand.h | 6 ++++++ include/openssl/rand_drbg.h | 6 ++++++ include/openssl/randerr.h | 6 ++++++ include/openssl/rc2.h | 6 ++++++ include/openssl/rc4.h | 6 ++++++ include/openssl/rc5.h | 6 ++++++ include/openssl/ripemd.h | 6 ++++++ include/openssl/rsa.h | 6 ++++++ include/openssl/rsaerr.h | 6 ++++++ include/openssl/safestack.h | 6 ++++++ include/openssl/seed.h | 6 ++++++ include/openssl/sha.h | 6 ++++++ include/openssl/srp.h | 6 ++++++ include/openssl/srtp.h | 6 ++++++ include/openssl/ssl.h | 6 ++++++ include/openssl/ssl2.h | 6 ++++++ include/openssl/ssl3.h | 6 ++++++ include/openssl/sslerr.h | 6 ++++++ include/openssl/stack.h | 6 ++++++ include/openssl/store.h | 6 ++++++ include/openssl/storeerr.h | 6 ++++++ include/openssl/symhacks.h | 6 ++++++ include/openssl/tls1.h | 6 ++++++ include/openssl/ts.h | 6 ++++++ include/openssl/tserr.h | 6 ++++++ include/openssl/txt_db.h | 6 ++++++ include/openssl/ui.h | 6 ++++++ include/openssl/uierr.h | 6 ++++++ include/openssl/whrlpool.h | 6 ++++++ include/openssl/x509.h | 6 ++++++ include/openssl/x509_vfy.h | 6 ++++++ include/openssl/x509err.h | 6 ++++++ include/openssl/x509v3.h | 6 ++++++ include/openssl/x509v3err.h | 6 ++++++ 97 files changed, 582 insertions(+) diff --git a/include/openssl/aes.h b/include/openssl/aes.h index 672bcfbe50..4e93d3dc93 100644 --- a/include/openssl/aes.h +++ b/include/openssl/aes.h @@ -9,6 +9,12 @@ #ifndef OPENSSL_AES_H # define OPENSSL_AES_H +# pragma once + +# include +# if !OPENSSL_API_3 +# define HEADER_AES_H +# endif # include diff --git a/include/openssl/asn1.h b/include/openssl/asn1.h index 6389722e15..32d39c14a6 100644 --- a/include/openssl/asn1.h +++ b/include/openssl/asn1.h @@ -9,6 +9,12 @@ #ifndef OPENSSL_ASN1_H # define OPENSSL_ASN1_H +# pragma once + +# include +# if !OPENSSL_API_3 +# define HEADER_ASN1_H +# endif # include # include diff --git a/include/openssl/asn1err.h b/include/openssl/asn1err.h index 944f7ca456..9166f17142 100644 --- a/include/openssl/asn1err.h +++ b/include/openssl/asn1err.h @@ -10,6 +10,12 @@ #ifndef OPENSSL_ASN1ERR_H # define OPENSSL_ASN1ERR_H +# pragma once + +# include +# if !OPENSSL_API_3 +# define HEADER_ASN1ERR_H +# endif # include # include diff --git a/include/openssl/asn1t.h b/include/openssl/asn1t.h index 0556d3c6c4..00ccdf5156 100644 --- a/include/openssl/asn1t.h +++ b/include/openssl/asn1t.h @@ -9,6 +9,12 @@ #ifndef OPENSSL_ASN1T_H # define OPENSSL_ASN1T_H +# pragma once + +# include +# if !OPENSSL_API_3 +# define HEADER_ASN1T_H +# endif # include # include diff --git a/include/openssl/async.h b/include/openssl/async.h index 9ed41dbc1d..e372e43c47 100644 --- a/include/openssl/async.h +++ b/include/openssl/async.h @@ -11,6 +11,12 @@ #ifndef OPENSSL_ASYNC_H # define OPENSSL_ASYNC_H +# pragma once + +# include +# if !OPENSSL_API_3 +# define HEADER_ASYNC_H +# endif #if defined(_WIN32) # if defined(BASETYPES) || defined(_WINDEF_H) diff --git a/include/openssl/asyncerr.h b/include/openssl/asyncerr.h index 3c2e14d6b7..8e8c66fc52 100644 --- a/include/openssl/asyncerr.h +++ b/include/openssl/asyncerr.h @@ -10,6 +10,12 @@ #ifndef OPENSSL_ASYNCERR_H # define OPENSSL_ASYNCERR_H +# pragma once + +# include +# if !OPENSSL_API_3 +# define HEADER_ASYNCERR_H +# endif # include # include diff --git a/include/openssl/bio.h b/include/openssl/bio.h index e8416560cd..9fb8095014 100644 --- a/include/openssl/bio.h +++ b/include/openssl/bio.h @@ -9,6 +9,12 @@ #ifndef OPENSSL_BIO_H # define OPENSSL_BIO_H +# pragma once + +# include +# if !OPENSSL_API_3 +# define HEADER_BIO_H +# endif # include diff --git a/include/openssl/bioerr.h b/include/openssl/bioerr.h index f2ed705759..2f4dd3394b 100644 --- a/include/openssl/bioerr.h +++ b/include/openssl/bioerr.h @@ -10,6 +10,12 @@ #ifndef OPENSSL_BIOERR_H # define OPENSSL_BIOERR_H +# pragma once + +# include +# if !OPENSSL_API_3 +# define HEADER_BIOERR_H +# endif # include # include diff --git a/include/openssl/blowfish.h b/include/openssl/blowfish.h index 1445a5fd87..6532915200 100644 --- a/include/openssl/blowfish.h +++ b/include/openssl/blowfish.h @@ -9,6 +9,12 @@ #ifndef OPENSSL_BLOWFISH_H # define OPENSSL_BLOWFISH_H +# pragma once + +# include +# if !OPENSSL_API_3 +# define HEADER_BLOWFISH_H +# endif # include diff --git a/include/openssl/bn.h b/include/openssl/bn.h index 8ece005195..12fbcdaccd 100644 --- a/include/openssl/bn.h +++ b/include/openssl/bn.h @@ -10,6 +10,12 @@ #ifndef OPENSSL_BN_H # define OPENSSL_BN_H +# pragma once + +# include +# if !OPENSSL_API_3 +# define HEADER_BN_H +# endif # include # ifndef OPENSSL_NO_STDIO diff --git a/include/openssl/bnerr.h b/include/openssl/bnerr.h index 9e32edbcab..a4b666f9cc 100644 --- a/include/openssl/bnerr.h +++ b/include/openssl/bnerr.h @@ -10,6 +10,12 @@ #ifndef OPENSSL_BNERR_H # define OPENSSL_BNERR_H +# pragma once + +# include +# if !OPENSSL_API_3 +# define HEADER_BNERR_H +# endif # include # include diff --git a/include/openssl/buffer.h b/include/openssl/buffer.h index f5cc3c51a6..c3cf216147 100644 --- a/include/openssl/buffer.h +++ b/include/openssl/buffer.h @@ -9,6 +9,12 @@ #ifndef OPENSSL_BUFFER_H # define OPENSSL_BUFFER_H +# pragma once + +# include +# if !OPENSSL_API_3 +# define HEADER_BUFFER_H +# endif # include # ifndef OPENSSL_CRYPTO_H diff --git a/include/openssl/buffererr.h b/include/openssl/buffererr.h index 24a0a36b48..fbe0d99843 100644 --- a/include/openssl/buffererr.h +++ b/include/openssl/buffererr.h @@ -10,6 +10,12 @@ #ifndef OPENSSL_BUFFERERR_H # define OPENSSL_BUFFERERR_H +# pragma once + +# include +# if !OPENSSL_API_3 +# define HEADER_BUFERR_H +# endif # include # include diff --git a/include/openssl/camellia.h b/include/openssl/camellia.h index 5b6648b673..23605cf393 100644 --- a/include/openssl/camellia.h +++ b/include/openssl/camellia.h @@ -9,6 +9,12 @@ #ifndef OPENSSL_CAMELLIA_H # define OPENSSL_CAMELLIA_H +# pragma once + +# include +# if !OPENSSL_API_3 +# define HEADER_CAMELLIA_H +# endif # include diff --git a/include/openssl/cast.h b/include/openssl/cast.h index c14c6979c4..a1aad6bda3 100644 --- a/include/openssl/cast.h +++ b/include/openssl/cast.h @@ -9,6 +9,12 @@ #ifndef OPENSSL_CAST_H # define OPENSSL_CAST_H +# pragma once + +# include +# if !OPENSSL_API_3 +# define HEADER_CAST_H +# endif # include diff --git a/include/openssl/cmac.h b/include/openssl/cmac.h index c8802ec733..426536fa35 100644 --- a/include/openssl/cmac.h +++ b/include/openssl/cmac.h @@ -9,6 +9,12 @@ #ifndef OPENSSL_CMAC_H # define OPENSSL_CMAC_H +# pragma once + +# include +# if !OPENSSL_API_3 +# define HEADER_CMAC_H +# endif # ifndef OPENSSL_NO_CMAC diff --git a/include/openssl/cms.h b/include/openssl/cms.h index 5209d39ee3..cf4ad37f3a 100644 --- a/include/openssl/cms.h +++ b/include/openssl/cms.h @@ -9,6 +9,12 @@ #ifndef OPENSSL_CMS_H # define OPENSSL_CMS_H +# pragma once + +# include +# if !OPENSSL_API_3 +# define HEADER_CMS_H +# endif # include diff --git a/include/openssl/cmserr.h b/include/openssl/cmserr.h index 472ca3d916..407bdfd5fd 100644 --- a/include/openssl/cmserr.h +++ b/include/openssl/cmserr.h @@ -10,6 +10,12 @@ #ifndef OPENSSL_CMSERR_H # define OPENSSL_CMSERR_H +# pragma once + +# include +# if !OPENSSL_API_3 +# define HEADER_CMSERR_H +# endif # include # include diff --git a/include/openssl/comp.h b/include/openssl/comp.h index eac825f169..47f782b57a 100644 --- a/include/openssl/comp.h +++ b/include/openssl/comp.h @@ -9,6 +9,12 @@ #ifndef OPENSSL_COMP_H # define OPENSSL_COMP_H +# pragma once + +# include +# if !OPENSSL_API_3 +# define HEADER_COMP_H +# endif # include diff --git a/include/openssl/comperr.h b/include/openssl/comperr.h index 6fb872a4f8..89faccb115 100644 --- a/include/openssl/comperr.h +++ b/include/openssl/comperr.h @@ -10,6 +10,12 @@ #ifndef OPENSSL_COMPERR_H # define OPENSSL_COMPERR_H +# pragma once + +# include +# if !OPENSSL_API_3 +# define HEADER_COMPERR_H +# endif # include # include diff --git a/include/openssl/conf.h b/include/openssl/conf.h index c987c428d1..b2f93dda8e 100644 --- a/include/openssl/conf.h +++ b/include/openssl/conf.h @@ -9,6 +9,12 @@ #ifndef OPENSSL_CONF_H # define OPENSSL_CONF_H +# pragma once + +# include +# if !OPENSSL_API_3 +# define HEADER_CONF_H +# endif # include # include diff --git a/include/openssl/conf_api.h b/include/openssl/conf_api.h index 7856ca0dcb..43076932e1 100644 --- a/include/openssl/conf_api.h +++ b/include/openssl/conf_api.h @@ -9,6 +9,12 @@ #ifndef OPENSSL_CONF_API_H # define OPENSSL_CONF_API_H +# pragma once + +# include +# if !OPENSSL_API_3 +# define HEADER_CONF_API_H +# endif # include # include diff --git a/include/openssl/conferr.h b/include/openssl/conferr.h index 848a6cef25..4bf5b9e28f 100644 --- a/include/openssl/conferr.h +++ b/include/openssl/conferr.h @@ -10,6 +10,12 @@ #ifndef OPENSSL_CONFERR_H # define OPENSSL_CONFERR_H +# pragma once + +# include +# if !OPENSSL_API_3 +# define HEADER_CONFERR_H +# endif # include # include diff --git a/include/openssl/crypto.h b/include/openssl/crypto.h index 6e5dae89c7..9fb2fa3925 100644 --- a/include/openssl/crypto.h +++ b/include/openssl/crypto.h @@ -10,6 +10,12 @@ #ifndef OPENSSL_CRYPTO_H # define OPENSSL_CRYPTO_H +# pragma once + +# include +# if !OPENSSL_API_3 +# define HEADER_CRYPTO_H +# endif # include # include diff --git a/include/openssl/cryptoerr.h b/include/openssl/cryptoerr.h index 497735e67e..99872af161 100644 --- a/include/openssl/cryptoerr.h +++ b/include/openssl/cryptoerr.h @@ -10,6 +10,12 @@ #ifndef OPENSSL_CRYPTOERR_H # define OPENSSL_CRYPTOERR_H +# pragma once + +# include +# if !OPENSSL_API_3 +# define HEADER_CRYPTOERR_H +# endif # include # include diff --git a/include/openssl/ct.h b/include/openssl/ct.h index 084fd368fd..17271d6777 100644 --- a/include/openssl/ct.h +++ b/include/openssl/ct.h @@ -9,6 +9,12 @@ #ifndef OPENSSL_CT_H # define OPENSSL_CT_H +# pragma once + +# include +# if !OPENSSL_API_3 +# define HEADER_CT_H +# endif # include diff --git a/include/openssl/cterr.h b/include/openssl/cterr.h index 69e08a9973..c5c646cc9b 100644 --- a/include/openssl/cterr.h +++ b/include/openssl/cterr.h @@ -10,6 +10,12 @@ #ifndef OPENSSL_CTERR_H # define OPENSSL_CTERR_H +# pragma once + +# include +# if !OPENSSL_API_3 +# define HEADER_CTERR_H +# endif # include # include diff --git a/include/openssl/des.h b/include/openssl/des.h index c0361dd533..0a874f4bcc 100644 --- a/include/openssl/des.h +++ b/include/openssl/des.h @@ -9,6 +9,12 @@ #ifndef OPENSSL_DES_H # define OPENSSL_DES_H +# pragma once + +# include +# if !OPENSSL_API_3 +# define HEADER_DES_H +# endif # include diff --git a/include/openssl/dh.h b/include/openssl/dh.h index 64189ed7d7..84f4f07d2c 100644 --- a/include/openssl/dh.h +++ b/include/openssl/dh.h @@ -9,6 +9,12 @@ #ifndef OPENSSL_DH_H # define OPENSSL_DH_H +# pragma once + +# include +# if !OPENSSL_API_3 +# define HEADER_DH_H +# endif # include diff --git a/include/openssl/dherr.h b/include/openssl/dherr.h index 4003f79c62..a926dab999 100644 --- a/include/openssl/dherr.h +++ b/include/openssl/dherr.h @@ -10,6 +10,12 @@ #ifndef OPENSSL_DHERR_H # define OPENSSL_DHERR_H +# pragma once + +# include +# if !OPENSSL_API_3 +# define HEADER_DHERR_H +# endif # include # include diff --git a/include/openssl/dsa.h b/include/openssl/dsa.h index c5a363588e..f14be2812d 100644 --- a/include/openssl/dsa.h +++ b/include/openssl/dsa.h @@ -9,6 +9,12 @@ #ifndef OPENSSL_DSA_H # define OPENSSL_DSA_H +# pragma once + +# include +# if !OPENSSL_API_3 +# define HEADER_DSA_H +# endif # include diff --git a/include/openssl/dsaerr.h b/include/openssl/dsaerr.h index 3d16c09f18..9e0d5cfe2a 100644 --- a/include/openssl/dsaerr.h +++ b/include/openssl/dsaerr.h @@ -10,6 +10,12 @@ #ifndef OPENSSL_DSAERR_H # define OPENSSL_DSAERR_H +# pragma once + +# include +# if !OPENSSL_API_3 +# define HEADER_DSAERR_H +# endif # include # include diff --git a/include/openssl/dtls1.h b/include/openssl/dtls1.h index b4c36313d1..d535c05c49 100644 --- a/include/openssl/dtls1.h +++ b/include/openssl/dtls1.h @@ -9,6 +9,12 @@ #ifndef OPENSSL_DTLS1_H # define OPENSSL_DTLS1_H +# pragma once + +# include +# if !OPENSSL_API_3 +# define HEADER_DTLS1_H +# endif #ifdef __cplusplus extern "C" { diff --git a/include/openssl/e_os2.h b/include/openssl/e_os2.h index 740cf5561c..69a50911dd 100644 --- a/include/openssl/e_os2.h +++ b/include/openssl/e_os2.h @@ -9,6 +9,12 @@ #ifndef OPENSSL_E_OS2_H # define OPENSSL_E_OS2_H +# pragma once + +# include +# if !OPENSSL_API_3 +# define HEADER_E_OS2_H +# endif # include diff --git a/include/openssl/ebcdic.h b/include/openssl/ebcdic.h index 6805806e5f..a75a71d4d9 100644 --- a/include/openssl/ebcdic.h +++ b/include/openssl/ebcdic.h @@ -9,6 +9,12 @@ #ifndef OPENSSL_EBCDIC_H # define OPENSSL_EBCDIC_H +# pragma once + +# include +# if !OPENSSL_API_3 +# define HEADER_EBCDIC_H +# endif # include diff --git a/include/openssl/ec.h b/include/openssl/ec.h index 2a669285ff..11999b41fc 100644 --- a/include/openssl/ec.h +++ b/include/openssl/ec.h @@ -10,6 +10,12 @@ #ifndef OPENSSL_EC_H # define OPENSSL_EC_H +# pragma once + +# include +# if !OPENSSL_API_3 +# define HEADER_EC_H +# endif # include diff --git a/include/openssl/ecerr.h b/include/openssl/ecerr.h index 17b418b075..07ef524f7a 100644 --- a/include/openssl/ecerr.h +++ b/include/openssl/ecerr.h @@ -10,6 +10,12 @@ #ifndef OPENSSL_ECERR_H # define OPENSSL_ECERR_H +# pragma once + +# include +# if !OPENSSL_API_3 +# define HEADER_ECERR_H +# endif # include # include diff --git a/include/openssl/engine.h b/include/openssl/engine.h index fc294ec3e8..816eb4e2e6 100644 --- a/include/openssl/engine.h +++ b/include/openssl/engine.h @@ -10,6 +10,12 @@ #ifndef OPENSSL_ENGINE_H # define OPENSSL_ENGINE_H +# pragma once + +# include +# if !OPENSSL_API_3 +# define HEADER_ENGINE_H +# endif # include diff --git a/include/openssl/engineerr.h b/include/openssl/engineerr.h index 2db61b58b9..27b2df6d76 100644 --- a/include/openssl/engineerr.h +++ b/include/openssl/engineerr.h @@ -10,6 +10,12 @@ #ifndef OPENSSL_ENGINEERR_H # define OPENSSL_ENGINEERR_H +# pragma once + +# include +# if !OPENSSL_API_3 +# define HEADER_ENGINEERR_H +# endif # include # include diff --git a/include/openssl/err.h b/include/openssl/err.h index f837c3a219..fc7ead8b68 100644 --- a/include/openssl/err.h +++ b/include/openssl/err.h @@ -9,6 +9,12 @@ #ifndef OPENSSL_ERR_H # define OPENSSL_ERR_H +# pragma once + +# include +# if !OPENSSL_API_3 +# define HEADER_ERR_H +# endif # include diff --git a/include/openssl/evp.h b/include/openssl/evp.h index 857d685f15..564106ceff 100644 --- a/include/openssl/evp.h +++ b/include/openssl/evp.h @@ -9,6 +9,12 @@ #ifndef OPENSSL_EVP_H # define OPENSSL_EVP_H +# pragma once + +# include +# if !OPENSSL_API_3 +# define HEADER_ENVELOPE_H +# endif # include diff --git a/include/openssl/evperr.h b/include/openssl/evperr.h index b7c2a712b2..fefbfb593e 100644 --- a/include/openssl/evperr.h +++ b/include/openssl/evperr.h @@ -10,6 +10,12 @@ #ifndef OPENSSL_EVPERR_H # define OPENSSL_EVPERR_H +# pragma once + +# include +# if !OPENSSL_API_3 +# define HEADER_EVPERR_H +# endif # include # include diff --git a/include/openssl/hmac.h b/include/openssl/hmac.h index 93e6a862ef..8214853e07 100644 --- a/include/openssl/hmac.h +++ b/include/openssl/hmac.h @@ -9,6 +9,12 @@ #ifndef OPENSSL_HMAC_H # define OPENSSL_HMAC_H +# pragma once + +# include +# if !OPENSSL_API_3 +# define HEADER_HMAC_H +# endif # include diff --git a/include/openssl/idea.h b/include/openssl/idea.h index 2fcee23cb1..667865281d 100644 --- a/include/openssl/idea.h +++ b/include/openssl/idea.h @@ -9,6 +9,12 @@ #ifndef OPENSSL_IDEA_H # define OPENSSL_IDEA_H +# pragma once + +# include +# if !OPENSSL_API_3 +# define HEADER_IDEA_H +# endif # include diff --git a/include/openssl/kdf.h b/include/openssl/kdf.h index 0521f72218..864a5533ac 100644 --- a/include/openssl/kdf.h +++ b/include/openssl/kdf.h @@ -9,6 +9,12 @@ #ifndef OPENSSL_KDF_H # define OPENSSL_KDF_H +# pragma once + +# include +# if !OPENSSL_API_3 +# define HEADER_KDF_H +# endif # include # include diff --git a/include/openssl/lhash.h b/include/openssl/lhash.h index c7197c535a..7cf2800dcd 100644 --- a/include/openssl/lhash.h +++ b/include/openssl/lhash.h @@ -13,6 +13,12 @@ #ifndef OPENSSL_LHASH_H # define OPENSSL_LHASH_H +# pragma once + +# include +# if !OPENSSL_API_3 +# define HEADER_LHASH_H +# endif # include # include diff --git a/include/openssl/md2.h b/include/openssl/md2.h index 35531ffac6..005a7bd4fc 100644 --- a/include/openssl/md2.h +++ b/include/openssl/md2.h @@ -9,6 +9,12 @@ #ifndef OPENSSL_MD2_H # define OPENSSL_MD2_H +# pragma once + +# include +# if !OPENSSL_API_3 +# define HEADER_MD2_H +# endif # include diff --git a/include/openssl/md4.h b/include/openssl/md4.h index 893c4655fd..a66db24263 100644 --- a/include/openssl/md4.h +++ b/include/openssl/md4.h @@ -9,6 +9,12 @@ #ifndef OPENSSL_MD4_H # define OPENSSL_MD4_H +# pragma once + +# include +# if !OPENSSL_API_3 +# define HEADER_MD4_H +# endif # include diff --git a/include/openssl/md5.h b/include/openssl/md5.h index b039055b87..78133a3474 100644 --- a/include/openssl/md5.h +++ b/include/openssl/md5.h @@ -9,6 +9,12 @@ #ifndef OPENSSL_MD5_H # define OPENSSL_MD5_H +# pragma once + +# include +# if !OPENSSL_API_3 +# define HEADER_MD5_H +# endif # include diff --git a/include/openssl/mdc2.h b/include/openssl/mdc2.h index e6c0c45b3a..c1dc1cf62d 100644 --- a/include/openssl/mdc2.h +++ b/include/openssl/mdc2.h @@ -9,6 +9,12 @@ #ifndef OPENSSL_MDC2_H # define OPENSSL_MDC2_H +# pragma once + +# include +# if !OPENSSL_API_3 +# define HEADER_MDC2_H +# endif # include diff --git a/include/openssl/modes.h b/include/openssl/modes.h index 6b756847f8..78cc98cd7e 100644 --- a/include/openssl/modes.h +++ b/include/openssl/modes.h @@ -9,6 +9,12 @@ #ifndef OPENSSL_MODES_H # define OPENSSL_MODES_H +# pragma once + +# include +# if !OPENSSL_API_3 +# define HEADER_MODES_H +# endif # include # include diff --git a/include/openssl/objects.h b/include/openssl/objects.h index 3fee89549a..45fa7e683b 100644 --- a/include/openssl/objects.h +++ b/include/openssl/objects.h @@ -9,6 +9,12 @@ #ifndef OPENSSL_OBJECTS_H # define OPENSSL_OBJECTS_H +# pragma once + +# include +# if !OPENSSL_API_3 +# define HEADER_OBJECTS_H +# endif # include # include diff --git a/include/openssl/objectserr.h b/include/openssl/objectserr.h index a68420008d..9aa4acbbc0 100644 --- a/include/openssl/objectserr.h +++ b/include/openssl/objectserr.h @@ -10,6 +10,12 @@ #ifndef OPENSSL_OBJECTSERR_H # define OPENSSL_OBJECTSERR_H +# pragma once + +# include +# if !OPENSSL_API_3 +# define HEADER_OBJERR_H +# endif # include # include diff --git a/include/openssl/ocsp.h b/include/openssl/ocsp.h index bb3fcfb3a1..1cc2cc6bcd 100644 --- a/include/openssl/ocsp.h +++ b/include/openssl/ocsp.h @@ -9,6 +9,12 @@ #ifndef OPENSSL_OCSP_H # define OPENSSL_OCSP_H +# pragma once + +# include +# if !OPENSSL_API_3 +# define HEADER_OCSP_H +# endif #include diff --git a/include/openssl/ocsperr.h b/include/openssl/ocsperr.h index a732138731..fa68f6ef00 100644 --- a/include/openssl/ocsperr.h +++ b/include/openssl/ocsperr.h @@ -10,6 +10,12 @@ #ifndef OPENSSL_OCSPERR_H # define OPENSSL_OCSPERR_H +# pragma once + +# include +# if !OPENSSL_API_3 +# define HEADER_OCSPERR_H +# endif # include # include diff --git a/include/openssl/opensslv.h b/include/openssl/opensslv.h index a4fb47e8a0..cb3eb32d0b 100644 --- a/include/openssl/opensslv.h +++ b/include/openssl/opensslv.h @@ -9,6 +9,12 @@ #ifndef OPENSSL_OPENSSLV_H # define OPENSSL_OPENSSLV_H +# pragma once + +# include +# if !OPENSSL_API_3 +# define HEADER_OPENSSLV_H +# endif # ifdef __cplusplus extern "C" { diff --git a/include/openssl/pem.h b/include/openssl/pem.h index d6e8dcae06..915b5df4ab 100644 --- a/include/openssl/pem.h +++ b/include/openssl/pem.h @@ -9,6 +9,12 @@ #ifndef OPENSSL_PEM_H # define OPENSSL_PEM_H +# pragma once + +# include +# if !OPENSSL_API_3 +# define HEADER_PEM_H +# endif # include # include diff --git a/include/openssl/pem2.h b/include/openssl/pem2.h index c5d4b355a2..baaff3204d 100644 --- a/include/openssl/pem2.h +++ b/include/openssl/pem2.h @@ -9,5 +9,11 @@ #ifndef OPENSSL_PEM2_H # define OPENSSL_PEM2_H +# pragma once + +# include +# if !OPENSSL_API_3 +# define HEADER_PEM2_H +# endif # include #endif diff --git a/include/openssl/pemerr.h b/include/openssl/pemerr.h index 1ca4ceac66..ca1b5d4ae3 100644 --- a/include/openssl/pemerr.h +++ b/include/openssl/pemerr.h @@ -10,6 +10,12 @@ #ifndef OPENSSL_PEMERR_H # define OPENSSL_PEMERR_H +# pragma once + +# include +# if !OPENSSL_API_3 +# define HEADER_PEMERR_H +# endif # include # include diff --git a/include/openssl/pkcs12.h b/include/openssl/pkcs12.h index 931067253c..7fd5827d8a 100644 --- a/include/openssl/pkcs12.h +++ b/include/openssl/pkcs12.h @@ -9,6 +9,12 @@ #ifndef OPENSSL_PKCS12_H # define OPENSSL_PKCS12_H +# pragma once + +# include +# if !OPENSSL_API_3 +# define HEADER_PKCS12_H +# endif # include # include diff --git a/include/openssl/pkcs12err.h b/include/openssl/pkcs12err.h index e08a44b8c5..b994240438 100644 --- a/include/openssl/pkcs12err.h +++ b/include/openssl/pkcs12err.h @@ -10,6 +10,12 @@ #ifndef OPENSSL_PKCS12ERR_H # define OPENSSL_PKCS12ERR_H +# pragma once + +# include +# if !OPENSSL_API_3 +# define HEADER_PKCS12ERR_H +# endif # include # include diff --git a/include/openssl/pkcs7.h b/include/openssl/pkcs7.h index f5b2e086b9..8b208f3700 100644 --- a/include/openssl/pkcs7.h +++ b/include/openssl/pkcs7.h @@ -9,6 +9,12 @@ #ifndef OPENSSL_PKCS7_H # define OPENSSL_PKCS7_H +# pragma once + +# include +# if !OPENSSL_API_3 +# define HEADER_PKCS7_H +# endif # include # include diff --git a/include/openssl/pkcs7err.h b/include/openssl/pkcs7err.h index 24bff6d1ea..e82f6ef83f 100644 --- a/include/openssl/pkcs7err.h +++ b/include/openssl/pkcs7err.h @@ -10,6 +10,12 @@ #ifndef OPENSSL_PKCS7ERR_H # define OPENSSL_PKCS7ERR_H +# pragma once + +# include +# if !OPENSSL_API_3 +# define HEADER_PKCS7ERR_H +# endif # include # include diff --git a/include/openssl/rand.h b/include/openssl/rand.h index e2cf49f97f..974476765d 100644 --- a/include/openssl/rand.h +++ b/include/openssl/rand.h @@ -9,6 +9,12 @@ #ifndef OPENSSL_RAND_H # define OPENSSL_RAND_H +# pragma once + +# include +# if !OPENSSL_API_3 +# define HEADER_RAND_H +# endif # include # include diff --git a/include/openssl/rand_drbg.h b/include/openssl/rand_drbg.h index b557670b8a..0aef0da5a3 100644 --- a/include/openssl/rand_drbg.h +++ b/include/openssl/rand_drbg.h @@ -9,6 +9,12 @@ #ifndef OPENSSL_RAND_DRBG_H # define OPENSSL_RAND_DRBG_H +# pragma once + +# include +# if !OPENSSL_API_3 +# define HEADER_DRBG_RAND_H +# endif # include # include diff --git a/include/openssl/randerr.h b/include/openssl/randerr.h index 74fac69b2d..eb952b4ad4 100644 --- a/include/openssl/randerr.h +++ b/include/openssl/randerr.h @@ -10,6 +10,12 @@ #ifndef OPENSSL_RANDERR_H # define OPENSSL_RANDERR_H +# pragma once + +# include +# if !OPENSSL_API_3 +# define HEADER_RANDERR_H +# endif # include # include diff --git a/include/openssl/rc2.h b/include/openssl/rc2.h index 909e5b0d5b..d7be6b49ea 100644 --- a/include/openssl/rc2.h +++ b/include/openssl/rc2.h @@ -9,6 +9,12 @@ #ifndef OPENSSL_RC2_H # define OPENSSL_RC2_H +# pragma once + +# include +# if !OPENSSL_API_3 +# define HEADER_RC2_H +# endif # include diff --git a/include/openssl/rc4.h b/include/openssl/rc4.h index 37509b9ffc..fed6fcae65 100644 --- a/include/openssl/rc4.h +++ b/include/openssl/rc4.h @@ -9,6 +9,12 @@ #ifndef OPENSSL_RC4_H # define OPENSSL_RC4_H +# pragma once + +# include +# if !OPENSSL_API_3 +# define HEADER_RC4_H +# endif # include diff --git a/include/openssl/rc5.h b/include/openssl/rc5.h index 9550df975e..d4d97ed226 100644 --- a/include/openssl/rc5.h +++ b/include/openssl/rc5.h @@ -9,6 +9,12 @@ #ifndef OPENSSL_RC5_H # define OPENSSL_RC5_H +# pragma once + +# include +# if !OPENSSL_API_3 +# define HEADER_RC5_H +# endif # include diff --git a/include/openssl/ripemd.h b/include/openssl/ripemd.h index dfd2ec1b42..7f1dbd2a68 100644 --- a/include/openssl/ripemd.h +++ b/include/openssl/ripemd.h @@ -9,6 +9,12 @@ #ifndef OPENSSL_RIPEMD_H # define OPENSSL_RIPEMD_H +# pragma once + +# include +# if !OPENSSL_API_3 +# define HEADER_RIPEMD_H +# endif # include diff --git a/include/openssl/rsa.h b/include/openssl/rsa.h index 302596c30d..8ddc970396 100644 --- a/include/openssl/rsa.h +++ b/include/openssl/rsa.h @@ -9,6 +9,12 @@ #ifndef OPENSSL_RSA_H # define OPENSSL_RSA_H +# pragma once + +# include +# if !OPENSSL_API_3 +# define HEADER_RSA_H +# endif # include diff --git a/include/openssl/rsaerr.h b/include/openssl/rsaerr.h index d4491866fe..1f685ec8ea 100644 --- a/include/openssl/rsaerr.h +++ b/include/openssl/rsaerr.h @@ -10,6 +10,12 @@ #ifndef OPENSSL_RSAERR_H # define OPENSSL_RSAERR_H +# pragma once + +# include +# if !OPENSSL_API_3 +# define HEADER_RSAERR_H +# endif # include # include diff --git a/include/openssl/safestack.h b/include/openssl/safestack.h index 520f2b4c47..1b7b73d4b5 100644 --- a/include/openssl/safestack.h +++ b/include/openssl/safestack.h @@ -9,6 +9,12 @@ #ifndef OPENSSL_SAFESTACK_H # define OPENSSL_SAFESTACK_H +# pragma once + +# include +# if !OPENSSL_API_3 +# define HEADER_SAFESTACK_H +# endif # include # include diff --git a/include/openssl/seed.h b/include/openssl/seed.h index 795c9158de..9ae2bce1ca 100644 --- a/include/openssl/seed.h +++ b/include/openssl/seed.h @@ -34,6 +34,12 @@ #ifndef OPENSSL_SEED_H # define OPENSSL_SEED_H +# pragma once + +# include +# if !OPENSSL_API_3 +# define HEADER_SEED_H +# endif # include diff --git a/include/openssl/sha.h b/include/openssl/sha.h index 9448713334..5d21bdf0d8 100644 --- a/include/openssl/sha.h +++ b/include/openssl/sha.h @@ -9,6 +9,12 @@ #ifndef OPENSSL_SHA_H # define OPENSSL_SHA_H +# pragma once + +# include +# if !OPENSSL_API_3 +# define HEADER_SHA_H +# endif # include # include diff --git a/include/openssl/srp.h b/include/openssl/srp.h index e65ec36c90..82b4d5b3dd 100644 --- a/include/openssl/srp.h +++ b/include/openssl/srp.h @@ -13,6 +13,12 @@ #ifndef OPENSSL_SRP_H # define OPENSSL_SRP_H +# pragma once + +# include +# if !OPENSSL_API_3 +# define HEADER_SRP_H +# endif #include diff --git a/include/openssl/srtp.h b/include/openssl/srtp.h index fbc6487901..32056cb280 100644 --- a/include/openssl/srtp.h +++ b/include/openssl/srtp.h @@ -15,6 +15,12 @@ #ifndef OPENSSL_SRTP_H # define OPENSSL_SRTP_H +# pragma once + +# include +# if !OPENSSL_API_3 +# define HEADER_D1_SRTP_H +# endif # include diff --git a/include/openssl/ssl.h b/include/openssl/ssl.h index 7783f9482c..35477d9cb7 100644 --- a/include/openssl/ssl.h +++ b/include/openssl/ssl.h @@ -11,6 +11,12 @@ #ifndef OPENSSL_SSL_H # define OPENSSL_SSL_H +# pragma once + +# include +# if !OPENSSL_API_3 +# define HEADER_SSL_H +# endif # include # include diff --git a/include/openssl/ssl2.h b/include/openssl/ssl2.h index 41aad9ae5d..e9b9ba8802 100644 --- a/include/openssl/ssl2.h +++ b/include/openssl/ssl2.h @@ -9,6 +9,12 @@ #ifndef OPENSSL_SSL2_H # define OPENSSL_SSL2_H +# pragma once + +# include +# if !OPENSSL_API_3 +# define HEADER_SSL2_H +# endif #ifdef __cplusplus extern "C" { diff --git a/include/openssl/ssl3.h b/include/openssl/ssl3.h index b89c91176c..63ab2a58e4 100644 --- a/include/openssl/ssl3.h +++ b/include/openssl/ssl3.h @@ -10,6 +10,12 @@ #ifndef OPENSSL_SSL3_H # define OPENSSL_SSL3_H +# pragma once + +# include +# if !OPENSSL_API_3 +# define HEADER_SSL3_H +# endif # include # include diff --git a/include/openssl/sslerr.h b/include/openssl/sslerr.h index ad5cd561f5..87c6465edc 100644 --- a/include/openssl/sslerr.h +++ b/include/openssl/sslerr.h @@ -10,6 +10,12 @@ #ifndef OPENSSL_SSLERR_H # define OPENSSL_SSLERR_H +# pragma once + +# include +# if !OPENSSL_API_3 +# define HEADER_SSLERR_H +# endif # include # include diff --git a/include/openssl/stack.h b/include/openssl/stack.h index 8683e53b48..018e0d0a8b 100644 --- a/include/openssl/stack.h +++ b/include/openssl/stack.h @@ -9,6 +9,12 @@ #ifndef OPENSSL_STACK_H # define OPENSSL_STACK_H +# pragma once + +# include +# if !OPENSSL_API_3 +# define HEADER_STACK_H +# endif #ifdef __cplusplus extern "C" { diff --git a/include/openssl/store.h b/include/openssl/store.h index affa16a0b1..846923e0ea 100644 --- a/include/openssl/store.h +++ b/include/openssl/store.h @@ -9,6 +9,12 @@ #ifndef OPENSSL_STORE_H # define OPENSSL_STORE_H +# pragma once + +# include +# if !OPENSSL_API_3 +# define HEADER_OSSL_STORE_H +# endif # include # include diff --git a/include/openssl/storeerr.h b/include/openssl/storeerr.h index 940beeec68..29e365bcc9 100644 --- a/include/openssl/storeerr.h +++ b/include/openssl/storeerr.h @@ -10,6 +10,12 @@ #ifndef OPENSSL_STOREERR_H # define OPENSSL_STOREERR_H +# pragma once + +# include +# if !OPENSSL_API_3 +# define HEADER_OSSL_STOREERR_H +# endif # include # include diff --git a/include/openssl/symhacks.h b/include/openssl/symhacks.h index 6a477b4ada..abc5df3874 100644 --- a/include/openssl/symhacks.h +++ b/include/openssl/symhacks.h @@ -9,6 +9,12 @@ #ifndef OPENSSL_SYMHACKS_H # define OPENSSL_SYMHACKS_H +# pragma once + +# include +# if !OPENSSL_API_3 +# define HEADER_SYMHACKS_H +# endif # include diff --git a/include/openssl/tls1.h b/include/openssl/tls1.h index 85871aed9c..62a1763623 100644 --- a/include/openssl/tls1.h +++ b/include/openssl/tls1.h @@ -11,6 +11,12 @@ #ifndef OPENSSL_TLS1_H # define OPENSSL_TLS1_H +# pragma once + +# include +# if !OPENSSL_API_3 +# define HEADER_TLS1_H +# endif # include # include diff --git a/include/openssl/ts.h b/include/openssl/ts.h index 4af1feb52d..231d6052f9 100644 --- a/include/openssl/ts.h +++ b/include/openssl/ts.h @@ -9,6 +9,12 @@ #ifndef OPENSSL_TS_H # define OPENSSL_TS_H +# pragma once + +# include +# if !OPENSSL_API_3 +# define HEADER_TS_H +# endif # include diff --git a/include/openssl/tserr.h b/include/openssl/tserr.h index 8846343aec..6da6946ffc 100644 --- a/include/openssl/tserr.h +++ b/include/openssl/tserr.h @@ -10,6 +10,12 @@ #ifndef OPENSSL_TSERR_H # define OPENSSL_TSERR_H +# pragma once + +# include +# if !OPENSSL_API_3 +# define HEADER_TSERR_H +# endif # include # include diff --git a/include/openssl/txt_db.h b/include/openssl/txt_db.h index 39d4a3a487..cb646450ca 100644 --- a/include/openssl/txt_db.h +++ b/include/openssl/txt_db.h @@ -9,6 +9,12 @@ #ifndef OPENSSL_TXT_DB_H # define OPENSSL_TXT_DB_H +# pragma once + +# include +# if !OPENSSL_API_3 +# define HEADER_TXT_DB_H +# endif # include # include diff --git a/include/openssl/ui.h b/include/openssl/ui.h index 23e27bc053..a084402c68 100644 --- a/include/openssl/ui.h +++ b/include/openssl/ui.h @@ -9,6 +9,12 @@ #ifndef OPENSSL_UI_H # define OPENSSL_UI_H +# pragma once + +# include +# if !OPENSSL_API_3 +# define HEADER_UI_H +# endif # include diff --git a/include/openssl/uierr.h b/include/openssl/uierr.h index 55340de899..36567dce45 100644 --- a/include/openssl/uierr.h +++ b/include/openssl/uierr.h @@ -10,6 +10,12 @@ #ifndef OPENSSL_UIERR_H # define OPENSSL_UIERR_H +# pragma once + +# include +# if !OPENSSL_API_3 +# define HEADER_UIERR_H +# endif # include # include diff --git a/include/openssl/whrlpool.h b/include/openssl/whrlpool.h index 84bdabf9d4..f375607a36 100644 --- a/include/openssl/whrlpool.h +++ b/include/openssl/whrlpool.h @@ -9,6 +9,12 @@ #ifndef OPENSSL_WHRLPOOL_H # define OPENSSL_WHRLPOOL_H +# pragma once + +# include +# if !OPENSSL_API_3 +# define HEADER_WHRLPOOL_H +# endif #include diff --git a/include/openssl/x509.h b/include/openssl/x509.h index 1b0278fd67..3b9c7ad506 100644 --- a/include/openssl/x509.h +++ b/include/openssl/x509.h @@ -10,6 +10,12 @@ #ifndef OPENSSL_X509_H # define OPENSSL_X509_H +# pragma once + +# include +# if !OPENSSL_API_3 +# define HEADER_X509_H +# endif # include # include diff --git a/include/openssl/x509_vfy.h b/include/openssl/x509_vfy.h index 81b50521d1..e16ad1d7c0 100644 --- a/include/openssl/x509_vfy.h +++ b/include/openssl/x509_vfy.h @@ -9,6 +9,12 @@ #ifndef OPENSSL_X509_VFY_H # define OPENSSL_X509_VFY_H +# pragma once + +# include +# if !OPENSSL_API_3 +# define HEADER_X509_VFY_H +# endif /* * Protect against recursion, x509.h and x509_vfy.h each include the other. diff --git a/include/openssl/x509err.h b/include/openssl/x509err.h index e28caa297e..19eb3ddcf1 100644 --- a/include/openssl/x509err.h +++ b/include/openssl/x509err.h @@ -10,6 +10,12 @@ #ifndef OPENSSL_X509ERR_H # define OPENSSL_X509ERR_H +# pragma once + +# include +# if !OPENSSL_API_3 +# define HEADER_X509ERR_H +# endif # include # include diff --git a/include/openssl/x509v3.h b/include/openssl/x509v3.h index e276f1d2f5..419dc795dd 100644 --- a/include/openssl/x509v3.h +++ b/include/openssl/x509v3.h @@ -9,6 +9,12 @@ #ifndef OPENSSL_X509V3_H # define OPENSSL_X509V3_H +# pragma once + +# include +# if !OPENSSL_API_3 +# define HEADER_X509V3_H +# endif # include # include diff --git a/include/openssl/x509v3err.h b/include/openssl/x509v3err.h index 74e59540b9..f5f7e0bf2c 100644 --- a/include/openssl/x509v3err.h +++ b/include/openssl/x509v3err.h @@ -10,6 +10,12 @@ #ifndef OPENSSL_X509V3ERR_H # define OPENSSL_X509V3ERR_H +# pragma once + +# include +# if !OPENSSL_API_3 +# define HEADER_X509V3ERR_H +# endif # include # include -- 2.40.0