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 <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)

diff --git a/include/openssl/aes.h b/include/openssl/aes.h
index 672bcfbe50a0d46ef2e3eb03fb6c45e954db7444..4e93d3dc93fd76b956518a246608edde01052cd2 100644 (file)
--- 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 <openssl/macros.h>
+# if !OPENSSL_API_3
+#  define HEADER_AES_H
+# endif
 
 # include <openssl/opensslconf.h>
 

diff --git a/include/openssl/asn1.h b/include/openssl/asn1.h
index 6389722e15b0f41966dfef0af8af178275a5e0ba..32d39c14a68ef6d69ce873c8677661b86bb54c4e 100644 (file)
--- 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 <openssl/macros.h>
+# if !OPENSSL_API_3
+#  define HEADER_ASN1_H
+# endif
 
 # include <time.h>
 # include <openssl/e_os2.h>

diff --git a/include/openssl/asn1err.h b/include/openssl/asn1err.h
index 944f7ca4569dcd092e78c05686102e9150f98740..9166f17142a7225be07ab89da4e3632013988ad2 100644 (file)
--- 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 <openssl/macros.h>
+# if !OPENSSL_API_3
+#  define HEADER_ASN1ERR_H
+# endif
 
 # include <openssl/opensslconf.h>
 # include <openssl/symhacks.h>

diff --git a/include/openssl/asn1t.h b/include/openssl/asn1t.h
index 0556d3c6c4217068d9feaac5bff5d6fbd6103724..00ccdf51564ee8bb3f65bd58d58f88a48658e9fb 100644 (file)
--- 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 <openssl/macros.h>
+# if !OPENSSL_API_3
+#  define HEADER_ASN1T_H
+# endif
 
 # include <stddef.h>
 # include <openssl/e_os2.h>

diff --git a/include/openssl/async.h b/include/openssl/async.h
index 9ed41dbc1dd9f87f7f4d54ee898d2225a60f5943..e372e43c47cb484544bc96afcaa0b0438a4d05e3 100644 (file)
--- 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 <openssl/macros.h>
+# 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 3c2e14d6b79073270aa6ba9535716ba00d5c54f5..8e8c66fc52c7f4005659a0dd6ed40b2029cdc5ac 100644 (file)
--- 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 <openssl/macros.h>
+# if !OPENSSL_API_3
+#  define HEADER_ASYNCERR_H
+# endif
 
 # include <openssl/opensslconf.h>
 # include <openssl/symhacks.h>

diff --git a/include/openssl/bio.h b/include/openssl/bio.h
index e8416560cd2dcaebcf3a0a87f2fe87d9aca23673..9fb809501459c558afb5d0b2f3f4f50c5f555714 100644 (file)
--- 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 <openssl/macros.h>
+# if !OPENSSL_API_3
+#  define HEADER_BIO_H
+# endif
 
 # include <openssl/e_os2.h>
 

diff --git a/include/openssl/bioerr.h b/include/openssl/bioerr.h
index f2ed705759961d2f440bba034654b1273aad9fab..2f4dd3394b8a5cdd2b005ae89ab986ec29cf1d46 100644 (file)
--- 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 <openssl/macros.h>
+# if !OPENSSL_API_3
+#  define HEADER_BIOERR_H
+# endif
 
 # include <openssl/opensslconf.h>
 # include <openssl/symhacks.h>

diff --git a/include/openssl/blowfish.h b/include/openssl/blowfish.h
index 1445a5fd871c103fee859fe39b0e2708fd821744..6532915200752d004a68500a8831842fa747013b 100644 (file)
--- 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 <openssl/macros.h>
+# if !OPENSSL_API_3
+#  define HEADER_BLOWFISH_H
+# endif
 
 # include <openssl/opensslconf.h>
 

diff --git a/include/openssl/bn.h b/include/openssl/bn.h
index 8ece0051956dbf52eac09e2925777652d712d433..12fbcdaccd5babc364f6b692c35e3cbdf7c900b0 100644 (file)
--- 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 <openssl/macros.h>
+# if !OPENSSL_API_3
+#  define HEADER_BN_H
+# endif
 
 # include <openssl/e_os2.h>
 # ifndef OPENSSL_NO_STDIO

diff --git a/include/openssl/bnerr.h b/include/openssl/bnerr.h
index 9e32edbcab4e2d0e9162baab4b43c8cd005b9222..a4b666f9cce6b420083abbfe413acaeafadd549e 100644 (file)
--- 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 <openssl/macros.h>
+# if !OPENSSL_API_3
+#  define HEADER_BNERR_H
+# endif
 
 # include <openssl/opensslconf.h>
 # include <openssl/symhacks.h>

diff --git a/include/openssl/buffer.h b/include/openssl/buffer.h
index f5cc3c51a665761762808319010d6c77e53aff25..c3cf216147e42d8966e21687d49d2c343c64f3f2 100644 (file)
--- 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 <openssl/macros.h>
+# if !OPENSSL_API_3
+#  define HEADER_BUFFER_H
+# endif
 
 # include <openssl/types.h>
 # ifndef OPENSSL_CRYPTO_H

