Add legacy include guards to public header files
authorDr. Matthias St. Pierre <Matthias.St.Pierre@ncp-e.com>
Fri, 27 Sep 2019 22:46:00 +0000 (00:46 +0200)
committerDr. Matthias St. Pierre <Matthias.St.Pierre@ncp-e.com>
Sat, 28 Sep 2019 18:26:37 +0000 (20:26 +0200)
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 <openssl/macros.h>
    # 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 <openssl/file.h>
    #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 <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/9333)

97 files changed:
include/openssl/aes.h
include/openssl/asn1.h
include/openssl/asn1err.h
include/openssl/asn1t.h
include/openssl/async.h
include/openssl/asyncerr.h
include/openssl/bio.h
include/openssl/bioerr.h
include/openssl/blowfish.h
include/openssl/bn.h
include/openssl/bnerr.h
include/openssl/buffer.h
include/openssl/buffererr.h
include/openssl/camellia.h
include/openssl/cast.h
include/openssl/cmac.h
include/openssl/cms.h
include/openssl/cmserr.h
include/openssl/comp.h
include/openssl/comperr.h
include/openssl/conf.h
include/openssl/conf_api.h
include/openssl/conferr.h
include/openssl/crypto.h
include/openssl/cryptoerr.h
include/openssl/ct.h
include/openssl/cterr.h
include/openssl/des.h
include/openssl/dh.h
include/openssl/dherr.h
include/openssl/dsa.h
include/openssl/dsaerr.h
include/openssl/dtls1.h
include/openssl/e_os2.h
include/openssl/ebcdic.h
include/openssl/ec.h
include/openssl/ecerr.h
include/openssl/engine.h
include/openssl/engineerr.h
include/openssl/err.h
include/openssl/evp.h
include/openssl/evperr.h
include/openssl/hmac.h
include/openssl/idea.h
include/openssl/kdf.h
include/openssl/lhash.h
include/openssl/md2.h
include/openssl/md4.h
include/openssl/md5.h
include/openssl/mdc2.h
include/openssl/modes.h
include/openssl/objects.h
include/openssl/objectserr.h
include/openssl/ocsp.h
include/openssl/ocsperr.h
include/openssl/opensslv.h
include/openssl/pem.h
include/openssl/pem2.h
include/openssl/pemerr.h
include/openssl/pkcs12.h
include/openssl/pkcs12err.h
include/openssl/pkcs7.h
include/openssl/pkcs7err.h
include/openssl/rand.h
include/openssl/rand_drbg.h
include/openssl/randerr.h
include/openssl/rc2.h
include/openssl/rc4.h
include/openssl/rc5.h
include/openssl/ripemd.h
include/openssl/rsa.h
include/openssl/rsaerr.h
include/openssl/safestack.h
include/openssl/seed.h
include/openssl/sha.h
include/openssl/srp.h
include/openssl/srtp.h
include/openssl/ssl.h
include/openssl/ssl2.h
include/openssl/ssl3.h
include/openssl/sslerr.h
include/openssl/stack.h
include/openssl/store.h
include/openssl/storeerr.h
include/openssl/symhacks.h
include/openssl/tls1.h
include/openssl/ts.h
include/openssl/tserr.h
include/openssl/txt_db.h
include/openssl/ui.h
include/openssl/uierr.h
include/openssl/whrlpool.h
include/openssl/x509.h
include/openssl/x509_vfy.h
include/openssl/x509err.h
include/openssl/x509v3.h
include/openssl/x509v3err.h

index 672bcfb..4e93d3d 100644 (file)
@@ -9,6 +9,12 @@
 
 #ifndef OPENSSL_AES_H
 # define OPENSSL_AES_H
+# pragma once
+
+# include <openssl/macros.h>
+# if !OPENSSL_API_3
+#  define HEADER_AES_H
+# endif
 
 # include <openssl/opensslconf.h>
 
index 6389722..32d39c1 100644 (file)
@@ -9,6 +9,12 @@
 
 #ifndef OPENSSL_ASN1_H
 # define OPENSSL_ASN1_H
+# pragma once
+
+# include <openssl/macros.h>
+# if !OPENSSL_API_3
+#  define HEADER_ASN1_H
+# endif
 
 # include <time.h>
 # include <openssl/e_os2.h>
index 944f7ca..9166f17 100644 (file)
 
 #ifndef OPENSSL_ASN1ERR_H
 # define OPENSSL_ASN1ERR_H
+# pragma once
+
+# include <openssl/macros.h>
+# if !OPENSSL_API_3
+#  define HEADER_ASN1ERR_H
+# endif
 
 # include <openssl/opensslconf.h>
 # include <openssl/symhacks.h>
index 0556d3c..00ccdf5 100644 (file)
@@ -9,6 +9,12 @@
 
 #ifndef OPENSSL_ASN1T_H
 # define OPENSSL_ASN1T_H
+# pragma once
+
+# include <openssl/macros.h>
+# if !OPENSSL_API_3
+#  define HEADER_ASN1T_H
+# endif
 
 # include <stddef.h>
 # include <openssl/e_os2.h>
index 9ed41db..e372e43 100644 (file)
 
 #ifndef OPENSSL_ASYNC_H
 # define OPENSSL_ASYNC_H
