summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbeck <>2024-07-09 06:13:22 +0000
committerbeck <>2024-07-09 06:13:22 +0000
commite779c9960720550a81fa153d3e44a15528fcd683 (patch)
tree93920962fddf6c08bcdbd1dd5af80b06ef773339
parentf3e260cd7bf0a231d2660d996d9e3c2f152f7607 (diff)
downloadopenbsd-e779c9960720550a81fa153d3e44a15528fcd683.tar.gz
openbsd-e779c9960720550a81fa153d3e44a15528fcd683.tar.bz2
openbsd-e779c9960720550a81fa153d3e44a15528fcd683.zip
Hide global _it symbols in pkcs12.h
ok tb@
-rw-r--r--src/lib/libcrypto/Symbols.namespace2
-rw-r--r--src/lib/libcrypto/hidden/openssl/pkcs12.h6
-rw-r--r--src/lib/libcrypto/pkcs12/p12_asn.c4
3 files changed, 10 insertions, 2 deletions
diff --git a/src/lib/libcrypto/Symbols.namespace b/src/lib/libcrypto/Symbols.namespace
index ab6111e2aa..b38d57a726 100644
--- a/src/lib/libcrypto/Symbols.namespace
+++ b/src/lib/libcrypto/Symbols.namespace
@@ -3336,6 +3336,8 @@ _libre_DSAPrivateKey_it
3336_libre_DSAparams_it 3336_libre_DSAparams_it
3337_libre_CMS_ContentInfo_it 3337_libre_CMS_ContentInfo_it
3338_libre_CMS_ReceiptRequest_it 3338_libre_CMS_ReceiptRequest_it
3339_libre_PKCS12_it
3340_libre_PKCS12_SAFEBAG_it
3339_libre_RSAPublicKey_it 3341_libre_RSAPublicKey_it
3340_libre_RSAPrivateKey_it 3342_libre_RSAPrivateKey_it
3341_libre_RSA_PSS_PARAMS_it 3343_libre_RSA_PSS_PARAMS_it
diff --git a/src/lib/libcrypto/hidden/openssl/pkcs12.h b/src/lib/libcrypto/hidden/openssl/pkcs12.h
index 4c37e73cc4..0144ba4e35 100644
--- a/src/lib/libcrypto/hidden/openssl/pkcs12.h
+++ b/src/lib/libcrypto/hidden/openssl/pkcs12.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: pkcs12.h,v 1.3 2024/03/02 10:15:16 tb Exp $ */ 1/* $OpenBSD: pkcs12.h,v 1.4 2024/07/09 06:13:22 beck Exp $ */
2/* 2/*
3 * Copyright (c) 2022 Bob Beck <beck@openbsd.org> 3 * Copyright (c) 2022 Bob Beck <beck@openbsd.org>
4 * 4 *
@@ -67,5 +67,9 @@ LCRYPTO_USED(d2i_PKCS12_bio);
67LCRYPTO_USED(d2i_PKCS12_fp); 67LCRYPTO_USED(d2i_PKCS12_fp);
68LCRYPTO_USED(PKCS12_newpass); 68LCRYPTO_USED(PKCS12_newpass);
69LCRYPTO_USED(ERR_load_PKCS12_strings); 69LCRYPTO_USED(ERR_load_PKCS12_strings);
70#if defined(LIBRESSL_NAMESPACE)
71extern LCRYPTO_USED(PKCS12_it);
72extern LCRYPTO_USED(PKCS12_SAFEBAG_it);
73#endif
70 74
71#endif /* _LIBCRYPTO_PKCS12_H */ 75#endif /* _LIBCRYPTO_PKCS12_H */
diff --git a/src/lib/libcrypto/pkcs12/p12_asn.c b/src/lib/libcrypto/pkcs12/p12_asn.c
index e6078050be..fd2f431f46 100644
--- a/src/lib/libcrypto/pkcs12/p12_asn.c
+++ b/src/lib/libcrypto/pkcs12/p12_asn.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: p12_asn.c,v 1.15 2024/03/02 10:15:16 tb Exp $ */ 1/* $OpenBSD: p12_asn.c,v 1.16 2024/07/09 06:13:22 beck Exp $ */
2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL 2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
3 * project 1999. 3 * project 1999.
4 */ 4 */
@@ -98,6 +98,7 @@ const ASN1_ITEM PKCS12_it = {
98 .size = sizeof(PKCS12), 98 .size = sizeof(PKCS12),
99 .sname = "PKCS12", 99 .sname = "PKCS12",
100}; 100};
101LCRYPTO_ALIAS(PKCS12_it);
101 102
102 103
103PKCS12 * 104PKCS12 *
@@ -413,6 +414,7 @@ const ASN1_ITEM PKCS12_SAFEBAG_it = {
413 .size = sizeof(PKCS12_SAFEBAG), 414 .size = sizeof(PKCS12_SAFEBAG),
414 .sname = "PKCS12_SAFEBAG", 415 .sname = "PKCS12_SAFEBAG",
415}; 416};
417LCRYPTO_ALIAS(PKCS12_SAFEBAG_it);
416 418
417 419
418PKCS12_SAFEBAG * 420PKCS12_SAFEBAG *