diff --git a/include/openssl/buffererr.h b/include/openssl/buffererr.h
index 24a0a36b4867f6bbaea2cd854e2d3926f2ae7153..fbe0d99843f6e11e520a5523ec44854a5916ecd9 100644 (file)
--- 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 <openssl/macros.h>
+# if !OPENSSL_API_3
+#  define HEADER_BUFERR_H
+# endif
 
 # include <openssl/opensslconf.h>
 # include <openssl/symhacks.h>

diff --git a/include/openssl/camellia.h b/include/openssl/camellia.h
index 5b6648b673c45a76c4466dc619415f000b7ae1ac..23605cf3935fbef1ed7663d5448183ac76b8ca05 100644 (file)
--- 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 <openssl/macros.h>
+# if !OPENSSL_API_3
+#  define HEADER_CAMELLIA_H
+# endif
 
 # include <openssl/opensslconf.h>
 

diff --git a/include/openssl/cast.h b/include/openssl/cast.h
index c14c6979c402429e6e53eb476901def76f667095..a1aad6bda39fb82466b95942f0fb0a12dc40662a 100644 (file)
--- 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 <openssl/macros.h>
+# if !OPENSSL_API_3
+#  define HEADER_CAST_H
+# endif
 
 # include <openssl/opensslconf.h>
 

diff --git a/include/openssl/cmac.h b/include/openssl/cmac.h
index c8802ec7336b55cae641f5f927708ebcfa58ba70..426536fa350be891d18281dd03e8d04a7077adca 100644 (file)
--- 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 <openssl/macros.h>
+# 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 5209d39ee362e3a48ab655992cb97b5a26d3a170..cf4ad37f3ab2247fbd308653bbe2c5b8687dd693 100644 (file)
--- 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 <openssl/macros.h>
+# if !OPENSSL_API_3
+#  define HEADER_CMS_H
+# endif
 
 # include <openssl/opensslconf.h>
 

diff --git a/include/openssl/cmserr.h b/include/openssl/cmserr.h
index 472ca3d916d585fedc57c476b37f30bb386ce244..407bdfd5fd4f0779c7095706a52ab030004c3193 100644 (file)
--- 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 <openssl/macros.h>
+# if !OPENSSL_API_3
+#  define HEADER_CMSERR_H
+# endif
 
 # include <openssl/opensslconf.h>
 # include <openssl/symhacks.h>

diff --git a/include/openssl/comp.h b/include/openssl/comp.h
index eac825f169f63670db438d2983b95e11ade9e88d..47f782b57a5f92ae8d49bd93a00ba45b6fbd2063 100644 (file)
--- 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 <openssl/macros.h>
+# if !OPENSSL_API_3
+#  define HEADER_COMP_H
+# endif
 
 # include <openssl/opensslconf.h>
 

diff --git a/include/openssl/comperr.h b/include/openssl/comperr.h
index 6fb872a4f80cd7279691b48e5dcc678f56cb3da0..89faccb1155e81dda149cdea82c83771df513063 100644 (file)
--- 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 <openssl/macros.h>
+# if !OPENSSL_API_3
+#  define HEADER_COMPERR_H
+# endif
 
 # include <openssl/opensslconf.h>
 # include <openssl/symhacks.h>

diff --git a/include/openssl/conf.h b/include/openssl/conf.h
index c987c428d12829b6e0923aade997227c2aeaa464..b2f93dda8ef204517bd1e6ec6d14e65f91c43112 100644 (file)
--- 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 <openssl/macros.h>
+# if !OPENSSL_API_3
+#  define HEADER_CONF_H
+# endif
 
 # include <openssl/bio.h>
 # include <openssl/lhash.h>

diff --git a/include/openssl/conf_api.h b/include/openssl/conf_api.h
index 7856ca0dcbbdaeb30a593dbb66301740ce819856..43076932e15b440da930455e44a6b5fc112a42c2 100644 (file)
--- 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 <openssl/macros.h>
+# if !OPENSSL_API_3
+#  define HEADER_CONF_API_H
+# endif
 
 # include <openssl/lhash.h>
 # include <openssl/conf.h>

diff --git a/include/openssl/conferr.h b/include/openssl/conferr.h
index 848a6cef25e5f1f03034c4f5f7e69ad540dd44aa..4bf5b9e28f3e39d690a37c82590cbcff9a67be80 100644 (file)
--- 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 <openssl/macros.h>
+# if !OPENSSL_API_3
+#  define HEADER_CONFERR_H
+# endif
 
 # include <openssl/opensslconf.h>
 # include <openssl/symhacks.h>

diff --git a/include/openssl/crypto.h b/include/openssl/crypto.h
index 6e5dae89c7922cfd3a17898d349c09c130a9ac7d..9fb2fa39257d6404a4c544f1dd13de5c478ded6d 100644 (file)
--- 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 <openssl/macros.h>
+# if !OPENSSL_API_3
+#  define HEADER_CRYPTO_H
+# endif
 
 # include <stdlib.h>
 # include <time.h>