+# pragma once
+
+# include <openssl/macros.h>
+# if !OPENSSL_API_3
+#  define HEADER_ASYNC_H
+# endif
 
 #if defined(_WIN32)
 # if defined(BASETYPES) || defined(_WINDEF_H)
index 3c2e14d..8e8c66f 100644 (file)
 
 #ifndef OPENSSL_ASYNCERR_H
 # define OPENSSL_ASYNCERR_H
+# pragma once
+
+# include <openssl/macros.h>
+# if !OPENSSL_API_3
+#  define HEADER_ASYNCERR_H
+# endif
 
 # include <openssl/opensslconf.h>
 # include <openssl/symhacks.h>
index e841656..9fb8095 100644 (file)
@@ -9,6 +9,12 @@
 
 #ifndef OPENSSL_BIO_H
 # define OPENSSL_BIO_H
+# pragma once
+
+# include <openssl/macros.h>
+# if !OPENSSL_API_3
+#  define HEADER_BIO_H
+# endif
 
 # include <openssl/e_os2.h>
 
index f2ed705..2f4dd33 100644 (file)
 
 #ifndef OPENSSL_BIOERR_H
 # define OPENSSL_BIOERR_H
+# pragma once
+
+# include <openssl/macros.h>
+# if !OPENSSL_API_3
+#  define HEADER_BIOERR_H
+# endif
 
 # include <openssl/opensslconf.h>
 # include <openssl/symhacks.h>
index 1445a5f..6532915 100644 (file)
@@ -9,6 +9,12 @@
 
 #ifndef OPENSSL_BLOWFISH_H
 # define OPENSSL_BLOWFISH_H
+# pragma once
+
+# include <openssl/macros.h>
+# if !OPENSSL_API_3
+#  define HEADER_BLOWFISH_H
+# endif
 
 # include <openssl/opensslconf.h>
 
index 8ece005..12fbcda 100644 (file)
 
 #ifndef OPENSSL_BN_H
 # define OPENSSL_BN_H
+# pragma once
+
+# include <openssl/macros.h>
+# if !OPENSSL_API_3
+#  define HEADER_BN_H
+# endif
 
 # include <openssl/e_os2.h>
 # ifndef OPENSSL_NO_STDIO
index 9e32edb..a4b666f 100644 (file)
 
 #ifndef OPENSSL_BNERR_H
 # define OPENSSL_BNERR_H
+# pragma once
+
+# include <openssl/macros.h>
+# if !OPENSSL_API_3
+#  define HEADER_BNERR_H
+# endif
 
 # include <openssl/opensslconf.h>
 # include <openssl/symhacks.h>
index f5cc3c5..c3cf216 100644 (file)
@@ -9,6 +9,12 @@
 
 #ifndef OPENSSL_BUFFER_H
 # define OPENSSL_BUFFER_H
+# pragma once
+
+# include <openssl/macros.h>
+# if !OPENSSL_API_3
+#  define HEADER_BUFFER_H
+# endif
 
 # include <openssl/types.h>
 # ifndef OPENSSL_CRYPTO_H
index 24a0a36..fbe0d99 100644 (file)
 
 #ifndef OPENSSL_BUFFERERR_H
 # define OPENSSL_BUFFERERR_H
+# pragma once
+
+# include <openssl/macros.h>
+# if !OPENSSL_API_3
+#  define HEADER_BUFERR_H
+# endif
 
 # include <openssl/opensslconf.h>
 # include <openssl/symhacks.h>
index 5b6648b..23605cf 100644 (file)
@@ -9,6 +9,12 @@
 
 #ifndef OPENSSL_CAMELLIA_H
 # define OPENSSL_CAMELLIA_H
+# pragma once
+
+# include <openssl/macros.h>
+# if !OPENSSL_API_3
+#  define HEADER_CAMELLIA_H
+# endif
 
 # include <openssl/opensslconf.h>
 
index c14c697..a1aad6b 100644 (file)
@@ -9,6 +9,12 @@
 
 #ifndef OPENSSL_CAST_H
 # define OPENSSL_CAST_H
+# pragma once
+
+# include <openssl/macros.h>
+# if !OPENSSL_API_3
+#  define HEADER_CAST_H
+# endif
 
 # include <openssl/opensslconf.h>
 
index c8802ec..426536f 100644 (file)
@@ -9,6 +9,12 @@
 
 #ifndef OPENSSL_CMAC_H
 # define OPENSSL_CMAC_H
+# pragma once
+
+# include <openssl/macros.h>
+# if !OPENSSL_API_3
+#  define HEADER_CMAC_H
+# endif
 
 # ifndef OPENSSL_NO_CMAC
 
index 5209d39..cf4ad37 100644 (file)
@@ -9,6 +9,12 @@
 
 #ifndef OPENSSL_CMS_H
 # define OPENSSL_CMS_H
+# pragma once
+
+# include <openssl/macros.h>
+# if !OPENSSL_API_3
+#  define HEADER_CMS_H
+# endif
 
 # include <openssl/opensslconf.h>
 
index 472ca3d..407bdfd 100644 (file)
 
 #ifndef OPENSSL_CMSERR_H
 # define OPENSSL_CMSERR_H
