From 589ce5b7ce914a390f696d8401d34dacb6cf26d7 Mon Sep 17 00:00:00 2001
From: beck <beck@openbsd.org>
Date: Mon, 8 Jul 2024 16:23:27 +0000
Subject: [PATCH] Hide global _it symbols in pkcs7.h

ok tb@
---
 lib/libcrypto/Symbols.namespace      | 12 ++++++++++++
 lib/libcrypto/hidden/openssl/pkcs7.h | 15 ++++++++++++++-
 lib/libcrypto/pkcs7/pk7_asn1.c       | 14 +++++++++++++-
 3 files changed, 39 insertions(+), 2 deletions(-)

diff --git a/lib/libcrypto/Symbols.namespace b/lib/libcrypto/Symbols.namespace
index 5e502dd0419..36d9a257252 100644
--- a/lib/libcrypto/Symbols.namespace
+++ b/lib/libcrypto/Symbols.namespace
@@ -3310,3 +3310,15 @@ _libre_OCSP_SIGNATURE_it
 _libre_OCSP_REQINFO_it
 _libre_OCSP_CRLID_it
 _libre_OCSP_SERVICELOC_it
+_libre_PKCS7_ISSUER_AND_SERIAL_it
+_libre_PKCS7_SIGNER_INFO_it
+_libre_PKCS7_RECIP_INFO_it
+_libre_PKCS7_SIGNED_it
+_libre_PKCS7_ENC_CONTENT_it
+_libre_PKCS7_ENVELOPE_it
+_libre_PKCS7_SIGN_ENVELOPE_it
+_libre_PKCS7_DIGEST_it
+_libre_PKCS7_ENCRYPT_it
+_libre_PKCS7_it
+_libre_PKCS7_ATTR_SIGN_it
+_libre_PKCS7_ATTR_VERIFY_it
diff --git a/lib/libcrypto/hidden/openssl/pkcs7.h b/lib/libcrypto/hidden/openssl/pkcs7.h
index f12b5df1787..faa422c129f 100644
--- a/lib/libcrypto/hidden/openssl/pkcs7.h
+++ b/lib/libcrypto/hidden/openssl/pkcs7.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: pkcs7.h,v 1.3 2023/07/05 21:14:54 bcook Exp $ */
+/* $OpenBSD: pkcs7.h,v 1.4 2024/07/08 16:23:27 beck Exp $ */
 /*
  * Copyright (c) 2022 Bob Beck <beck@openbsd.org>
  *
@@ -125,5 +125,18 @@ LCRYPTO_USED(SMIME_write_PKCS7);
 LCRYPTO_USED(SMIME_read_PKCS7);
 LCRYPTO_USED(BIO_new_PKCS7);
 LCRYPTO_USED(ERR_load_PKCS7_strings);
+extern LCRYPTO_USED(PKCS7_ISSUER_AND_SERIAL_it);
+extern LCRYPTO_USED(PKCS7_SIGNER_INFO_it);
+extern LCRYPTO_USED(PKCS7_RECIP_INFO_it);
+extern LCRYPTO_USED(PKCS7_SIGNED_it);
+extern LCRYPTO_USED(PKCS7_ENC_CONTENT_it);
+extern LCRYPTO_USED(PKCS7_ENVELOPE_it);
+extern LCRYPTO_USED(PKCS7_SIGN_ENVELOPE_it);
+extern LCRYPTO_USED(PKCS7_DIGEST_it);
+extern LCRYPTO_USED(PKCS7_ENCRYPT_it);
+extern LCRYPTO_USED(PKCS7_it);
+extern LCRYPTO_USED(PKCS7_ATTR_SIGN_it);
+extern LCRYPTO_USED(PKCS7_ATTR_VERIFY_it);
+
 
 #endif /* _LIBCRYPTO_PKCS7_H */
diff --git a/lib/libcrypto/pkcs7/pk7_asn1.c b/lib/libcrypto/pkcs7/pk7_asn1.c
index 27f41030253..8a6ae487dae 100644
--- a/lib/libcrypto/pkcs7/pk7_asn1.c
+++ b/lib/libcrypto/pkcs7/pk7_asn1.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pk7_asn1.c,v 1.17 2023/04/25 18:04:03 tb Exp $ */
+/* $OpenBSD: pk7_asn1.c,v 1.18 2024/07/08 16:23:27 beck Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 2000.
  */