diff --git a/include/openssl/cryptoerr.h b/include/openssl/cryptoerr.h
index 497735e67e510e1355132010a0849d6558c19863..99872af16152398b5f46c49f8947321cf0ad4e26 100644 (file)
--- 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 <openssl/macros.h>
+# if !OPENSSL_API_3
+#  define HEADER_CRYPTOERR_H
+# endif
 
 # include <openssl/opensslconf.h>
 # include <openssl/symhacks.h>

diff --git a/include/openssl/ct.h b/include/openssl/ct.h
index 084fd368fddca74e9ce9e524787a60c45efc0d5c..17271d6777757e285690eaae0a6c8a8f7307fade 100644 (file)
--- 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 <openssl/macros.h>
+# if !OPENSSL_API_3
+#  define HEADER_CT_H
+# endif
 
 # include <openssl/opensslconf.h>
 

diff --git a/include/openssl/cterr.h b/include/openssl/cterr.h
index 69e08a9973e8a13c04b6578f20a316697e859b2c..c5c646cc9babe4358ed8ac4437232ea83f0f5290 100644 (file)
--- 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 <openssl/macros.h>
+# if !OPENSSL_API_3
+#  define HEADER_CTERR_H
+# endif
 
 # include <openssl/opensslconf.h>
 # include <openssl/symhacks.h>

diff --git a/include/openssl/des.h b/include/openssl/des.h
index c0361dd533c26ae9a33a0f2b34f1a64406fcaa27..0a874f4bcc666c74e2157d1c7915bce9812528ff 100644 (file)
--- 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 <openssl/macros.h>
+# if !OPENSSL_API_3
+#  define HEADER_DES_H
+# endif
 
 # include <openssl/opensslconf.h>
 

diff --git a/include/openssl/dh.h b/include/openssl/dh.h
index 64189ed7d71dcf2225106fdf319bf0947c8fb4a8..84f4f07d2cd634d6a65e9f652feb81761be666e9 100644 (file)
--- 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 <openssl/macros.h>
+# if !OPENSSL_API_3
+#  define HEADER_DH_H
+# endif
 
 # include <openssl/opensslconf.h>
 

diff --git a/include/openssl/dherr.h b/include/openssl/dherr.h
index 4003f79c6209fce08f71acd3b43f8c25e5bb1ba4..a926dab9995c41834967c2efe981eb27054b5d97 100644 (file)
--- 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 <openssl/macros.h>
+# if !OPENSSL_API_3
+#  define HEADER_DHERR_H
+# endif
 
 # include <openssl/opensslconf.h>
 # include <openssl/symhacks.h>

diff --git a/include/openssl/dsa.h b/include/openssl/dsa.h
index c5a363588e68e729fd9e376505b5bcf73f22d9ff..f14be2812dad7d7ebfead01fc399de32d2786fd6 100644 (file)
--- 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 <openssl/macros.h>
+# if !OPENSSL_API_3
+#  define HEADER_DSA_H
+# endif
 
 # include <openssl/opensslconf.h>
 

diff --git a/include/openssl/dsaerr.h b/include/openssl/dsaerr.h
index 3d16c09f182091d0d32086aca8a0663054605b48..9e0d5cfe2a444bea245c671a2a91de3af88cdfdd 100644 (file)
--- 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 <openssl/macros.h>
+# if !OPENSSL_API_3
+#  define HEADER_DSAERR_H
+# endif
 
 # include <openssl/opensslconf.h>
 # include <openssl/symhacks.h>

diff --git a/include/openssl/dtls1.h b/include/openssl/dtls1.h
index b4c36313d1bf30d4f6f0dbf9f4adea558bcb2b41..d535c05c4935864f523a9324434a71fda57987ee 100644 (file)
--- 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 <openssl/macros.h>
+# 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 740cf5561ca33fb95523d7bca9d98068a16c9dab..69a50911ddc0a32613f93ac8022aa05758c1606e 100644 (file)
--- 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 <openssl/macros.h>
+# if !OPENSSL_API_3
+#  define HEADER_E_OS2_H
+# endif
 
 # include <openssl/opensslconf.h>
 

diff --git a/include/openssl/ebcdic.h b/include/openssl/ebcdic.h
index 6805806e5fdcc9c32ba4be03668d6fdc7cf60fb0..a75a71d4d90a454c7ef06ead1018eb3f109a2cd9 100644 (file)
--- 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 <openssl/macros.h>
+# if !OPENSSL_API_3
+#  define HEADER_EBCDIC_H
+# endif
 
 # include <stdlib.h>
 

diff --git a/include/openssl/ec.h b/include/openssl/ec.h
index 2a669285ffac0ee15ba53bfe8a13cd15fbf20629..11999b41fc2b0bd761785b33fa3f7e605fc14827 100644 (file)
--- 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 <openssl/macros.h>
+# if !OPENSSL_API_3
+#  define HEADER_EC_H
+# endif
 
 # include <openssl/opensslconf.h>
 

diff --git a/include/openssl/ecerr.h b/include/openssl/ecerr.h
index 17b418b0751666f2b35cfa59fc91c85dcd21120a..07ef524f7af468a27e41be3930b87d38c20099ed 100644 (file)
--- 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 <openssl/macros.h>
+# if !OPENSSL_API_3
+#  define HEADER_ECERR_H
+# endif
 
 # include <openssl/opensslconf.h>
 # include <openssl/symhacks.h>