+# pragma once
+
+# include <openssl/macros.h>
+# if !OPENSSL_API_3
+#  define HEADER_CMSERR_H
+# endif
 
 # include <openssl/opensslconf.h>
 # include <openssl/symhacks.h>
index eac825f..47f782b 100644 (file)
@@ -9,6 +9,12 @@
 
 #ifndef OPENSSL_COMP_H
 # define OPENSSL_COMP_H
+# pragma once
+
+# include <openssl/macros.h>
+# if !OPENSSL_API_3
+#  define HEADER_COMP_H
+# endif
 
 # include <openssl/opensslconf.h>
 
index 6fb872a..89faccb 100644 (file)
 
 #ifndef OPENSSL_COMPERR_H
 # define OPENSSL_COMPERR_H
+# pragma once
+
+# include <openssl/macros.h>
+# if !OPENSSL_API_3
+#  define HEADER_COMPERR_H
+# endif
 
 # include <openssl/opensslconf.h>
 # include <openssl/symhacks.h>
index c987c42..b2f93dd 100644 (file)
@@ -9,6 +9,12 @@
 
 #ifndef  OPENSSL_CONF_H
 # define OPENSSL_CONF_H
+# pragma once
+
+# include <openssl/macros.h>
+# if !OPENSSL_API_3
+#  define HEADER_CONF_H
+# endif
 
 # include <openssl/bio.h>
 # include <openssl/lhash.h>
index 7856ca0..4307693 100644 (file)
@@ -9,6 +9,12 @@
 
 #ifndef  OPENSSL_CONF_API_H
 # define OPENSSL_CONF_API_H
+# pragma once
+
+# include <openssl/macros.h>
+# if !OPENSSL_API_3
+#  define HEADER_CONF_API_H
+# endif
 
 # include <openssl/lhash.h>
 # include <openssl/conf.h>
index 848a6ce..4bf5b9e 100644 (file)
 
 #ifndef OPENSSL_CONFERR_H
 # define OPENSSL_CONFERR_H
+# pragma once
+
+# include <openssl/macros.h>
+# if !OPENSSL_API_3
+#  define HEADER_CONFERR_H
+# endif
 
 # include <openssl/opensslconf.h>
 # include <openssl/symhacks.h>
index 6e5dae8..9fb2fa3 100644 (file)
 
 #ifndef OPENSSL_CRYPTO_H
 # define OPENSSL_CRYPTO_H
+# pragma once
+
+# include <openssl/macros.h>
+# if !OPENSSL_API_3
+#  define HEADER_CRYPTO_H
+# endif
 
 # include <stdlib.h>
 # include <time.h>
index 497735e..99872af 100644 (file)
 
 #ifndef OPENSSL_CRYPTOERR_H
 # define OPENSSL_CRYPTOERR_H
+# pragma once
+
+# include <openssl/macros.h>
+# if !OPENSSL_API_3
+#  define HEADER_CRYPTOERR_H
+# endif
 
 # include <openssl/opensslconf.h>
 # include <openssl/symhacks.h>
index 084fd36..17271d6 100644 (file)
@@ -9,6 +9,12 @@
 
 #ifndef OPENSSL_CT_H
 # define OPENSSL_CT_H
+# pragma once
+
+# include <openssl/macros.h>
+# if !OPENSSL_API_3
+#  define HEADER_CT_H
+# endif
 
 # include <openssl/opensslconf.h>
 
index 69e08a9..c5c646c 100644 (file)
 
 #ifndef OPENSSL_CTERR_H
 # define OPENSSL_CTERR_H
+# pragma once
+
+# include <openssl/macros.h>
+# if !OPENSSL_API_3
+#  define HEADER_CTERR_H
+# endif
 
 # include <openssl/opensslconf.h>
 # include <openssl/symhacks.h>
index c0361dd..0a874f4 100644 (file)
@@ -9,6 +9,12 @@
 
 #ifndef OPENSSL_DES_H
 # define OPENSSL_DES_H
+# pragma once
+
+# include <openssl/macros.h>
+# if !OPENSSL_API_3
+#  define HEADER_DES_H
+# endif
 
 # include <openssl/opensslconf.h>
 
index 64189ed..84f4f07 100644 (file)
@@ -9,6 +9,12 @@
 
 #ifndef OPENSSL_DH_H
 # define OPENSSL_DH_H
+# pragma once
+
+# include <openssl/macros.h>
+# if !OPENSSL_API_3
+#  define HEADER_DH_H
+# endif
 
 # include <openssl/opensslconf.h>
 
index 4003f79..a926dab 100644 (file)
 
 #ifndef OPENSSL_DHERR_H
 # define OPENSSL_DHERR_H
+# pragma once
+
+# include <openssl/macros.h>
+# if !OPENSSL_API_3
+#  define HEADER_DHERR_H
+# endif
 
 # include <openssl/opensslconf.h>
 # include <openssl/symhacks.h>
index c5a3635..f14be28 100644 (file)
@@ -9,6 +9,12 @@
 
 #ifndef OPENSSL_DSA_H
 # define OPENSSL_DSA_H
