diff options
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/libcrypto/Symbols.namespace | 2 | ||||
| -rw-r--r-- | src/lib/libcrypto/hidden/openssl/pkcs12.h | 6 | ||||
| -rw-r--r-- | src/lib/libcrypto/pkcs12/p12_asn.c | 4 |
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); | |||
| 67 | LCRYPTO_USED(d2i_PKCS12_fp); | 67 | LCRYPTO_USED(d2i_PKCS12_fp); |
| 68 | LCRYPTO_USED(PKCS12_newpass); | 68 | LCRYPTO_USED(PKCS12_newpass); |
| 69 | LCRYPTO_USED(ERR_load_PKCS12_strings); | 69 | LCRYPTO_USED(ERR_load_PKCS12_strings); |
| 70 | #if defined(LIBRESSL_NAMESPACE) | ||
| 71 | extern LCRYPTO_USED(PKCS12_it); | ||
| 72 | extern 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 | }; |
| 101 | LCRYPTO_ALIAS(PKCS12_it); | ||
| 101 | 102 | ||
| 102 | 103 | ||
| 103 | PKCS12 * | 104 | PKCS12 * |
| @@ -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 | }; |
| 417 | LCRYPTO_ALIAS(PKCS12_SAFEBAG_it); | ||
| 416 | 418 | ||
| 417 | 419 | ||
| 418 | PKCS12_SAFEBAG * | 420 | PKCS12_SAFEBAG * |