diff --git a/include/openssl/engine.h b/include/openssl/engine.h
index fc294ec3e8970b5babd074a05fa1f54b763a9946..816eb4e2e61f7fc2de8cbf5416a6521163ae6cf3 100644 (file)
--- 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 <openssl/macros.h>
+# if !OPENSSL_API_3
+#  define HEADER_ENGINE_H
+# endif
 
 # include <openssl/opensslconf.h>
 

diff --git a/include/openssl/engineerr.h b/include/openssl/engineerr.h
index 2db61b58b9d1c45b609a5d9605aaf7a87bced802..27b2df6d76e67db0b4fb09f2fa3e6c9e8f50ad37 100644 (file)
--- 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 <openssl/macros.h>
+# if !OPENSSL_API_3
+#  define HEADER_ENGINEERR_H
+# endif
 
 # include <openssl/opensslconf.h>
 # include <openssl/symhacks.h>

diff --git a/include/openssl/err.h b/include/openssl/err.h
index f837c3a21951f1f8d6b6d97e66f58318d3a810d8..fc7ead8b68d9598ee18e1ad1fa3c7c5a33e453a0 100644 (file)
--- 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 <openssl/macros.h>
+# if !OPENSSL_API_3
+#  define HEADER_ERR_H
+# endif
 
 # include <openssl/e_os2.h>
 

diff --git a/include/openssl/evp.h b/include/openssl/evp.h
index 857d685f155f8f2bb1e96b296c0dd00823925687..564106ceff8d5592a8641d586c69c9be1084ab4c 100644 (file)
--- 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 <openssl/macros.h>
+# if !OPENSSL_API_3
+#  define HEADER_ENVELOPE_H
+# endif
 
 # include <stdarg.h>
 

diff --git a/include/openssl/evperr.h b/include/openssl/evperr.h
index b7c2a712b24b134a65d612e2853a595a8ea0106b..fefbfb593e73e0058cb01f1cc472ff54b7fabd07 100644 (file)
--- 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 <openssl/macros.h>
+# if !OPENSSL_API_3
+#  define HEADER_EVPERR_H
+# endif
 
 # include <openssl/opensslconf.h>
 # include <openssl/symhacks.h>

diff --git a/include/openssl/hmac.h b/include/openssl/hmac.h
index 93e6a862ef3bb4b7574dd57b9e4ba8b9229706f9..8214853e078ecf5be46e430a53d095fa3a10f8df 100644 (file)
--- 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 <openssl/macros.h>
+# if !OPENSSL_API_3
+#  define HEADER_HMAC_H
+# endif
 
 # include <openssl/opensslconf.h>
 

diff --git a/include/openssl/idea.h b/include/openssl/idea.h
index 2fcee23cb104527c31ca4aeff9075bd7acd5b28d..667865281dfce4fcc2108f6540ccf64575fa3c13 100644 (file)
--- 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 <openssl/macros.h>
+# if !OPENSSL_API_3
+#  define HEADER_IDEA_H
+# endif
 
 # include <openssl/opensslconf.h>
 

diff --git a/include/openssl/kdf.h b/include/openssl/kdf.h
index 0521f72218b930373c15c68cc77ef5a0a5cf435e..864a5533ac3306cd4bfe30c53f109dd5415a32ac 100644 (file)
--- 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 <openssl/macros.h>
+# if !OPENSSL_API_3
+#  define HEADER_KDF_H
+# endif
 
 # include <stdarg.h>
 # include <stddef.h>

diff --git a/include/openssl/lhash.h b/include/openssl/lhash.h
index c7197c535afda2ef723198f2068061bef276f853..7cf2800dcdb04a4ef0cfb3b4b62d2a8763cf341b 100644 (file)
--- 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 <openssl/macros.h>
+# if !OPENSSL_API_3
+#  define HEADER_LHASH_H
+# endif
 
 # include <openssl/e_os2.h>
 # include <openssl/bio.h>

diff --git a/include/openssl/md2.h b/include/openssl/md2.h
index 35531ffac65d4d4c7b173967d074851231302a12..005a7bd4fced30ebf002169fc4de625c891208aa 100644 (file)
--- 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 <openssl/macros.h>
+# if !OPENSSL_API_3
+#  define HEADER_MD2_H
+# endif
 
 # include <openssl/opensslconf.h>
 

diff --git a/include/openssl/md4.h b/include/openssl/md4.h
index 893c4655fd32d7946c7762301cd032e1a28a4e61..a66db24263646775564ed08174f6ff98dca48223 100644 (file)
--- 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 <openssl/macros.h>
+# if !OPENSSL_API_3
+#  define HEADER_MD4_H
+# endif
 
 # include <openssl/opensslconf.h>
 

diff --git a/include/openssl/md5.h b/include/openssl/md5.h
index b039055b87e9edb97df61d22448f212e4ede2f06..78133a3474284cfa34879aed51f12d6ca46eb5a4 100644 (file)
--- 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 <openssl/macros.h>
+# if !OPENSSL_API_3
+#  define HEADER_MD5_H
+# endif
 
 # include <openssl/opensslconf.h>
 

