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)
2025-04-27 10:14:36 +00:00 · 2021-02-06 22:13:21 +01:00 · 2021-02-06 22:13:21 +01:00 · d59068bd14
commit d59068bd14
parent 80ce21fe1a
22 changed files with 66 additions and 15 deletions
--- 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 */
--- 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)=@_;
--- 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
--- 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" {
--- 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>
--- 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>
--- 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" {
--- 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" {
--- 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
--- a/include/openssl/ess.h.in
+++ b/include/openssl/ess.h.in
@ -15,15 +15,17 @@ use OpenSSL::stackhash qw(generate_stack_macros);

 #ifndef OPENSSL_ESS_H
 # define OPENSSL_ESS_H
+# pragma once

 # include <openssl/opensslconf.h>

+# include <openssl/safestack.h>
+# include <openssl/x509.h>
+# include <openssl/esserr.h>
+
 # ifdef  __cplusplus
 extern "C" {
 # endif
-# include <openssl/safestack.h>
-# include <openssl/x509.h>
-# include <openssl/esserr.h>


 typedef struct ESS_issuer_serial ESS_ISSUER_SERIAL;
--- 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" {
--- 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" {
--- 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) */
--- 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
--- 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 */
--- 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 */
--- 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 */
--- 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>
--- 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>

--- 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 */

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

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