diff options
| author | Bob Beck <beck@cvs.openbsd.org> | 2024-07-09 06:13:23 +0000 |
|---|---|---|
| committer | Bob Beck <beck@cvs.openbsd.org> | 2024-07-09 06:13:23 +0000 |
| commit | 7553e60ac3ec18b3e36ca4a180507e3f208cbaa5 (patch) | |
| tree | 0de385658484705e7e6f6bc39fa9e66d0157ed99 /lib/libcrypto | |
| parent | a3ac682f812b111ff3c908bca047710787d8aee5 (diff) | |
Hide global _it symbols in pkcs12.h
ok tb@
Diffstat (limited to 'lib/libcrypto')
| -rw-r--r-- | lib/libcrypto/Symbols.namespace | 2 | ||||
| -rw-r--r-- | lib/libcrypto/hidden/openssl/pkcs12.h | 6 | ||||
| -rw-r--r-- | lib/libcrypto/pkcs12/p12_asn.c | 4 |
3 files changed, 10 insertions, 2 deletions
diff --git a/lib/libcrypto/Symbols.namespace b/lib/libcrypto/Symbols.namespace index ab6111e2aad..b38d57a726e 100644 --- a/lib/libcrypto/Symbols.namespace +++ b/lib/libcrypto/Symbols.namespace @@ -3336,6 +3336,8 @@ _libre_DSAPrivateKey_it _libre_DSAparams_it _libre_CMS_ContentInfo_it _libre_CMS_ReceiptRequest_it +_libre_PKCS12_it +_libre_PKCS12_SAFEBAG_it _libre_RSAPublicKey_it _libre_RSAPrivateKey_it _libre_RSA_PSS_PARAMS_it diff --git a/lib/libcrypto/hidden/openssl/pkcs12.h b/lib/libcrypto/hidden/openssl/pkcs12.h index 4c37e73cc4c..0144ba4e354 100644 --- a/lib/libcrypto/hidden/openssl/pkcs12.h +++ b/lib/libcrypto/hidden/openssl/pkcs12.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pkcs12.h,v 1.3 2024/03/02 10:15:16 tb Exp $ */ +/* $OpenBSD: pkcs12.h,v 1.4 2024/07/09 06:13:22 beck Exp $ */ /* * Copyright (c) 2022 Bob Beck <beck@openbsd.org> * @@ -67,5 +67,9 @@ LCRYPTO_USED(d2i_PKCS12_bio); LCRYPTO_USED(d2i_PKCS12_fp); LCRYPTO_USED(PKCS12_newpass); LCRYPTO_USED(ERR_load_PKCS12_strings); +#if defined(LIBRESSL_NAMESPACE) +extern LCRYPTO_USED(PKCS12_it); +extern LCRYPTO_USED(PKCS12_SAFEBAG_it); +#endif #endif /* _LIBCRYPTO_PKCS12_H */ diff --git a/lib/libcrypto/pkcs12/p12_asn.c b/lib/libcrypto/pkcs12/p12_asn.c index e6078050be8..fd2f431f463 100644 --- a/lib/libcrypto/pkcs12/p12_asn.c +++ b/lib/libcrypto/pkcs12/p12_asn.c @@ -1,4 +1,4 @@ -/* $OpenBSD: p12_asn.c,v 1.15 2024/03/02 10:15:16 tb Exp $ */ +/* $OpenBSD: p12_asn.c,v 1.16 2024/07/09 06:13:22 beck Exp $ */ /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project 1999. */ @@ -98,6 +98,7 @@ const ASN1_ITEM PKCS12_it = { .size = sizeof(PKCS12), .sname = "PKCS12", }; +LCRYPTO_ALIAS(PKCS12_it); PKCS12 * @@ -413,6 +414,7 @@ const ASN1_ITEM PKCS12_SAFEBAG_it = { .size = sizeof(PKCS12_SAFEBAG), .sname = "PKCS12_SAFEBAG", }; +LCRYPTO_ALIAS(PKCS12_SAFEBAG_it); PKCS12_SAFEBAG * |