diff --git a/include/openssl/mdc2.h b/include/openssl/mdc2.h
index e6c0c45b3a61fdf16e4c31d7ffdb4133308824fd..c1dc1cf62dc7491ba0475fe119c68d0a54f4dcda 100644 (file)
--- 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 <openssl/macros.h>
+# if !OPENSSL_API_3
+#  define HEADER_MDC2_H
+# endif
 
 # include <openssl/opensslconf.h>
 

diff --git a/include/openssl/modes.h b/include/openssl/modes.h
index 6b756847f8d9fee3dd824c5aa4e6dcf69d500f78..78cc98cd7ef23b0b86e5f029fd2113058c359d95 100644 (file)
--- 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 <openssl/macros.h>
+# if !OPENSSL_API_3
+#  define HEADER_MODES_H
+# endif
 
 # include <stddef.h>
 # include <openssl/types.h>

diff --git a/include/openssl/objects.h b/include/openssl/objects.h
index 3fee89549a45d9c1728638c556b0a22b63d9e933..45fa7e683b8db1c6aede3145d44f5ca5eef594fe 100644 (file)
--- 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 <openssl/macros.h>
+# if !OPENSSL_API_3
+#  define HEADER_OBJECTS_H
+# endif
 
 # include <openssl/obj_mac.h>
 # include <openssl/bio.h>

diff --git a/include/openssl/objectserr.h b/include/openssl/objectserr.h
index a68420008d3a96804bce1ea8a0ebbb2edf368ea1..9aa4acbbc037f0464643491ae9f0b08c662fc12f 100644 (file)
--- 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 <openssl/macros.h>
+# if !OPENSSL_API_3
+#  define HEADER_OBJERR_H
+# endif
 
 # include <openssl/opensslconf.h>
 # include <openssl/symhacks.h>

diff --git a/include/openssl/ocsp.h b/include/openssl/ocsp.h
index bb3fcfb3a1c788176f1a8d2743bd4fb324868b02..1cc2cc6bcdc6912c99a7630de625ff4c49ab093b 100644 (file)
--- 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 <openssl/macros.h>
+# if !OPENSSL_API_3
+#  define HEADER_OCSP_H
+# endif
 
 #include <openssl/opensslconf.h>
 

diff --git a/include/openssl/ocsperr.h b/include/openssl/ocsperr.h
index a732138731d5d588ebee9d9bdeb0ef745b7a8dc0..fa68f6ef00757955fb8bd5486d1a4a3b472e82db 100644 (file)
--- 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 <openssl/macros.h>
+# if !OPENSSL_API_3
+#  define HEADER_OCSPERR_H
+# endif
 
 # include <openssl/opensslconf.h>
 # include <openssl/symhacks.h>

diff --git a/include/openssl/opensslv.h b/include/openssl/opensslv.h
index a4fb47e8a04b9d1dae6dcdbbfe49abe9dd5544bb..cb3eb32d0be7508669e1a211433406069f8ce2c0 100644 (file)
--- 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 <openssl/macros.h>
+# 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 d6e8dcae06c9b9c36e7dd8c951cffe6a557b4761..915b5df4ab4d61ef5687734587103ec3ed518583 100644 (file)
--- 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 <openssl/macros.h>
+# if !OPENSSL_API_3
+#  define HEADER_PEM_H
+# endif
 
 # include <openssl/e_os2.h>
 # include <openssl/bio.h>

diff --git a/include/openssl/pem2.h b/include/openssl/pem2.h
index c5d4b355a2cd2fedf17584889ad9c670461b9b46..baaff3204d334b6dd97b6d61a4d6a2c35f796814 100644 (file)
--- 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 <openssl/macros.h>
+# if !OPENSSL_API_3
+#  define HEADER_PEM2_H
+# endif
 # include <openssl/pemerr.h>
 #endif

diff --git a/include/openssl/pemerr.h b/include/openssl/pemerr.h
index 1ca4ceac6681e59a7e1c41b6cf0f60d137aa7766..ca1b5d4ae340297e5e82fb552774c8b76223977c 100644 (file)
--- 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 <openssl/macros.h>
+# if !OPENSSL_API_3
+#  define HEADER_PEMERR_H
+# endif
 
 # include <openssl/opensslconf.h>
 # include <openssl/symhacks.h>

diff --git a/include/openssl/pkcs12.h b/include/openssl/pkcs12.h
index 931067253ceecd17e47910d3ae10050af9b2b0f8..7fd5827d8ae46e5d810d6f8acdc4e73f5c43a89c 100644 (file)
--- 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 <openssl/macros.h>
+# if !OPENSSL_API_3
+#  define HEADER_PKCS12_H
+# endif
 
 # include <openssl/bio.h>
 # include <openssl/x509.h>

diff --git a/include/openssl/pkcs12err.h b/include/openssl/pkcs12err.h
index e08a44b8c5d934cb3c5fcde0eeb14f5e57825ee5..b9942404380c6d135044024de3a32eaf944296fb 100644 (file)
--- 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 <openssl/macros.h>
+# if !OPENSSL_API_3
+#  define HEADER_PKCS12ERR_H
+# endif
 
 # include <openssl/opensslconf.h>
 # include <openssl/symhacks.h>