@@ -214,6 +214,7 @@ const ASN1_ITEM PKCS7_it = {
 	.size = sizeof(PKCS7),
 	.sname = "PKCS7",
 };
+LCRYPTO_ALIAS(PKCS7_it);
 
 
 PKCS7 *
@@ -306,6 +307,7 @@ const ASN1_ITEM PKCS7_SIGNED_it = {
 	.size = sizeof(PKCS7_SIGNED),
 	.sname = "PKCS7_SIGNED",
 };
+LCRYPTO_ALIAS(PKCS7_SIGNED_it);
 
 
 PKCS7_SIGNED *
@@ -422,6 +424,7 @@ const ASN1_ITEM PKCS7_SIGNER_INFO_it = {
 	.size = sizeof(PKCS7_SIGNER_INFO),
 	.sname = "PKCS7_SIGNER_INFO",
 };
+LCRYPTO_ALIAS(PKCS7_SIGNER_INFO_it);
 
 
 PKCS7_SIGNER_INFO *
@@ -479,6 +482,7 @@ const ASN1_ITEM PKCS7_ISSUER_AND_SERIAL_it = {
 	.size = sizeof(PKCS7_ISSUER_AND_SERIAL),
 	.sname = "PKCS7_ISSUER_AND_SERIAL",
 };
+LCRYPTO_ALIAS(PKCS7_ISSUER_AND_SERIAL_it);
 
 
 PKCS7_ISSUER_AND_SERIAL *
@@ -543,6 +547,7 @@ const ASN1_ITEM PKCS7_ENVELOPE_it = {
 	.size = sizeof(PKCS7_ENVELOPE),
 	.sname = "PKCS7_ENVELOPE",
 };
+LCRYPTO_ALIAS(PKCS7_ENVELOPE_it);
 
 
 PKCS7_ENVELOPE *
@@ -633,6 +638,7 @@ const ASN1_ITEM PKCS7_RECIP_INFO_it = {
 	.size = sizeof(PKCS7_RECIP_INFO),
 	.sname = "PKCS7_RECIP_INFO",
 };
+LCRYPTO_ALIAS(PKCS7_RECIP_INFO_it);
 
 
 PKCS7_RECIP_INFO *
@@ -697,6 +703,7 @@ const ASN1_ITEM PKCS7_ENC_CONTENT_it = {
 	.size = sizeof(PKCS7_ENC_CONTENT),
 	.sname = "PKCS7_ENC_CONTENT",
 };
+LCRYPTO_ALIAS(PKCS7_ENC_CONTENT_it);
 
 
 PKCS7_ENC_CONTENT *
@@ -789,6 +796,7 @@ const ASN1_ITEM PKCS7_SIGN_ENVELOPE_it = {
 	.size = sizeof(PKCS7_SIGN_ENVELOPE),
 	.sname = "PKCS7_SIGN_ENVELOPE",
 };
+LCRYPTO_ALIAS(PKCS7_SIGN_ENVELOPE_it);
 
 
 PKCS7_SIGN_ENVELOPE *
@@ -846,6 +854,7 @@ const ASN1_ITEM PKCS7_ENCRYPT_it = {
 	.size = sizeof(PKCS7_ENCRYPT),
 	.sname = "PKCS7_ENCRYPT",
 };
+LCRYPTO_ALIAS(PKCS7_ENCRYPT_it);
 
 
 PKCS7_ENCRYPT *
@@ -917,6 +926,7 @@ const ASN1_ITEM PKCS7_DIGEST_it = {
 	.size = sizeof(PKCS7_DIGEST),
 	.sname = "PKCS7_DIGEST",
 };
+LCRYPTO_ALIAS(PKCS7_DIGEST_it);
 
 
 PKCS7_DIGEST *
@@ -971,6 +981,7 @@ const ASN1_ITEM PKCS7_ATTR_SIGN_it = {
 	.size = 0,
 	.sname = "PKCS7_ATTR_SIGN",
 };
+LCRYPTO_ALIAS(PKCS7_ATTR_SIGN_it);
 
 /* When verifying attributes we need to use the received order. So
  * we use SEQUENCE OF and tag it to SET OF
@@ -993,6 +1004,7 @@ const ASN1_ITEM PKCS7_ATTR_VERIFY_it = {
 	.size = 0,
 	.sname = "PKCS7_ATTR_VERIFY",
 };
+LCRYPTO_ALIAS(PKCS7_ATTR_VERIFY_it);
 
 
 int
-- 
2.20.1