From: Bob Beck <beck@openssl.org>
Date: Tue, 28 Apr 2026 01:38:41 +0000 (-0600)
Subject: Guard charmap.h
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b855299a66284d828277713f5f7980ebe980ef1c;p=thirdparty%2Fopenssl.git

Guard charmap.h

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:02 2026
(Merged from https://github.com/openssl/openssl/pull/31001)
---

diff --git a/crypto/asn1/charmap.h b/crypto/asn1/charmap.h
index ac1eb076cc2..ca99f05b325 100644
--- a/crypto/asn1/charmap.h
+++ b/crypto/asn1/charmap.h
@@ -2,7 +2,7 @@
  * WARNING: do not edit!
  * Generated by crypto/asn1/charmap.pl
  *
- * Copyright 2000-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2000-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
@@ -10,6 +10,10 @@
  * https://www.openssl.org/source/license.html
  */
 
+#if !defined(OSSL_LIBCRYPTO_ASN1_CHARMAP_H)
+#define OSSL_LIBCRYPTO_ASN1_CHARMAP_H
+
+/* clang-format off */
 #define CHARTYPE_HOST_ANY 4096
 #define CHARTYPE_HOST_DOT 8192
 #define CHARTYPE_HOST_HYPHEN 16384
@@ -32,3 +36,6 @@ static const unsigned short char_type[] = {
     4112, 4112, 4112, 4112, 4112, 4112, 4112, 4112, 4112, 4112, 4112, 4112,
     4112, 4112, 4112,    0,    0,    0,    0,    2
 };
+/* clang-format on */
+
+#endif /* !defined(OSSL_LIBCRYPTO_ASN1_CHARMAP_H) */
diff --git a/crypto/asn1/charmap.pl b/crypto/asn1/charmap.pl
index 78053dee15f..53add528254 100644
--- a/crypto/asn1/charmap.pl
+++ b/crypto/asn1/charmap.pl
@@ -101,6 +101,10 @@ print <<EOF;
  * https://www.openssl.org/source/license.html
  */
 
+#if !defined(OSSL_LIBCRYPTO_ASN1_CHARMAP_H)
+#define OSSL_LIBCRYPTO_ASN1_CHARMAP_H
+
+/* clang-format off */
 #define CHARTYPE_HOST_ANY $HOST_ANY
 #define CHARTYPE_HOST_DOT $HOST_DOT
 #define CHARTYPE_HOST_HYPHEN $HOST_HYPHEN
@@ -120,4 +124,7 @@ for($i = 0; $i < 128; $i++) {
 	print(",") if ($i != 127);
 }
 print("\n};\n");
+print "/* clang-format on */\n";
+print "\n#endif /* !defined(OSSL_LIBCRYPTO_ASN1_CHARMAP_H) */\n";
+