diff --git a/include/openssl/pkcs7.h b/include/openssl/pkcs7.h
index f5b2e086b9e376e559bcad012a3d2dafbe20e269..8b208f37007900c8f90abde73291463f6bf0e5a2 100644 (file)
--- 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 <openssl/macros.h>
+# if !OPENSSL_API_3
+#  define HEADER_PKCS7_H
+# endif
 
 # include <openssl/asn1.h>
 # include <openssl/bio.h>

diff --git a/include/openssl/pkcs7err.h b/include/openssl/pkcs7err.h
index 24bff6d1ea74f1ac92e4e9b88ad453275413488e..e82f6ef83f8136505e801222261ba103fdf44ce2 100644 (file)
--- 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 <openssl/macros.h>
+# if !OPENSSL_API_3
+#  define HEADER_PKCS7ERR_H
+# endif
 
 # include <openssl/opensslconf.h>
 # include <openssl/symhacks.h>

diff --git a/include/openssl/rand.h b/include/openssl/rand.h
index e2cf49f97fa11aac11259265bb556cef290c4067..974476765d5b4e28df66b1b01da0f5a4c67d3b4b 100644 (file)
--- 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 <openssl/macros.h>
+# if !OPENSSL_API_3
+#  define HEADER_RAND_H
+# endif
 
 # include <stdlib.h>
 # include <openssl/types.h>

diff --git a/include/openssl/rand_drbg.h b/include/openssl/rand_drbg.h
index b557670b8a5ab3c03cd46c062ced1163267c918d..0aef0da5a38ff224f392111e6729fbc1db9d7d08 100644 (file)
--- 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 <openssl/macros.h>
+# if !OPENSSL_API_3
+#  define HEADER_DRBG_RAND_H
+# endif
 
 # include <time.h>
 # include <openssl/types.h>

diff --git a/include/openssl/randerr.h b/include/openssl/randerr.h
index 74fac69b2d4c5cfaf07cca25d8aa66f139a7a57f..eb952b4ad44b07067b5150e85a215463bb02a299 100644 (file)
--- 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 <openssl/macros.h>
+# if !OPENSSL_API_3
+#  define HEADER_RANDERR_H
+# endif
 
 # include <openssl/opensslconf.h>
 # include <openssl/symhacks.h>

diff --git a/include/openssl/rc2.h b/include/openssl/rc2.h
index 909e5b0d5bddfaf10c9727e059854901a1d292e8..d7be6b49eaf7cad5a36dfe2ff4ef54e9d5909254 100644 (file)
--- 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 <openssl/macros.h>
+# if !OPENSSL_API_3
+#  define HEADER_RC2_H
+# endif
 
 # include <openssl/opensslconf.h>
 

diff --git a/include/openssl/rc4.h b/include/openssl/rc4.h
index 37509b9ffce20694a77193a38c4a62716babfad3..fed6fcae654fa678a672b569fd157e459377cd1e 100644 (file)
--- 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 <openssl/macros.h>
+# if !OPENSSL_API_3
+#  define HEADER_RC4_H
+# endif
 
 # include <openssl/opensslconf.h>
 

diff --git a/include/openssl/rc5.h b/include/openssl/rc5.h
index 9550df975eab34dd63a3efd6b0c52b70c72ca818..d4d97ed2261481e447e0af43fea0f7591e3b5b38 100644 (file)
--- 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 <openssl/macros.h>
+# if !OPENSSL_API_3
+#  define HEADER_RC5_H
+# endif
 
 # include <openssl/opensslconf.h>
 

diff --git a/include/openssl/ripemd.h b/include/openssl/ripemd.h
index dfd2ec1b425a517758d9870813ac552c60a9d3bc..7f1dbd2a68cfe85c9f8dfee5b40e42c807be6168 100644 (file)
--- 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 <openssl/macros.h>
+# if !OPENSSL_API_3
+#  define HEADER_RIPEMD_H
+# endif
 
 # include <openssl/opensslconf.h>
 

diff --git a/include/openssl/rsa.h b/include/openssl/rsa.h
index 302596c30de86ae5859a38b2107e60aa11d10963..8ddc9703965a2a2eef7928fbfdd33a634c498163 100644 (file)
--- 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 <openssl/macros.h>
+# if !OPENSSL_API_3
+#  define HEADER_RSA_H
+# endif
 
 # include <openssl/opensslconf.h>
 

diff --git a/include/openssl/rsaerr.h b/include/openssl/rsaerr.h
index d4491866fe0f52c6ebb2d5aa5f6ac5aed1dc959c..1f685ec8eaaa3d3789e8a4a9bc4d7cbd1b7edf36 100644 (file)
--- 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 <openssl/macros.h>
+# if !OPENSSL_API_3
+#  define HEADER_RSAERR_H
+# endif
 
 # include <openssl/opensslconf.h>
 # include <openssl/symhacks.h>

