Commit b7ed2cc579 for openssl.org

commit b7ed2cc57900051504f6d4f18179c97d2380bf73
Author: Bob Beck <beck@openssl.org>
Date:   Mon Apr 27 17:14:05 2026 -0600

    Guard and make self-contained obj_dat.h and obj_xref.h

    Modifies the perl to generate them as such

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

diff --git a/crypto/objects/obj_dat.h b/crypto/objects/obj_dat.h
index d6ac8a446b..c7925932d5 100644
--- a/crypto/objects/obj_dat.h
+++ b/crypto/objects/obj_dat.h
@@ -9,6 +9,16 @@
  * https://www.openssl.org/source/license.html
  */

+#if !defined(OSSL_LIBCRYPTO_OBJECTS_OBJ_DAT_H)
+#define OSSL_LIBCRYPTO_OBJECTS_OBJ_DAT_H
+
+/* clang-format off */
+
+#include <openssl/asn1.h>
+#include <openssl/objects.h>
+
+#include <crypto/asn1.h>
+
 /* Serialized OID's */
 static const unsigned char so[9582] = {
     0x2A,0x86,0x48,0x86,0xF7,0x0D,                 /* [    0] OBJ_rsadsi */
@@ -7209,3 +7219,6 @@ static const unsigned int obj_objs[NUM_OBJ] = {
     1168,    /* OBJ_uacurve8                     1 2 804 2 1 1 1 1 3 1 1 2 8 */
     1169,    /* OBJ_uacurve9                     1 2 804 2 1 1 1 1 3 1 1 2 9 */
 };
+/* clang-format on */
+
+#endif /* !defined(OSSL_LIBCRYPTO_OBJECTS_OBJ_DAT_H) */
diff --git a/crypto/objects/obj_dat.pl b/crypto/objects/obj_dat.pl
index 510a906f57..12836e1bbd 100644
--- a/crypto/objects/obj_dat.pl
+++ b/crypto/objects/obj_dat.pl
@@ -165,6 +165,16 @@ print <<"EOF";
  * https://www.openssl.org/source/license.html
  */

+#if !defined(OSSL_LIBCRYPTO_OBJECTS_OBJ_DAT_H)
+#define OSSL_LIBCRYPTO_OBJECTS_OBJ_DAT_H
+
+/* clang-format off */
+
+#include <openssl/asn1.h>
+#include <openssl/objects.h>
+
+#include <crypto/asn1.h>
+
 EOF

 print "/* Serialized OID's */\n";
@@ -227,3 +237,5 @@ foreach (sort obj_cmp @a) {
     printf "    %4d,    /* %-32s %s */\n", $_, $m, $v;
 }
 print  "};\n";
+print "/* clang-format on */\n";
+print "\n#endif /* !defined(OSSL_LIBCRYPTO_OBJECTS_OBJ_DAT_H) */\n";
diff --git a/crypto/objects/obj_xref.h b/crypto/objects/obj_xref.h
index 72e6c6846f..955571e134 100644
--- a/crypto/objects/obj_xref.h
+++ b/crypto/objects/obj_xref.h
@@ -10,6 +10,12 @@
  * https://www.openssl.org/source/license.html
  */

+#if !defined(OSSL_LIBCRYPTO_OBJECTS_OBJ_XREF_H)
+#define OSSL_LIBCRYPTO_OBJECTS_OBJ_XREF_H
+
+/* clang-format off */
+
+#include <openssl/objects.h>

 typedef struct {
     int sign_id;
@@ -151,3 +157,6 @@ static const nid_triple *const sigoid_srt_xref[] = {
     &sigoid_srt[47],
     &sigoid_srt[52],
 };
+/* clang-format on */
+
+#endif /* !defined(OSSL_LIBCRYPTO_OBJECTS_OBJ_XREF_H) */
diff --git a/crypto/objects/objxref.pl b/crypto/objects/objxref.pl
index a6748f00f4..5eeeac5c1f 100644
--- a/crypto/objects/objxref.pl
+++ b/crypto/objects/objxref.pl
@@ -84,6 +84,12 @@ print <<EOF;
  * https://www.openssl.org/source/license.html
  */

+#if !defined(OSSL_LIBCRYPTO_OBJECTS_OBJ_XREF_H)
+#define OSSL_LIBCRYPTO_OBJECTS_OBJ_XREF_H
+
+/* clang-format off */
+
+#include <openssl/objects.h>

 typedef struct {
     int sign_id;
@@ -129,6 +135,8 @@ foreach (@srt2)
 	}

 print "};\n";
+print "/* clang-format on */\n";
+print "\n#endif /* !defined(OSSL_LIBCRYPTO_OBJECTS_OBJ_XREF_H) */\n";

 sub check_oid
 	{