Hide global _it variables in x509.h

ok tb@

15 files changed, 77 insertions, 14 deletions

diff --git a/src/lib/libcrypto/Symbols.namespace b/src/lib/libcrypto/Symbols.namespace
index 18c93e981d..f876f3721e 100644
--- a/src/lib/libcrypto/Symbols.namespace
+++ b/src/lib/libcrypto/Symbols.namespace
@@ -3250,3 +3250,24 @@ _libre_IPAddressRange_it
 _libre_IPAddressOrRange_it
 _libre_IPAddressChoice_it
 _libre_IPAddressFamily_it
+_libre_X509_ALGOR_it
+_libre_X509_ALGORS_it
+_libre_X509_VAL_it
+_libre_X509_PUBKEY_it
+_libre_X509_SIG_it
+_libre_X509_REQ_INFO_it
+_libre_X509_REQ_it
+_libre_X509_ATTRIBUTE_it
+_libre_X509_EXTENSION_it
+_libre_X509_EXTENSIONS_it
+_libre_X509_NAME_ENTRY_it
+_libre_X509_NAME_it
+_libre_X509_CINF_it
+_libre_X509_it
+_libre_X509_REVOKED_it
+_libre_X509_CRL_INFO_it
+_libre_X509_CRL_it
+_libre_NETSCAPE_SPKI_it
+_libre_NETSCAPE_SPKAC_it
+_libre_PBEPARAM_it
+_libre_PKCS8_PRIV_KEY_INFO_it
diff --git a/src/lib/libcrypto/asn1/p5_pbe.c b/src/lib/libcrypto/asn1/p5_pbe.c
index 94daf3bedf..582d2d9a9b 100644
--- a/src/lib/libcrypto/asn1/p5_pbe.c
+++ b/src/lib/libcrypto/asn1/p5_pbe.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: p5_pbe.c,v 1.27 2024/03/28 00:44:26 tb Exp $ */
+/* $OpenBSD: p5_pbe.c,v 1.28 2024/07/08 14:48:49 beck Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 1999.
  */
@@ -89,6 +89,7 @@ const ASN1_ITEM PBEPARAM_it = {
         .size = sizeof(PBEPARAM),
         .sname = "PBEPARAM",
 };
+LCRYPTO_ALIAS(PBEPARAM_it);
 
 
 PBEPARAM *
diff --git a/src/lib/libcrypto/asn1/p8_pkey.c b/src/lib/libcrypto/asn1/p8_pkey.c
index 149591414d..bdb0c39ad5 100644
--- a/src/lib/libcrypto/asn1/p8_pkey.c
+++ b/src/lib/libcrypto/asn1/p8_pkey.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: p8_pkey.c,v 1.24 2024/04/09 13:55:02 beck Exp $ */
+/* $OpenBSD: p8_pkey.c,v 1.25 2024/07/08 14:48:49 beck Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 1999.
  */
@@ -113,6 +113,7 @@ const ASN1_ITEM PKCS8_PRIV_KEY_INFO_it = {
         .size = sizeof(PKCS8_PRIV_KEY_INFO),
         .sname = "PKCS8_PRIV_KEY_INFO",
 };
+LCRYPTO_ALIAS(PKCS8_PRIV_KEY_INFO_it);
 
 
 PKCS8_PRIV_KEY_INFO *
diff --git a/src/lib/libcrypto/asn1/x_algor.c b/src/lib/libcrypto/asn1/x_algor.c
index 71430e1fd8..b01ee982a6 100644
--- a/src/lib/libcrypto/asn1/x_algor.c
+++ b/src/lib/libcrypto/asn1/x_algor.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: x_algor.c,v 1.40 2024/04/09 13:55:02 beck Exp $ */
+/* $OpenBSD: x_algor.c,v 1.41 2024/07/08 14:48:49 beck Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 2000.
  */
@@ -86,6 +86,7 @@ const ASN1_ITEM X509_ALGOR_it = {
         .size = sizeof(X509_ALGOR),
         .sname = "X509_ALGOR",
 };