diff --git a/include/openssl/safestack.h b/include/openssl/safestack.h
index 520f2b4c479704552e191c585aef124bb3f6101f..1b7b73d4b5e5f391fe457567f1b576485a982e58 100644 (file)
--- 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 <openssl/macros.h>
+# if !OPENSSL_API_3
+#  define HEADER_SAFESTACK_H
+# endif
 
 # include <openssl/stack.h>
 # include <openssl/e_os2.h>

diff --git a/include/openssl/seed.h b/include/openssl/seed.h
index 795c9158dea4dcd39d1a7d3f7e613f91d04c6195..9ae2bce1cae2a04b536bffaf32115ac1c592d90c 100644 (file)
--- 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 <openssl/macros.h>
+# if !OPENSSL_API_3
+#  define HEADER_SEED_H
+# endif
 
 # include <openssl/opensslconf.h>
 

diff --git a/include/openssl/sha.h b/include/openssl/sha.h
index 94487133344a0f218a896260459486c0c72d9577..5d21bdf0d85d7986d537345d19a97bce6c0b0e7d 100644 (file)
--- 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 <openssl/macros.h>
+# if !OPENSSL_API_3
+#  define HEADER_SHA_H
+# endif
 
 # include <openssl/e_os2.h>
 # include <stddef.h>

diff --git a/include/openssl/srp.h b/include/openssl/srp.h
index e65ec36c90a752421f4bb3f25fbfea254fa48cf0..82b4d5b3dd45c3861a64add1794953b6c2b2b6df 100644 (file)
--- 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 <openssl/macros.h>
+# if !OPENSSL_API_3
+#  define HEADER_SRP_H
+# endif
 
 #include <openssl/opensslconf.h>
 

diff --git a/include/openssl/srtp.h b/include/openssl/srtp.h
index fbc64879015d901a59381435a39e80caef3dd718..32056cb280d408eff5da6275fc2358a099075409 100644 (file)
--- 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 <openssl/macros.h>
+# if !OPENSSL_API_3
+#  define HEADER_D1_SRTP_H
+# endif
 
 # include <openssl/ssl.h>
 

diff --git a/include/openssl/ssl.h b/include/openssl/ssl.h
index 7783f9482c151ff49fcb7f8d9bcd541aac36d408..35477d9cb773b9f4c6b7045955d79bd36ac59387 100644 (file)
--- 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 <openssl/macros.h>
+# if !OPENSSL_API_3
+#  define HEADER_SSL_H
+# endif
 
 # include <openssl/e_os2.h>
 # include <openssl/opensslconf.h>

diff --git a/include/openssl/ssl2.h b/include/openssl/ssl2.h
index 41aad9ae5d519152845e1f347653dd726855b527..e9b9ba880288e3ab95991ed071bcfc9d71b8d0a1 100644 (file)
--- 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 <openssl/macros.h>
+# 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 b89c91176ceb366c189f4c76d81d4d06148aaf4e..63ab2a58e49b1bde5fb48aaef54ca32934c2eb23 100644 (file)
--- 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 <openssl/macros.h>
+# if !OPENSSL_API_3
+#  define HEADER_SSL3_H
+# endif
 
 # include <openssl/comp.h>
 # include <openssl/buffer.h>

diff --git a/include/openssl/sslerr.h b/include/openssl/sslerr.h
index ad5cd561f558f1afc083eebf90c0817ad3fd5ce9..87c6465edc7a334a4eda098a0626516cc77dca4c 100644 (file)
--- 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 <openssl/macros.h>
+# if !OPENSSL_API_3
+#  define HEADER_SSLERR_H
+# endif
 
 # include <openssl/opensslconf.h>
 # include <openssl/symhacks.h>

diff --git a/include/openssl/stack.h b/include/openssl/stack.h
index 8683e53b48cf390fc278fd1c067a15f24b8aafbf..018e0d0a8b48a3d370d39854fe890f7b17a45f37 100644 (file)
--- 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 <openssl/macros.h>
+# 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 affa16a0b1cf0902ed25a9f2ccc7d2b64cff2c41..846923e0ea5fe3ea4c339389614c0027d0b371f9 100644 (file)
--- 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 <openssl/macros.h>
+# if !OPENSSL_API_3
+#  define HEADER_OSSL_STORE_H
+# endif
 
 # include <stdarg.h>
 # include <openssl/types.h>

diff --git a/include/openssl/storeerr.h b/include/openssl/storeerr.h
index 940beeec68ddd0dc19c791c49c3349c0e80c7a60..29e365bcc9e085aa929b735603ad7ec7640711f5 100644 (file)
--- 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 <openssl/macros.h>
+# if !OPENSSL_API_3
+#  define HEADER_OSSL_STOREERR_H
+# endif
 
 # include <openssl/opensslconf.h>
 # include <openssl/symhacks.h>

diff --git a/include/openssl/symhacks.h b/include/openssl/symhacks.h
index 6a477b4adaf9920854963caccbb89854b9f4a28c..abc5df3874d1f15125b088d6fd4e5fc8b3284e33 100644 (file)
--- 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 <openssl/macros.h>
+# if !OPENSSL_API_3
+#  define HEADER_SYMHACKS_H
+# endif
 
 # include <openssl/e_os2.h>
 