+# pragma once
+
+# include <openssl/macros.h>
+# if !OPENSSL_API_3
+#  define HEADER_DSA_H
+# endif
 
 # include <openssl/opensslconf.h>
 
index 3d16c09..9e0d5cf 100644 (file)
 
 #ifndef OPENSSL_DSAERR_H
 # define OPENSSL_DSAERR_H
+# pragma once
+
+# include <openssl/macros.h>
+# if !OPENSSL_API_3
+#  define HEADER_DSAERR_H
+# endif
 
 # include <openssl/opensslconf.h>
 # include <openssl/symhacks.h>
index b4c3631..d535c05 100644 (file)
@@ -9,6 +9,12 @@
 
 #ifndef OPENSSL_DTLS1_H
 # define OPENSSL_DTLS1_H
+# pragma once
+
+# include <openssl/macros.h>
+# if !OPENSSL_API_3
+#  define HEADER_DTLS1_H
+# endif
 
 #ifdef  __cplusplus
 extern "C" {
index 740cf55..69a5091 100644 (file)
@@ -9,6 +9,12 @@
 
 #ifndef OPENSSL_E_OS2_H
 # define OPENSSL_E_OS2_H
+# pragma once
+
+# include <openssl/macros.h>
+# if !OPENSSL_API_3
+#  define HEADER_E_OS2_H
+# endif
 
 # include <openssl/opensslconf.h>
 
index 6805806..a75a71d 100644 (file)
@@ -9,6 +9,12 @@
 
 #ifndef OPENSSL_EBCDIC_H
 # define OPENSSL_EBCDIC_H
+# pragma once
+
+# include <openssl/macros.h>
+# if !OPENSSL_API_3
+#  define HEADER_EBCDIC_H
+# endif
 
 # include <stdlib.h>
 
index 2a66928..11999b4 100644 (file)
 
 #ifndef OPENSSL_EC_H
 # define OPENSSL_EC_H
+# pragma once
+
+# include <openssl/macros.h>
+# if !OPENSSL_API_3
+#  define HEADER_EC_H
+# endif
 
 # include <openssl/opensslconf.h>
 
index 17b418b..07ef524 100644 (file)
 
 #ifndef OPENSSL_ECERR_H
 # define OPENSSL_ECERR_H
+# pragma once
+
+# include <openssl/macros.h>
+# if !OPENSSL_API_3
+#  define HEADER_ECERR_H
+# endif
 
 # include <openssl/opensslconf.h>
 # include <openssl/symhacks.h>
index fc294ec..816eb4e 100644 (file)
 
 #ifndef OPENSSL_ENGINE_H
 # define OPENSSL_ENGINE_H
+# pragma once
+
+# include <openssl/macros.h>
+# if !OPENSSL_API_3
+#  define HEADER_ENGINE_H
+# endif
 
 # include <openssl/opensslconf.h>
 
index 2db61b5..27b2df6 100644 (file)
 
 #ifndef OPENSSL_ENGINEERR_H
 # define OPENSSL_ENGINEERR_H
+# pragma once
+
+# include <openssl/macros.h>
+# if !OPENSSL_API_3
+#  define HEADER_ENGINEERR_H
+# endif
 
 # include <openssl/opensslconf.h>
 # include <openssl/symhacks.h>
index f837c3a..fc7ead8 100644 (file)
@@ -9,6 +9,12 @@
 
 #ifndef OPENSSL_ERR_H
 # define OPENSSL_ERR_H
+# pragma once
+
+# include <openssl/macros.h>
+# if !OPENSSL_API_3
+#  define HEADER_ERR_H
+# endif
 
 # include <openssl/e_os2.h>
 
index 857d685..564106c 100644 (file)
@@ -9,6 +9,12 @@
 
 #ifndef OPENSSL_EVP_H
 # define OPENSSL_EVP_H
+# pragma once
+
+# include <openssl/macros.h>
+# if !OPENSSL_API_3
+#  define HEADER_ENVELOPE_H
+# endif
 
 # include <stdarg.h>
 
index b7c2a71..fefbfb5 100644 (file)
 
 #ifndef OPENSSL_EVPERR_H
 # define OPENSSL_EVPERR_H
+# pragma once
+
+# include <openssl/macros.h>
+# if !OPENSSL_API_3
+#  define HEADER_EVPERR_H
+# endif
 
 # include <openssl/opensslconf.h>
 # include <openssl/symhacks.h>
index 93e6a86..8214853 100644 (file)
@@ -9,6 +9,12 @@
 
 #ifndef OPENSSL_HMAC_H
 # define OPENSSL_HMAC_H
+# pragma once
+
+# include <openssl/macros.h>
+# if !OPENSSL_API_3
+#  define HEADER_HMAC_H
+# endif
 
 # include <openssl/opensslconf.h>
 
index 2fcee23..6678652 100644 (file)
@@ -9,6 +9,12 @@
 
 #ifndef OPENSSL_IDEA_H
 # define OPENSSL_IDEA_H
+# pragma once
+
+# include <openssl/macros.h>
+# if !OPENSSL_API_3
+#  define HEADER_IDEA_H
+# endif
 
 # include <openssl/opensslconf.h>
 
index 0521f72..864a553 100644 (file)
@@ -9,6 +9,12 @@
 
 #ifndef OPENSSL_KDF_H
 # define OPENSSL_KDF_H
+# pragma once
+
+# include <openssl/macros.h>
+# if !OPENSSL_API_3
+#  define HEADER_KDF_H
+# endif
 
 # include <stdarg.h>
 # include <stddef.h>
index c7197c5..7cf2800 100644 (file)
 
 #ifndef OPENSSL_LHASH_H
 # define OPENSSL_LHASH_H
+# pragma once
+
+# include <openssl/macros.h>
+# if !OPENSSL_API_3
+#  define HEADER_LHASH_H
+# endif
 
 # include <openssl/e_os2.h>
 # include <openssl/bio.h>
index 35531ff..005a7bd 100644 (file)
@@ -9,6 +9,12 @@
 
 #ifndef OPENSSL_MD2_H
 # define OPENSSL_MD2_H
+# pragma once
+
+# include <openssl/macros.h>
+# if !OPENSSL_API_3
+#  define HEADER_MD2_H
+# endif
 
 # include <openssl/opensslconf.h>
 
index 893c465..a66db24 100644 (file)
@@ -9,6 +9,12 @@
 
 #ifndef OPENSSL_MD4_H
 # define OPENSSL_MD4_H
+# pragma once
+
+# include <openssl/macros.h>
+# if !OPENSSL_API_3
+#  define HEADER_MD4_H
+# endif
 
 # include <openssl/opensslconf.h>
 
index b039055..78133a3 100644 (file)
@@ -9,6 +9,12 @@
 
 #ifndef OPENSSL_MD5_H
 # define OPENSSL_MD5_H
+# pragma once
+
+# include <openssl/macros.h>
+# if !OPENSSL_API_3
+#  define HEADER_MD5_H
+# endif
 
 # include <openssl/opensslconf.h>
 
index e6c0c45..c1dc1cf 100644 (file)
@@ -9,6 +9,12 @@
 
 #ifndef OPENSSL_MDC2_H
 # define OPENSSL_MDC2_H
+# pragma once
+
+# include <openssl/macros.h>
+# if !OPENSSL_API_3
+#  define HEADER_MDC2_H
+# endif
 
 # include <openssl/opensslconf.h>
 
index 6b75684..78cc98c 100644 (file)
@@ -9,6 +9,12 @@
 
 #ifndef OPENSSL_MODES_H
 # define OPENSSL_MODES_H
+# pragma once
+
+# include <openssl/macros.h>
+# if !OPENSSL_API_3
+#  define HEADER_MODES_H
+# endif
 
 # include <stddef.h>
 # include <openssl/types.h>
index 3fee895..45fa7e6 100644 (file)
@@ -9,6 +9,12 @@
 
 #ifndef OPENSSL_OBJECTS_H
 # define OPENSSL_OBJECTS_H
+# pragma once
+
+# include <openssl/macros.h>
+# if !OPENSSL_API_3
+#  define HEADER_OBJECTS_H
+# endif
 
 # include <openssl/obj_mac.h>
 # include <openssl/bio.h>
index a684200..9aa4acb 100644 (file)
 
 #ifndef OPENSSL_OBJECTSERR_H
 # define OPENSSL_OBJECTSERR_H
+# pragma once
+
+# include <openssl/macros.h>
+# if !OPENSSL_API_3
+#  define HEADER_OBJERR_H
+# endif
 
 # include <openssl/opensslconf.h>
 # include <openssl/symhacks.h>
index bb3fcfb..1cc2cc6 100644 (file)
@@ -9,6 +9,12 @@
 
 #ifndef OPENSSL_OCSP_H
 # define OPENSSL_OCSP_H
+# pragma once
+
+# include <openssl/macros.h>
+# if !OPENSSL_API_3
+#  define HEADER_OCSP_H
+# endif
 
 #include <openssl/opensslconf.h>
 
index a732138..fa68f6e 100644 (file)
 
 #ifndef OPENSSL_OCSPERR_H
 # define OPENSSL_OCSPERR_H
+# pragma once
+
+# include <openssl/macros.h>
+# if !OPENSSL_API_3
+#  define HEADER_OCSPERR_H
+# endif
 
 # include <openssl/opensslconf.h>
 # include <openssl/symhacks.h>
index a4fb47e..cb3eb32 100644 (file)
@@ -9,6 +9,12 @@
 
 #ifndef OPENSSL_OPENSSLV_H
 # define OPENSSL_OPENSSLV_H
+# pragma once
+
+# include <openssl/macros.h>
+# if !OPENSSL_API_3
+#  define HEADER_OPENSSLV_H
+# endif
 
 # ifdef  __cplusplus
 extern "C" {
index d6e8dca..915b5df 100644 (file)
@@ -9,6 +9,12 @@
 
 #ifndef OPENSSL_PEM_H
 # define OPENSSL_PEM_H
+# pragma once
+
+# include <openssl/macros.h>
+# if !OPENSSL_API_3
+#  define HEADER_PEM_H
+# endif
 
 # include <openssl/e_os2.h>
 # include <openssl/bio.h>
index c5d4b35..baaff32 100644 (file)
@@ -9,5 +9,11 @@
 
 #ifndef OPENSSL_PEM2_H
 # define OPENSSL_PEM2_H
+# pragma once
+
+# include <openssl/macros.h>
+# if !OPENSSL_API_3
+#  define HEADER_PEM2_H
+# endif
 # include <openssl/pemerr.h>
 #endif
index 1ca4cea..ca1b5d4 100644 (file)
 
 #ifndef OPENSSL_PEMERR_H
 # define OPENSSL_PEMERR_H
+# pragma once
+
+# include <openssl/macros.h>
+# if !OPENSSL_API_3
+#  define HEADER_PEMERR_H
+# endif
 
 # include <openssl/opensslconf.h>
 # include <openssl/symhacks.h>
index 9310672..7fd5827 100644 (file)
@@ -9,6 +9,12 @@
 
 #ifndef OPENSSL_PKCS12_H
 # define OPENSSL_PKCS12_H
+# pragma once
+
+# include <openssl/macros.h>
+# if !OPENSSL_API_3
+#  define HEADER_PKCS12_H
+# endif
 
 # include <openssl/bio.h>
 # include <openssl/x509.h>
index e08a44b..b994240 100644 (file)
 
 #ifndef OPENSSL_PKCS12ERR_H
 # define OPENSSL_PKCS12ERR_H
+# pragma once
+
+# include <openssl/macros.h>
+# if !OPENSSL_API_3
+#  define HEADER_PKCS12ERR_H
+# endif
 
 # include <openssl/opensslconf.h>
 # include <openssl/symhacks.h>
index f5b2e08..8b208f3 100644 (file)
@@ -9,6 +9,12 @@
 
 #ifndef OPENSSL_PKCS7_H
 # define OPENSSL_PKCS7_H
+# pragma once
+
+# include <openssl/macros.h>
+# if !OPENSSL_API_3
+#  define HEADER_PKCS7_H
+# endif
 
 # include <openssl/asn1.h>
 # include <openssl/bio.h>
index 24bff6d..e82f6ef 100644 (file)
 
 #ifndef OPENSSL_PKCS7ERR_H
 # define OPENSSL_PKCS7ERR_H
+# pragma once
+
+# include <openssl/macros.h>
+# if !OPENSSL_API_3
+#  define HEADER_PKCS7ERR_H
+# endif
 
 # include <openssl/opensslconf.h>
 # include <openssl/symhacks.h>
index e2cf49f..9744767 100644 (file)
@@ -9,6 +9,12 @@
 
 #ifndef OPENSSL_RAND_H
 # define OPENSSL_RAND_H
+# pragma once
+
+# include <openssl/macros.h>
+# if !OPENSSL_API_3
+#  define HEADER_RAND_H
+# endif
 
 # include <stdlib.h>
 # include <openssl/types.h>
index b557670..0aef0da 100644 (file)
@@ -9,6 +9,12 @@
 
 #ifndef OPENSSL_RAND_DRBG_H
 # define OPENSSL_RAND_DRBG_H
+# pragma once
+
+# include <openssl/macros.h>
+# if !OPENSSL_API_3
+#  define HEADER_DRBG_RAND_H
+# endif
 
 # include <time.h>
 # include <openssl/types.h>
index 74fac69..eb952b4 100644 (file)
 
 #ifndef OPENSSL_RANDERR_H
 # define OPENSSL_RANDERR_H
+# pragma once
+
+# include <openssl/macros.h>
+# if !OPENSSL_API_3
+#  define HEADER_RANDERR_H
+# endif
 
 # include <openssl/opensslconf.h>
 # include <openssl/symhacks.h>
index 909e5b0..d7be6b4 100644 (file)
@@ -9,6 +9,12 @@
 
 #ifndef OPENSSL_RC2_H
 # define OPENSSL_RC2_H
+# pragma once
+
+# include <openssl/macros.h>
+# if !OPENSSL_API_3
+#  define HEADER_RC2_H
+# endif
 
 # include <openssl/opensslconf.h>
 
index 37509b9..fed6fca 100644 (file)
@@ -9,6 +9,12 @@
 
 #ifndef OPENSSL_RC4_H
 # define OPENSSL_RC4_H
+# pragma once
+
+# include <openssl/macros.h>
+# if !OPENSSL_API_3
+#  define HEADER_RC4_H
+# endif
 
 # include <openssl/opensslconf.h>
 
index 9550df9..d4d97ed 100644 (file)
@@ -9,6 +9,12 @@
 
 #ifndef OPENSSL_RC5_H
 # define OPENSSL_RC5_H
+# pragma once
+
+# include <openssl/macros.h>
+# if !OPENSSL_API_3
+#  define HEADER_RC5_H
+# endif
 
 # include <openssl/opensslconf.h>
 
index dfd2ec1..7f1dbd2 100644 (file)
@@ -9,6 +9,12 @@
 
 #ifndef OPENSSL_RIPEMD_H
 # define OPENSSL_RIPEMD_H
+# pragma once
+
+# include <openssl/macros.h>
+# if !OPENSSL_API_3
+#  define HEADER_RIPEMD_H
+# endif
 
 # include <openssl/opensslconf.h>
 
index 302596c..8ddc970 100644 (file)
@@ -9,6 +9,12 @@
 
 #ifndef OPENSSL_RSA_H
 # define OPENSSL_RSA_H
+# pragma once
+
+# include <openssl/macros.h>
+# if !OPENSSL_API_3
+#  define HEADER_RSA_H
+# endif
 
 # include <openssl/opensslconf.h>
 
index d449186..1f685ec 100644 (file)
 
 #ifndef OPENSSL_RSAERR_H
 # define OPENSSL_RSAERR_H
+# pragma once
+
+# include <openssl/macros.h>
+# if !OPENSSL_API_3
+#  define HEADER_RSAERR_H
+# endif
 
 # include <openssl/opensslconf.h>
 # include <openssl/symhacks.h>
index 520f2b4..1b7b73d 100644 (file)
@@ -9,6 +9,12 @@
 
 #ifndef OPENSSL_SAFESTACK_H
 # define OPENSSL_SAFESTACK_H
+# pragma once
+
+# include <openssl/macros.h>
+# if !OPENSSL_API_3
+#  define HEADER_SAFESTACK_H
+# endif
 
 # include <openssl/stack.h>
 # include <openssl/e_os2.h>
index 795c915..9ae2bce 100644 (file)
 
 #ifndef OPENSSL_SEED_H
 # define OPENSSL_SEED_H
+# pragma once
+
+# include <openssl/macros.h>
+# if !OPENSSL_API_3
+#  define HEADER_SEED_H
+# endif
 
 # include <openssl/opensslconf.h>
 
index 9448713..5d21bdf 100644 (file)
@@ -9,6 +9,12 @@
 
 #ifndef OPENSSL_SHA_H
 # define OPENSSL_SHA_H
+# pragma once
+
+# include <openssl/macros.h>
+# if !OPENSSL_API_3
+#  define HEADER_SHA_H
+# endif
 
 # include <openssl/e_os2.h>
 # include <stddef.h>
index e65ec36..82b4d5b 100644 (file)
 
 #ifndef OPENSSL_SRP_H
 # define OPENSSL_SRP_H
+# pragma once
+
+# include <openssl/macros.h>
+# if !OPENSSL_API_3
+#  define HEADER_SRP_H
+# endif
 
 #include <openssl/opensslconf.h>
 
index fbc6487..32056cb 100644 (file)
 
 #ifndef OPENSSL_SRTP_H
 # define OPENSSL_SRTP_H
+# pragma once
+
+# include <openssl/macros.h>
+# if !OPENSSL_API_3
+#  define HEADER_D1_SRTP_H
+# endif
 
 # include <openssl/ssl.h>
 
index 7783f94..35477d9 100644 (file)
 
 #ifndef OPENSSL_SSL_H
 # define OPENSSL_SSL_H
+# pragma once
+
+# include <openssl/macros.h>
+# if !OPENSSL_API_3
+#  define HEADER_SSL_H
+# endif
 
 # include <openssl/e_os2.h>
 # include <openssl/opensslconf.h>
index 41aad9a..e9b9ba8 100644 (file)
@@ -9,6 +9,12 @@
 
 #ifndef OPENSSL_SSL2_H
 # define OPENSSL_SSL2_H
+# pragma once
+
+# include <openssl/macros.h>
+# if !OPENSSL_API_3
+#  define HEADER_SSL2_H
+# endif
 
 #ifdef  __cplusplus
 extern "C" {
index b89c911..63ab2a5 100644 (file)
 
 #ifndef OPENSSL_SSL3_H
 # define OPENSSL_SSL3_H
+# pragma once
+
+# include <openssl/macros.h>
+# if !OPENSSL_API_3
+#  define HEADER_SSL3_H
+# endif
 
 # include <openssl/comp.h>
 # include <openssl/buffer.h>
index ad5cd56..87c6465 100644 (file)
 
 #ifndef OPENSSL_SSLERR_H
 # define OPENSSL_SSLERR_H
+# pragma once
+
+# include <openssl/macros.h>
+# if !OPENSSL_API_3
+#  define HEADER_SSLERR_H
+# endif
 
 # include <openssl/opensslconf.h>
 # include <openssl/symhacks.h>
index 8683e53..018e0d0 100644 (file)
@@ -9,6 +9,12 @@
 
 #ifndef OPENSSL_STACK_H
 # define OPENSSL_STACK_H
+# pragma once
+
+# include <openssl/macros.h>
+# if !OPENSSL_API_3
+#  define HEADER_STACK_H
+# endif
 
 #ifdef  __cplusplus
 extern "C" {
index affa16a..846923e 100644 (file)
@@ -9,6 +9,12 @@
 
 #ifndef OPENSSL_STORE_H
 # define OPENSSL_STORE_H
+# pragma once
+
+# include <openssl/macros.h>
+# if !OPENSSL_API_3
+#  define HEADER_OSSL_STORE_H
+# endif
 
 # include <stdarg.h>
 # include <openssl/types.h>
index 940beee..29e365b 100644 (file)
 
 #ifndef OPENSSL_STOREERR_H
 # define OPENSSL_STOREERR_H
+# pragma once
+
+# include <openssl/macros.h>
+# if !OPENSSL_API_3
+#  define HEADER_OSSL_STOREERR_H
+# endif
 
 # include <openssl/opensslconf.h>
 # include <openssl/symhacks.h>
index 6a477b4..abc5df3 100644 (file)
@@ -9,6 +9,12 @@
 
 #ifndef OPENSSL_SYMHACKS_H
 # define OPENSSL_SYMHACKS_H
+# pragma once
+
+# include <openssl/macros.h>
+# if !OPENSSL_API_3
+#  define HEADER_SYMHACKS_H
+# endif
 
 # include <openssl/e_os2.h>
 
index 85871ae..62a1763 100644 (file)
 
 #ifndef OPENSSL_TLS1_H
 # define OPENSSL_TLS1_H
+# pragma once
+
+# include <openssl/macros.h>
+# if !OPENSSL_API_3
+#  define HEADER_TLS1_H
+# endif
 
 # include <openssl/buffer.h>
 # include <openssl/x509.h>
index 4af1feb..231d605 100644 (file)
@@ -9,6 +9,12 @@
 
 #ifndef OPENSSL_TS_H
 # define OPENSSL_TS_H
+# pragma once
+
+# include <openssl/macros.h>
+# if !OPENSSL_API_3
+#  define HEADER_TS_H
+# endif
 
 # include <openssl/opensslconf.h>
 
index 8846343..6da6946 100644 (file)
 
 #ifndef OPENSSL_TSERR_H
 # define OPENSSL_TSERR_H
+# pragma once
+
+# include <openssl/macros.h>
+# if !OPENSSL_API_3
+#  define HEADER_TSERR_H
+# endif
 
 # include <openssl/opensslconf.h>
 # include <openssl/symhacks.h>
index 39d4a3a..cb64645 100644 (file)
@@ -9,6 +9,12 @@
 
 #ifndef OPENSSL_TXT_DB_H
 # define OPENSSL_TXT_DB_H
+# pragma once
+
+# include <openssl/macros.h>
+# if !OPENSSL_API_3
+#  define HEADER_TXT_DB_H
+# endif
 
 # include <openssl/opensslconf.h>
 # include <openssl/bio.h>
index 23e27bc..a084402 100644 (file)
@@ -9,6 +9,12 @@
 
 #ifndef OPENSSL_UI_H
 # define OPENSSL_UI_H
+# pragma once
+
+# include <openssl/macros.h>
+# if !OPENSSL_API_3
+#  define HEADER_UI_H
+# endif
 
 # include <openssl/opensslconf.h>
 
index 55340de..36567dc 100644 (file)
 
 #ifndef OPENSSL_UIERR_H
 # define OPENSSL_UIERR_H
+# pragma once
+
+# include <openssl/macros.h>
+# if !OPENSSL_API_3
+#  define HEADER_UIERR_H
+# endif
 
 # include <openssl/opensslconf.h>
 # include <openssl/symhacks.h>
index 84bdabf..f375607 100644 (file)
@@ -9,6 +9,12 @@
 
 #ifndef OPENSSL_WHRLPOOL_H
 # define OPENSSL_WHRLPOOL_H
+# pragma once
+
+# include <openssl/macros.h>
+# if !OPENSSL_API_3
+#  define HEADER_WHRLPOOL_H
+# endif
 
 #include <openssl/opensslconf.h>
 
index 1b0278f..3b9c7ad 100644 (file)
 
 #ifndef OPENSSL_X509_H
 # define OPENSSL_X509_H
+# pragma once
+
+# include <openssl/macros.h>
+# if !OPENSSL_API_3
+#  define HEADER_X509_H
+# endif
 
 # include <openssl/e_os2.h>
 # include <openssl/types.h>
index 81b5052..e16ad1d 100644 (file)
@@ -9,6 +9,12 @@
 
 #ifndef OPENSSL_X509_VFY_H
 # define OPENSSL_X509_VFY_H
+# pragma once
+
+# include <openssl/macros.h>
+# if !OPENSSL_API_3
+#  define HEADER_X509_VFY_H
+# endif
 
 /*
  * Protect against recursion, x509.h and x509_vfy.h each include the other.
index e28caa2..19eb3dd 100644 (file)
 
 #ifndef OPENSSL_X509ERR_H
 # define OPENSSL_X509ERR_H
+# pragma once
+
+# include <openssl/macros.h>
+# if !OPENSSL_API_3
+#  define HEADER_X509ERR_H
+# endif
 
 # include <openssl/opensslconf.h>
 # include <openssl/symhacks.h>
index e276f1d..419dc79 100644 (file)
@@ -9,6 +9,12 @@
 
 #ifndef OPENSSL_X509V3_H
 # define OPENSSL_X509V3_H
+# pragma once
+
+# include <openssl/macros.h>
+# if !OPENSSL_API_3
+#  define HEADER_X509V3_H
+# endif
 
 # include <openssl/bio.h>
 # include <openssl/x509.h>
index 74e5954..f5f7e0b 100644 (file)
 
 #ifndef OPENSSL_X509V3ERR_H
 # define OPENSSL_X509V3ERR_H
+# pragma once
+
+# include <openssl/macros.h>
+# if !OPENSSL_API_3
+#  define HEADER_X509V3ERR_H
+# endif
 
 # include <openssl/opensslconf.h>
 # include <openssl/symhacks.h>