include/openssl: add a few missing #pragma once directives

Reviewed-by: Paul Dale <pauli@openssl.org>
Reviewed-by: Matthias St. Pierre <Matthias.St.Pierre@ncp-e.com>
(Merged from https://github.com/openssl/openssl/pull/14096)

diff --git a/crypto/objects/obj_compat.h b/crypto/objects/obj_compat.h
index 68d1d733071a503f7a4fd1c72e3518254fda825a..cbe4438695361dd24d6618b1583829b0ed833bf2 100644 (file)
--- a/crypto/objects/obj_compat.h
+++ b/crypto/objects/obj_compat.h
@@ -43,4 +43,4 @@
 #define SN_grasshopper_mac              SN_kuznyechik_mac
 #define NID_grasshopper_mac             NID_kuznyechik_mac
 
-#endif
+#endif  /* OPENSSL_NO_DEPRECATED_3_0 */

diff --git a/crypto/objects/objects.pl b/crypto/objects/objects.pl
index 5edf26ec0dc5da2592dcba5bb38b1a83f2f593c6..62e34aa52fd9438db71c41520fb00380eda4af10 100644 (file)
--- a/crypto/objects/objects.pl
+++ b/crypto/objects/objects.pl
@@ -144,6 +144,10 @@ print <<"EOF";
  * https://www.openssl.org/source/license.html
  */
 
+#ifndef OPENSSL_OBJ_MAC_H
+# define OPENSSL_OBJ_MAC_H
+# pragma once
+
 #define SN_undef                        "UNDEF"
 #define LN_undef                        "undefined"
 #define NID_undef                       0
@@ -169,6 +173,11 @@ foreach (sort { $a <=> $b } keys %ordern)
        print expand("#define OBJ_$Cname\t\t$obj{$Cname}\n") if $obj{$Cname} ne "";
        }
 