diff --git a/include/openssl/tls1.h b/include/openssl/tls1.h
index 85871aed9ce25c94cc89d97244c6d102b8ca41f1..62a176362371c410e95f5d53529cb6f9c97ea445 100644 (file)
--- 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 <openssl/macros.h>
+# if !OPENSSL_API_3
+#  define HEADER_TLS1_H
+# endif
 
 # include <openssl/buffer.h>
 # include <openssl/x509.h>

diff --git a/include/openssl/ts.h b/include/openssl/ts.h
index 4af1feb52dacc25d30bb7c7ce4120fcca273c41c..231d6052f988661575fcd059d2104f22712a0d53 100644 (file)
--- 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 <openssl/macros.h>
+# if !OPENSSL_API_3
+#  define HEADER_TS_H
+# endif
 
 # include <openssl/opensslconf.h>
 

diff --git a/include/openssl/tserr.h b/include/openssl/tserr.h
index 8846343aecd2219a0a5ab1174a2aa6ba77dc66e1..6da6946ffc24ceab835503a85154b2ebd5f5788d 100644 (file)
--- 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 <openssl/macros.h>
+# if !OPENSSL_API_3
+#  define HEADER_TSERR_H
+# endif
 
 # include <openssl/opensslconf.h>
 # include <openssl/symhacks.h>

diff --git a/include/openssl/txt_db.h b/include/openssl/txt_db.h
index 39d4a3a48755244e98841c1fa7c067d3eff44d66..cb646450cac076d0c3223512d099c77f0f9f1472 100644 (file)
--- 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 <openssl/macros.h>
+# if !OPENSSL_API_3
+#  define HEADER_TXT_DB_H
+# endif
 
 # include <openssl/opensslconf.h>
 # include <openssl/bio.h>

diff --git a/include/openssl/ui.h b/include/openssl/ui.h
index 23e27bc0532c2aeda94fd087ab794561072cc120..a084402c682391c6f9bc23fd286cda6a70081214 100644 (file)
--- 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 <openssl/macros.h>
+# if !OPENSSL_API_3
+#  define HEADER_UI_H
+# endif
 
 # include <openssl/opensslconf.h>
 

diff --git a/include/openssl/uierr.h b/include/openssl/uierr.h
index 55340de8991cec7813690343387dbd9c1e90a478..36567dce454fe0e107e2d318d43ae63a202c8633 100644 (file)
--- 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 <openssl/macros.h>
+# if !OPENSSL_API_3
+#  define HEADER_UIERR_H
+# endif
 
 # include <openssl/opensslconf.h>
 # include <openssl/symhacks.h>

diff --git a/include/openssl/whrlpool.h b/include/openssl/whrlpool.h
index 84bdabf9d4e73b33ebcb5002ef1be2fe256c6dc7..f375607a3677ce644834eecb4837f7afdb59972c 100644 (file)
--- 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 <openssl/macros.h>
+# if !OPENSSL_API_3
+#  define HEADER_WHRLPOOL_H
+# endif
 
 #include <openssl/opensslconf.h>
 

diff --git a/include/openssl/x509.h b/include/openssl/x509.h
index 1b0278fd67fa445bb642a8ac58b17ba43e984b3e..3b9c7ad506b44118831aeebcb40398c94eb4ddf4 100644 (file)
--- 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 <openssl/macros.h>
+# if !OPENSSL_API_3
+#  define HEADER_X509_H
+# endif
 
 # include <openssl/e_os2.h>
 # include <openssl/types.h>

diff --git a/include/openssl/x509_vfy.h b/include/openssl/x509_vfy.h
index 81b50521d185e9195512fd3d029c57562843481c..e16ad1d7c07a024da749260edbaf95521c935384 100644 (file)
--- 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 <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.

diff --git a/include/openssl/x509err.h b/include/openssl/x509err.h
index e28caa297ec32744dd6fe0a7810f3292d74ecd87..19eb3ddcf1fb143a56e829287900892b49125ec3 100644 (file)
--- 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 <openssl/macros.h>
+# if !OPENSSL_API_3
+#  define HEADER_X509ERR_H
+# endif
 
 # include <openssl/opensslconf.h>
 # include <openssl/symhacks.h>

diff --git a/include/openssl/x509v3.h b/include/openssl/x509v3.h
index e276f1d2f5b630f7e3302877ad7d4d382d86d047..419dc795dd46671f206f8af8fb3f66d705813c7a 100644 (file)
--- 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 <openssl/macros.h>
+# if !OPENSSL_API_3
+#  define HEADER_X509V3_H
+# endif
 
 # include <openssl/bio.h>
 # include <openssl/x509.h>

diff --git a/include/openssl/x509v3err.h b/include/openssl/x509v3err.h
index 74e59540b96a1a5411a40345fe4da16f8626acfa..f5f7e0bf2cffc669687ed293f1e605d9b57d61b0 100644 (file)
--- 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 <openssl/macros.h>
+# if !OPENSSL_API_3
+#  define HEADER_X509V3ERR_H
+# endif
 
 # include <openssl/opensslconf.h>
 # include <openssl/symhacks.h>