diff options
| author | slontis <shane.lontis@oracle.com> | 2022-12-21 14:39:07 +1000 |
|---|---|---|
| committer | Tomas Mraz <tomas@openssl.org> | 2023-01-16 17:17:31 +0100 |
| commit | fe2a7341b50450dc6acd6f8a17d4420511a5aefe (patch) | |
| tree | b7ebedf8881759406bff879c5826cb182eccc5e7 /util | |
| parent | 76aa4f3ac0d76e58f2111cbf87ae7f25c8766190 (diff) | |
| download | openssl-new-fe2a7341b50450dc6acd6f8a17d4420511a5aefe.tar.gz | |
PKCS12 - Add additional libctx and propq support.
Fixes #19718
Fixes #19716
Added PKCS12_SAFEBAG_get1_cert_ex(), PKCS12_SAFEBAG_get1_crl_ex() and
ASN1_item_unpack_ex().
parse_bag and parse_bags now use the libctx/propq stored in the P7_CTX.
PKCS12_free() needed to be manually constructed in order to free the propq.
pkcs12_api_test.c changed so that it actually tests the libctx, propq.
Reviewed-by: Paul Dale <pauli@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/19942)
Diffstat (limited to 'util')
| -rw-r--r-- | util/libcrypto.num | 3 | ||||
| -rw-r--r-- | util/missingcrypto.txt | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/util/libcrypto.num b/util/libcrypto.num index f195c5f719..905272f7e0 100644 --- a/util/libcrypto.num +++ b/util/libcrypto.num @@ -5508,3 +5508,6 @@ OSSL_HPKE_get_recommended_ikmelen ? 3_2_0 EXIST::FUNCTION: OSSL_PROVIDER_get0_default_search_path ? 3_2_0 EXIST::FUNCTION: BIO_get_rpoll_descriptor ? 3_2_0 EXIST::FUNCTION: BIO_get_wpoll_descriptor ? 3_2_0 EXIST::FUNCTION: +ASN1_item_unpack_ex ? 3_2_0 EXIST::FUNCTION: +PKCS12_SAFEBAG_get1_cert_ex ? 3_2_0 EXIST::FUNCTION: +PKCS12_SAFEBAG_get1_crl_ex ? 3_2_0 EXIST::FUNCTION: diff --git a/util/missingcrypto.txt b/util/missingcrypto.txt index 3090d50473..98052f0cb1 100644 --- a/util/missingcrypto.txt +++ b/util/missingcrypto.txt @@ -148,9 +148,7 @@ ASN1_item_i2d(3) ASN1_item_i2d_bio(3) ASN1_item_i2d_fp(3) ASN1_item_ndef_i2d(3) -ASN1_item_pack(3) ASN1_item_print(3) -ASN1_item_unpack(3) ASN1_mbstring_copy(3) ASN1_mbstring_ncopy(3) ASN1_object_size(3) |