Hide global _it symbola in cms.h

ok tb@

diff --git a/lib/libcrypto/Symbols.namespace b/lib/libcrypto/Symbols.namespace
index 32c1729..ab6111e 100644 (file)
--- a/lib/libcrypto/Symbols.namespace
+++ b/lib/libcrypto/Symbols.namespace
@@ -3334,6 +3334,8 @@ _libre_RSA_OAEP_PARAMS_it
 _libre_DSAPublicKey_it
 _libre_DSAPrivateKey_it
 _libre_DSAparams_it
+_libre_CMS_ContentInfo_it
+_libre_CMS_ReceiptRequest_it
 _libre_RSAPublicKey_it
 _libre_RSAPrivateKey_it
 _libre_RSA_PSS_PARAMS_it

diff --git a/lib/libcrypto/cms/cms_asn1.c b/lib/libcrypto/cms/cms_asn1.c
index 531b8c5..8f2e122 100644 (file)
--- a/lib/libcrypto/cms/cms_asn1.c
+++ b/lib/libcrypto/cms/cms_asn1.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cms_asn1.c,v 1.23 2023/07/08 08:26:26 beck Exp $ */
+/* $OpenBSD: cms_asn1.c,v 1.24 2024/07/09 06:12:45 beck Exp $ */
 /*
  * Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project.
@@ -1390,6 +1390,7 @@ const ASN1_ITEM CMS_ContentInfo_it = {
        .size = sizeof(CMS_ContentInfo),
        .sname = "CMS_ContentInfo",
 };
+LCRYPTO_ALIAS(CMS_ContentInfo_it);
 
 /* Specials for signed attributes */
 
@@ -1501,6 +1502,7 @@ const ASN1_ITEM CMS_ReceiptRequest_it = {
        .size = sizeof(CMS_ReceiptRequest),
        .sname = "CMS_ReceiptRequest",
 };
+LCRYPTO_ALIAS(CMS_ReceiptRequest_it);
 
 static const ASN1_TEMPLATE CMS_Receipt_seq_tt[] = {
        {

diff --git a/lib/libcrypto/hidden/openssl/cms.h b/lib/libcrypto/hidden/openssl/cms.h
index 430b2c5..a99c977 100644 (file)
--- a/lib/libcrypto/hidden/openssl/cms.h
+++ b/lib/libcrypto/hidden/openssl/cms.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: cms.h,v 1.3 2024/03/30 01:53:05 joshua Exp $ */
+/* $OpenBSD: cms.h,v 1.4 2024/07/09 06:12:45 beck Exp $ */
 /*
  * Copyright (c) 2023 Bob Beck <beck@openbsd.org>
  *
@@ -153,5 +153,9 @@ LCRYPTO_USED(CMS_RecipientInfo_kari_get0_ctx);
 LCRYPTO_USED(CMS_RecipientInfo_kari_decrypt);
 LCRYPTO_USED(CMS_SharedInfo_encode);
 LCRYPTO_USED(ERR_load_CMS_strings);
+#if defined(LIBRESSL_NAMESPACE)
+extern LCRYPTO_USED(CMS_ContentInfo_it);
+extern LCRYPTO_USED(CMS_ReceiptRequest_it);
+#endif
 
 #endif /* _LIBCRYPTO_CMS_H */