+print <<EOF;
+
+#endif /* OPENSSL_OBJ_MAC_H */
+EOF
+
 sub process_oid
        {
        local($oid)=@_;

diff --git a/include/openssl/cmp_util.h b/include/openssl/cmp_util.h
index becbc9208e9fcc486d2b48ac363a6a8a5ac82222..5de50d7a9abf1abfad2b595e38968f82966bb978 100644 (file)
--- a/include/openssl/cmp_util.h
+++ b/include/openssl/cmp_util.h
@@ -11,6 +11,7 @@
 
 #ifndef OPENSSL_CMP_UTIL_H
 # define OPENSSL_CMP_UTIL_H
+# pragma once
 
 # include <openssl/opensslconf.h>
 # ifndef OPENSSL_NO_CMP

diff --git a/include/openssl/configuration.h.in b/include/openssl/configuration.h.in
index 00a4fc0aa3866175e90d3bb9767c8032ce5ab2a9..c1a5f8c485b42ff0b8a758fff4f6fe43889ece4f 100644 (file)
--- a/include/openssl/configuration.h.in
+++ b/include/openssl/configuration.h.in
@@ -11,6 +11,7 @@
 
 #ifndef OPENSSL_CONFIGURATION_H
 # define OPENSSL_CONFIGURATION_H
+# pragma once
 
 # ifdef  __cplusplus
 extern "C" {

diff --git a/include/openssl/core.h b/include/openssl/core.h
index 80ba32d9bf75431ca84ac05d014f34badf4986fa..9a183da4e8f0a5ab7343d9d4c04dd1131be8e2bb 100644 (file)
--- a/include/openssl/core.h
+++ b/include/openssl/core.h
@@ -9,6 +9,7 @@
 
 #ifndef OPENSSL_CORE_H
 # define OPENSSL_CORE_H
+# pragma once
 
 # include <stddef.h>
 # include <openssl/types.h>

diff --git a/include/openssl/core_dispatch.h b/include/openssl/core_dispatch.h
index a8e9e521512e7580cbaf48eb829ef9001ad01013..1689778c72493905f9bf139c490a150044ee7d7d 100644 (file)
--- a/include/openssl/core_dispatch.h
+++ b/include/openssl/core_dispatch.h
@@ -9,6 +9,7 @@
 
 #ifndef OPENSSL_CORE_NUMBERS_H
 # define OPENSSL_CORE_NUMBERS_H
+# pragma once
 
 # include <stdarg.h>
 # include <openssl/core.h>

diff --git a/include/openssl/core_names.h b/include/openssl/core_names.h
index ff2d1a03f9dd23e2e6ecdb0bda0577ccaacf6412..a9ab57dbff04a17fb2f969ab77aab3085b3f7c5c 100644 (file)
--- a/include/openssl/core_names.h
+++ b/include/openssl/core_names.h
@@ -9,6 +9,7 @@
 
 #ifndef OPENSSL_CORE_NAMES_H
 # define OPENSSL_CORE_NAMES_H
+# pragma once
 
 # ifdef __cplusplus
 extern "C" {

diff --git a/include/openssl/core_object.h b/include/openssl/core_object.h
index 395279d7bc84561aef4ba8c5765fd80700bbde7b..6b31a6b4216d86d183874ad1c3f8b8a0ec553212 100644 (file)
--- a/include/openssl/core_object.h
+++ b/include/openssl/core_object.h
@@ -9,6 +9,7 @@
 
 #ifndef OPENSSL_CORE_OBJECT_H
 # define OPENSSL_CORE_OBJECT_H
+# pragma once
 
 # ifdef __cplusplus
 extern "C" {

diff --git a/include/openssl/crypto.h.in b/include/openssl/crypto.h.in
index 0b9aeefe0480826c30d0ed5c9b1d1b708e2a17b5..356eaaabf17f601f5d7605d08b5a07e457266ae3 100644 (file)
--- a/include/openssl/crypto.h.in
+++ b/include/openssl/crypto.h.in
@@ -14,7 +14,6 @@
 use OpenSSL::stackhash qw(generate_stack_macros);
 -}
 
-
 #ifndef OPENSSL_CRYPTO_H
 # define OPENSSL_CRYPTO_H
 # pragma once

diff --git a/include/openssl/ess.h.in b/include/openssl/ess.h.in
index 185bdd8f8b7573a36d92fd673169ce3400c4cd90..2522912f2fa8a7ea9cfd22ea80476b1af1621842 100644 (file)
--- a/include/openssl/ess.h.in
+++ b/include/openssl/ess.h.in
@@ -15,16 +15,18 @@ use OpenSSL::stackhash qw(generate_stack_macros);
 
 #ifndef OPENSSL_ESS_H
 # define OPENSSL_ESS_H
+# pragma once
 
 # include <openssl/opensslconf.h>
 
-# ifdef  __cplusplus
-extern "C" {
-# endif
 # include <openssl/safestack.h>
 # include <openssl/x509.h>
 # include <openssl/esserr.h>
 
+# ifdef  __cplusplus
+extern "C" {
+# endif
+
 
 typedef struct ESS_issuer_serial ESS_ISSUER_SERIAL;
 typedef struct ESS_cert_id ESS_CERT_ID;

diff --git a/include/openssl/fips_names.h b/include/openssl/fips_names.h
index b42fe503f9c6826425b353f7ffcb9aa2c320520f..4bd579cb3aee180ceb6e408f15b367ac3dde7655 100644 (file)
--- a/include/openssl/fips_names.h
+++ b/include/openssl/fips_names.h
@@ -9,6 +9,7 @@
 
 #ifndef OPENSSL_FIPS_NAMES_H
 # define OPENSSL_FIPS_NAMES_H
+# pragma once
 
 # ifdef __cplusplus
 extern "C" {

diff --git a/include/openssl/fipskey.h.in b/include/openssl/fipskey.h.in
index eaa1798772e98ceab2d1e566d486ed893f6d1edc..367fe204715d040aeade22ca9e15e65b72db735b 100644 (file)
--- a/include/openssl/fipskey.h.in
+++ b/include/openssl/fipskey.h.in
@@ -11,6 +11,7 @@
 
 #ifndef OPENSSL_FIPSKEY_H
 # define OPENSSL_FIPSKEY_H
+# pragma once
 
 # ifdef  __cplusplus
 extern "C" {

diff --git a/include/openssl/kdferr.h b/include/openssl/kdferr.h
index d339871f6a66f78b5da01dedbcef50672db90e49..52d8e14a26776783521af077f436f94a0d76363e 100644 (file)
--- a/include/openssl/kdferr.h
+++ b/include/openssl/kdferr.h
@@ -7,4 +7,10 @@
  * https://www.openssl.org/source/license.html
  */
 
+#ifndef OPENSSL_KDFERR_H
+# define OPENSSL_KDFERR_H
+# pragma once
+
 #include <openssl/cryptoerr_legacy.h>
+
+#endif /* !defined(OPENSSL_KDFERR_H) */

diff --git a/include/openssl/macros.h b/include/openssl/macros.h
index d22bab91dc5f74449d71f1778af65ea5651cb9ee..4de30968d25854df3d85b90003e4b361add58bfd 100644 (file)
--- a/include/openssl/macros.h
+++ b/include/openssl/macros.h
@@ -7,11 +7,13 @@
  * https://www.openssl.org/source/license.html
  */
 
+#ifndef OPENSSL_MACROS_H
+# define OPENSSL_MACROS_H
+# pragma once
+
 #include <openssl/opensslconf.h>
 #include <openssl/opensslv.h>
 
-#ifndef OPENSSL_MACROS_H
-# define OPENSSL_MACROS_H
 
 /* Helper macros for CPP string composition */
 # define OPENSSL_MSTR_HELPER(x) #x

diff --git a/include/openssl/obj_mac.h b/include/openssl/obj_mac.h
index 9bf4e3b86f5eaf47ade5e4dc68891d396fcd5370..367f72f3c3af7bcf04a97b321e3381ced4cc784a 100644 (file)
--- a/include/openssl/obj_mac.h
+++ b/include/openssl/obj_mac.h
@@ -9,6 +9,10 @@
  * https://www.openssl.org/source/license.html
  */
 
+#ifndef OPENSSL_OBJ_MAC_H
+# define OPENSSL_OBJ_MAC_H
+# pragma once
+
 #define SN_undef                        "UNDEF"
 #define LN_undef                        "undefined"
 #define NID_undef                       0
@@ -5420,6 +5424,8 @@
 #define LN_aes_256_siv          "aes-256-siv"
 #define NID_aes_256_siv         1200
 
+#endif /* OPENSSL_OBJ_MAC_H */
+
 #ifndef OPENSSL_NO_DEPRECATED_3_0
 
 #define SN_id_tc26_cipher_gostr3412_2015_magma_ctracpkm                 SN_magma_ctr_acpkm
@@ -5464,4 +5470,4 @@
 #define SN_grasshopper_mac              SN_kuznyechik_mac
 #define NID_grasshopper_mac             NID_kuznyechik_mac
 
-#endif
+#endif  /* OPENSSL_NO_DEPRECATED_3_0 */

diff --git a/include/openssl/opensslconf.h b/include/openssl/opensslconf.h
index 9a49bceea3979f1e87f6edee789f2eec032ec0f7..6a2de489b060e3650c15b8207ad95a119c005545 100644 (file)
--- a/include/openssl/opensslconf.h
+++ b/include/openssl/opensslconf.h
@@ -9,8 +9,9 @@
 
 #ifndef OPENSSL_OPENSSLCONF_H
 # define OPENSSL_OPENSSLCONF_H
+# pragma once
 
-#include <openssl/configuration.h>
-#include <openssl/macros.h>
+# include <openssl/configuration.h>
+# include <openssl/macros.h>
 
 #endif  /* OPENSSL_OPENSSLCONF_H */

diff --git a/include/openssl/param_build.h b/include/openssl/param_build.h
index 58ad9be73234b9edefe8a2cf12e9988796e96e2a..eec500d340376a118408e96ecad9e943d0dc7c0f 100644 (file)
--- a/include/openssl/param_build.h
+++ b/include/openssl/param_build.h
@@ -8,8 +8,16 @@
  * https://www.openssl.org/source/license.html
  */
 
-#include <openssl/params.h>
-#include <openssl/types.h>
+#ifndef OPENSSL_PARAM_BUILD_H
+# define OPENSSL_PARAM_BUILD_H
+# pragma once
+
+# include <openssl/params.h>
+# include <openssl/types.h>
+
+# ifdef __cplusplus
+extern "C" {
+# endif
 
 OSSL_PARAM_BLD *OSSL_PARAM_BLD_new(void);
 OSSL_PARAM *OSSL_PARAM_BLD_to_param(OSSL_PARAM_BLD *bld);
@@ -49,3 +57,8 @@ int OSSL_PARAM_BLD_push_octet_string(OSSL_PARAM_BLD *bld, const char *key,
                                      const void *buf, size_t bsize);
 int OSSL_PARAM_BLD_push_octet_ptr(OSSL_PARAM_BLD *bld, const char *key,
                                   void *buf, size_t bsize);
+
+# ifdef __cplusplus
+}
+# endif
+#endif  /* OPENSSL_PARAM_BUILD_H */

diff --git a/include/openssl/params.h b/include/openssl/params.h
index 8c14ca227f0b14af3946d35c205e3f8ac4a089ab..ee592189a1866c74acef0c02d2b1e80f4b6e1c2f 100644 (file)
--- a/include/openssl/params.h
+++ b/include/openssl/params.h
@@ -10,6 +10,7 @@
 
 #ifndef OPENSSL_PARAMS_H
 # define OPENSSL_PARAMS_H
+# pragma once
 
 # include <openssl/core.h>
 # include <openssl/bn.h>

diff --git a/include/openssl/provider.h b/include/openssl/provider.h
index 80a1b412edb3da5c5f4edd864e00b5d0b5375b80..3f2ce3870187378c956503aebf433dfeed6c9b7f 100644 (file)
--- a/include/openssl/provider.h
+++ b/include/openssl/provider.h
@@ -9,6 +9,7 @@
 
 #ifndef OPENSSL_PROVIDER_H
 # define OPENSSL_PROVIDER_H
+# pragma once
 
 # include <openssl/core.h>
 

diff --git a/include/openssl/self_test.h b/include/openssl/self_test.h
index 17a78052d555a42fecdff592f2e5b3eeb05475e7..11722c31634ff320985e3c568b6ada0f95d564e4 100644 (file)
--- a/include/openssl/self_test.h
+++ b/include/openssl/self_test.h
@@ -9,6 +9,7 @@
 
 #ifndef OPENSSL_SELF_TEST_H
 # define OPENSSL_SELF_TEST_H
+# pragma once
 
 # include <openssl/core.h> /* OSSL_CALLBACK */
 

diff --git a/include/openssl/trace.h b/include/openssl/trace.h
index a0894ee2a4deeaa480372aa5f09ba52fd86ea02c..8bdc08b037560ea7e8e2f84092127a3c07501586 100644 (file)
--- a/include/openssl/trace.h
+++ b/include/openssl/trace.h
@@ -9,6 +9,7 @@
 
 #ifndef OPENSSL_TRACE_H
 # define OPENSSL_TRACE_H
+# pragma once
 
 # include <stdarg.h>
 

diff --git a/include/openssl/types.h b/include/openssl/types.h
index 2dc3606a9086a76dbc78707b4cf2a027386a399a..bf5846db054a45cebe98ccc8de335de06a5288ee 100644 (file)
--- a/include/openssl/types.h
+++ b/include/openssl/types.h
@@ -9,12 +9,13 @@
 
 #ifndef OPENSSL_TYPES_H
 # define OPENSSL_TYPES_H
+# pragma once
 
-#include <limits.h>
+# include <limits.h>
 
-#ifdef  __cplusplus
+# ifdef  __cplusplus
 extern "C" {
-#endif
+# endif
 
 # include <openssl/e_os2.h>
 # include <openssl/safestack.h>