+LCRYPTO_ALIAS(X509_ALGOR_it);
 
 static const ASN1_TEMPLATE X509_ALGORS_item_tt = {
         .flags = ASN1_TFLG_SEQUENCE_OF,
@@ -104,6 +105,7 @@ const ASN1_ITEM X509_ALGORS_it = {
         .size = 0,
         .sname = "X509_ALGORS",
 };
+LCRYPTO_ALIAS(X509_ALGORS_it);
 
 X509_ALGOR *
 d2i_X509_ALGOR(X509_ALGOR **a, const unsigned char **in, long len)
diff --git a/src/lib/libcrypto/asn1/x_attrib.c b/src/lib/libcrypto/asn1/x_attrib.c
index 3e3ed38195..8e4f94094f 100644
--- a/src/lib/libcrypto/asn1/x_attrib.c
+++ b/src/lib/libcrypto/asn1/x_attrib.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: x_attrib.c,v 1.22 2024/04/09 13:55:02 beck Exp $ */
+/* $OpenBSD: x_attrib.c,v 1.23 2024/07/08 14:48:49 beck Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -90,6 +90,7 @@ const ASN1_ITEM X509_ATTRIBUTE_it = {
         .size = sizeof(X509_ATTRIBUTE),
         .sname = "X509_ATTRIBUTE",
 };
+LCRYPTO_ALIAS(X509_ATTRIBUTE_it);
 
 
 X509_ATTRIBUTE *
diff --git a/src/lib/libcrypto/asn1/x_crl.c b/src/lib/libcrypto/asn1/x_crl.c
index 0e6047db0b..4b19d756d0 100644
--- a/src/lib/libcrypto/asn1/x_crl.c
+++ b/src/lib/libcrypto/asn1/x_crl.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: x_crl.c,v 1.44 2024/04/09 13:55:02 beck Exp $ */
+/* $OpenBSD: x_crl.c,v 1.45 2024/07/08 14:48:49 beck Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -99,6 +99,7 @@ const ASN1_ITEM X509_REVOKED_it = {
         .size = sizeof(X509_REVOKED),
         .sname = "X509_REVOKED",
 };
+LCRYPTO_ALIAS(X509_REVOKED_it);
 
 /* The X509_CRL_INFO structure needs a bit of customisation.
  * Since we cache the original encoding the signature wont be affected by
@@ -179,6 +180,7 @@ const ASN1_ITEM X509_CRL_INFO_it = {
         .size = sizeof(X509_CRL_INFO),
         .sname = "X509_CRL_INFO",
 };
+LCRYPTO_ALIAS(X509_CRL_INFO_it);
 
 /* Set CRL entry issuer according to CRL certificate issuer extension.
  * Check for unhandled critical CRL entry extensions.
@@ -412,6 +414,7 @@ const ASN1_ITEM X509_CRL_it = {
         .size = sizeof(X509_CRL),
         .sname = "X509_CRL",
 };
+LCRYPTO_ALIAS(X509_CRL_it);
 
 
 X509_REVOKED *
diff --git a/src/lib/libcrypto/asn1/x_exten.c b/src/lib/libcrypto/asn1/x_exten.c
index 323b539490..21ee48395f 100644
--- a/src/lib/libcrypto/asn1/x_exten.c
+++ b/src/lib/libcrypto/asn1/x_exten.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: x_exten.c,v 1.21 2024/04/09 13:55:02 beck Exp $ */
+/* $OpenBSD: x_exten.c,v 1.22 2024/07/08 14:48:49 beck Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 2000.
  */
@@ -90,6 +90,7 @@ const ASN1_ITEM X509_EXTENSION_it = {
         .size = sizeof(X509_EXTENSION),
         .sname = "X509_EXTENSION",
 };
+LCRYPTO_ALIAS(X509_EXTENSION_it);
 
 static const ASN1_TEMPLATE X509_EXTENSIONS_item_tt = {
         .flags = ASN1_TFLG_SEQUENCE_OF,
@@ -108,6 +109,7 @@ const ASN1_ITEM X509_EXTENSIONS_it = {
         .size = 0,
         .sname = "X509_EXTENSIONS",
 };
+LCRYPTO_ALIAS(X509_EXTENSIONS_it);
 
 
 X509_EXTENSION *
diff --git a/src/lib/libcrypto/asn1/x_name.c b/src/lib/libcrypto/asn1/x_name.c
index f7d28e86b1..7bacd83340 100644
--- a/src/lib/libcrypto/asn1/x_name.c
+++ b/src/lib/libcrypto/asn1/x_name.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: x_name.c,v 1.43 2024/04/15 15:52:01 tb Exp $ */
+/* $OpenBSD: x_name.c,v 1.44 2024/07/08 14:48:49 beck Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -109,6 +109,7 @@ const ASN1_ITEM X509_NAME_ENTRY_it = {
         .size = sizeof(X509_NAME_ENTRY),
         .sname = "X509_NAME_ENTRY",
 };
+LCRYPTO_ALIAS(X509_NAME_ENTRY_it);
 
 
 X509_NAME_ENTRY *
@@ -212,6 +213,7 @@ const ASN1_ITEM X509_NAME_it = {
         .size = 0,
         .sname = "X509_NAME",
 };
+LCRYPTO_ALIAS(X509_NAME_it);
 
 X509_NAME *
 d2i_X509_NAME(X509_NAME **a, const unsigned char **in, long len)
diff --git a/src/lib/libcrypto/asn1/x_pubkey.c b/src/lib/libcrypto/asn1/x_pubkey.c
index 783e2630d3..1e772a3458 100644
--- a/src/lib/libcrypto/asn1/x_pubkey.c
+++ b/src/lib/libcrypto/asn1/x_pubkey.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: x_pubkey.c,v 1.36 2024/04/09 13:55:02 beck Exp $ */
+/* $OpenBSD: x_pubkey.c,v 1.37 2024/07/08 14:48:49 beck Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -111,6 +111,7 @@ const ASN1_ITEM X509_PUBKEY_it = {
         .size = sizeof(X509_PUBKEY),
         .sname = "X509_PUBKEY",
 };
+LCRYPTO_ALIAS(X509_PUBKEY_it);
 
 X509_PUBKEY *
 d2i_X509_PUBKEY(X509_PUBKEY **a, const unsigned char **in, long len)
diff --git a/src/lib/libcrypto/asn1/x_req.c b/src/lib/libcrypto/asn1/x_req.c
index 7dd2dd7c3e..50b55ecf50 100644
--- a/src/lib/libcrypto/asn1/x_req.c
+++ b/src/lib/libcrypto/asn1/x_req.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: x_req.c,v 1.22 2024/04/09 13:55:02 beck Exp $ */
+/* $OpenBSD: x_req.c,v 1.23 2024/07/08 14:48:49 beck Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -135,6 +135,7 @@ const ASN1_ITEM X509_REQ_INFO_it = {
         .size = sizeof(X509_REQ_INFO),
         .sname = "X509_REQ_INFO",
 };
+LCRYPTO_ALIAS(X509_REQ_INFO_it);
 
 
 X509_REQ_INFO *
@@ -199,6 +200,7 @@ const ASN1_ITEM X509_REQ_it = {
         .size = sizeof(X509_REQ),
         .sname = "X509_REQ",
 };
+LCRYPTO_ALIAS(X509_REQ_it);
 
 
 X509_REQ *
diff --git a/src/lib/libcrypto/asn1/x_sig.c b/src/lib/libcrypto/asn1/x_sig.c
index 5148b5a222..be28e9722b 100644
--- a/src/lib/libcrypto/asn1/x_sig.c
+++ b/src/lib/libcrypto/asn1/x_sig.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: x_sig.c,v 1.17 2024/04/09 13:55:02 beck Exp $ */
+/* $OpenBSD: x_sig.c,v 1.18 2024/07/08 14:48:49 beck Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -84,6 +84,7 @@ const ASN1_ITEM X509_SIG_it = {
         .size = sizeof(X509_SIG),
         .sname = "X509_SIG",
 };
+LCRYPTO_ALIAS(X509_SIG_it);
 
 
 X509_SIG *
diff --git a/src/lib/libcrypto/asn1/x_spki.c b/src/lib/libcrypto/asn1/x_spki.c
index 545799e2ae..e711b80611 100644
--- a/src/lib/libcrypto/asn1/x_spki.c
+++ b/src/lib/libcrypto/asn1/x_spki.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: x_spki.c,v 1.14 2024/04/09 13:55:02 beck Exp $ */
+/* $OpenBSD: x_spki.c,v 1.15 2024/07/08 14:48:49 beck Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -86,6 +86,7 @@ const ASN1_ITEM NETSCAPE_SPKAC_it = {
         .size = sizeof(NETSCAPE_SPKAC),
         .sname = "NETSCAPE_SPKAC",
 };
+LCRYPTO_ALIAS(NETSCAPE_SPKAC_it);
 
 
 NETSCAPE_SPKAC *
@@ -150,6 +151,7 @@ const ASN1_ITEM NETSCAPE_SPKI_it = {
         .size = sizeof(NETSCAPE_SPKI),
         .sname = "NETSCAPE_SPKI",
 };
+LCRYPTO_ALIAS(NETSCAPE_SPKI_it);
 
 
 NETSCAPE_SPKI *
diff --git a/src/lib/libcrypto/asn1/x_val.c b/src/lib/libcrypto/asn1/x_val.c
index 47e1755151..486304e42b 100644
--- a/src/lib/libcrypto/asn1/x_val.c
+++ b/src/lib/libcrypto/asn1/x_val.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: x_val.c,v 1.14 2024/04/09 13:55:02 beck Exp $ */
+/* $OpenBSD: x_val.c,v 1.15 2024/07/08 14:48:49 beck Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -82,6 +82,7 @@ const ASN1_ITEM X509_VAL_it = {
         .size = sizeof(X509_VAL),
         .sname = "X509_VAL",
 };
+LCRYPTO_ALIAS(X509_VAL_it);
 
 
 X509_VAL *
diff --git a/src/lib/libcrypto/asn1/x_x509.c b/src/lib/libcrypto/asn1/x_x509.c
index e3499f620f..4ea45fe29b 100644
--- a/src/lib/libcrypto/asn1/x_x509.c
+++ b/src/lib/libcrypto/asn1/x_x509.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: x_x509.c,v 1.38 2024/04/09 13:55:02 beck Exp $ */
+/* $OpenBSD: x_x509.c,v 1.39 2024/07/08 14:48:49 beck Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -141,6 +141,7 @@ const ASN1_ITEM X509_CINF_it = {
         .size = sizeof(X509_CINF),
         .sname = "X509_CINF",
 };
+LCRYPTO_ALIAS(X509_CINF_it);
 
 
 X509_CINF *
@@ -256,6 +257,7 @@ const ASN1_ITEM X509_it = {
         .size = sizeof(X509),
         .sname = "X509",
 };
+LCRYPTO_ALIAS(X509_it);
 
 
 X509 *
diff --git a/src/lib/libcrypto/hidden/openssl/x509.h b/src/lib/libcrypto/hidden/openssl/x509.h
index 6cf6ca5f6d..4a211b0e66 100644
--- a/src/lib/libcrypto/hidden/openssl/x509.h
+++ b/src/lib/libcrypto/hidden/openssl/x509.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: x509.h,v 1.5 2024/04/09 13:55:02 beck Exp $ */
+/* $OpenBSD: x509.h,v 1.6 2024/07/08 14:48:49 beck Exp $ */
 /*
  * Copyright (c) 2022 Bob Beck <beck@openbsd.org>
  *
@@ -463,5 +463,26 @@ LCRYPTO_USED(PKCS8_pkey_get0_attrs);
 LCRYPTO_USED(PKCS8_pkey_add1_attr_by_NID);
 LCRYPTO_USED(X509_PUBKEY_set0_param);
 LCRYPTO_USED(X509_PUBKEY_get0_param);
+extern LCRYPTO_USED(X509_ALGOR_it);
+extern LCRYPTO_USED(X509_ALGORS_it);
+extern LCRYPTO_USED(X509_VAL_it);
+extern LCRYPTO_USED(X509_PUBKEY_it);
+extern LCRYPTO_USED(X509_SIG_it);
+extern LCRYPTO_USED(X509_REQ_INFO_it);
+extern LCRYPTO_USED(X509_REQ_it);
+extern LCRYPTO_USED(X509_ATTRIBUTE_it);
+extern LCRYPTO_USED(X509_EXTENSION_it);
+extern LCRYPTO_USED(X509_EXTENSIONS_it);
+extern LCRYPTO_USED(X509_NAME_ENTRY_it);
+extern LCRYPTO_USED(X509_NAME_it);
+extern LCRYPTO_USED(X509_CINF_it);
+extern LCRYPTO_USED(X509_it);
+extern LCRYPTO_USED(X509_REVOKED_it);
+extern LCRYPTO_USED(X509_CRL_INFO_it);
+extern LCRYPTO_USED(X509_CRL_it);
+extern LCRYPTO_USED(NETSCAPE_SPKI_it);
+extern LCRYPTO_USED(NETSCAPE_SPKAC_it);
+extern LCRYPTO_USED(PBEPARAM_it);
+extern LCRYPTO_USED(PKCS8_PRIV_KEY_INFO_it);
 
 #endif /* _LIBCRYPTO_X509_H */