From: Bob Beck <beck@openssl.org>
Date: Tue, 28 Apr 2026 01:29:34 +0000 (-0600)
Subject: Guard output of keysets.pl
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=14d3ad46a8a4d20d9284bbd89eab7fd1e83d6c89;p=thirdparty%2Fopenssl.git

Guard output of keysets.pl

Reviewed-by: Tomas Mraz <tomas@openssl.foundation>
Reviewed-by: Nikola Pajkovsky <nikolap@openssl.org>
Reviewed-by: Norbert Pocs <norbertp@openssl.org>
MergeDate: Wed May  6 11:36:01 2026
(Merged from https://github.com/openssl/openssl/pull/31001)
---

diff --git a/crypto/conf/conf_def.h b/crypto/conf/conf_def.h
index 1f66a58e092..2fdc9d7d996 100644
--- a/crypto/conf/conf_def.h
+++ b/crypto/conf/conf_def.h
@@ -2,13 +2,16 @@
  * WARNING: do not edit!
  * Generated by crypto/conf/keysets.pl
  *
- * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2026 The OpenSSL Project Authors. All Rights Reserved.
  * Licensed under the Apache License 2.0 (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
  * in the file LICENSE in the source distribution or at
  * https://www.openssl.org/source/license.html
  */
+#if !defined(OSSL_LIBCRYPTO_CONF_CONF_DEF_H)
+#define OSSL_LIBCRYPTO_CONF_CONF_DEF_H
 
+/* clang-format off */
 #define CONF_NUMBER       1
 #define CONF_UPPER        2
 #define CONF_LOWER        4
@@ -78,3 +81,6 @@ static const unsigned short CONF_type_win32[128] = {
     0x0004, 0x0004, 0x0004, 0x0000, 0x0200, 0x0000, 0x0200, 0x0000,
 };
 #endif
+/* clang-format on */
+
+#endif /* !defined(OSSL_LIBCRYPTO_CONF_CONF_DEF_H) */
diff --git a/crypto/conf/keysets.pl b/crypto/conf/keysets.pl
index 7e83d800501..cb0ddc300a9 100644
--- a/crypto/conf/keysets.pl
+++ b/crypto/conf/keysets.pl
@@ -73,7 +73,10 @@ print <<"EOF";
  * in the file LICENSE in the source distribution or at
  * https://www.openssl.org/source/license.html
  */
+#if !defined(OSSL_LIBCRYPTO_CONF_CONF_DEF_H)
+#define OSSL_LIBCRYPTO_CONF_CONF_DEF_H
 
+/* clang-format off */
 #define CONF_NUMBER       $NUMBER
 #define CONF_UPPER        $UPPER
 #define CONF_LOWER        $LOWER
@@ -123,3 +126,5 @@ for ($i = 0; $i < 128; $i++) {
 }
 print "\n};\n";
 print "#endif\n";
+print "/* clang-format on */\n";
+print "\n#endif /* !defined(OSSL_LIBCRYPTO_CONF_CONF_DEF_H) */\n";