diff options
author | Jon Spillett <jon.spillett@oracle.com> | 2021-02-17 17:56:36 +1000 |
---|---|---|
committer | Pauli <pauli@openssl.org> | 2021-04-30 09:15:50 +1000 |
commit | b536880c45722777df5ebe62897a6efcef757945 (patch) | |
tree | 015ad29f74586e3407079864fa686ffcde658fad /util | |
parent | d77ba503a2cf1c83098baca345327761b991d191 (diff) |
Add library context and property query support into the PKCS12 API
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/14434)
Diffstat (limited to 'util')
-rw-r--r-- | util/libcrypto.num | 27 | ||||
-rw-r--r-- | util/missingcrypto.txt | 45 |
2 files changed, 27 insertions, 45 deletions
diff --git a/util/libcrypto.num b/util/libcrypto.num index 54978afe20..d8a8eca05f 100644 --- a/util/libcrypto.num +++ b/util/libcrypto.num @@ -5368,3 +5368,30 @@ EVP_SIGNATURE_name ? 3_0_0 EXIST::FUNCTION: EVP_ASYM_CIPHER_name ? 3_0_0 EXIST::FUNCTION: EVP_KEM_name ? 3_0_0 EXIST::FUNCTION: EVP_KEYEXCH_name ? 3_0_0 EXIST::FUNCTION: +PKCS5_v2_PBE_keyivgen_ex ? 3_0_0 EXIST::FUNCTION: +EVP_PBE_scrypt_ex ? 3_0_0 EXIST::FUNCTION:SCRYPT +PKCS5_v2_scrypt_keyivgen_ex ? 3_0_0 EXIST::FUNCTION:SCRYPT +EVP_PBE_CipherInit_ex ? 3_0_0 EXIST::FUNCTION: +EVP_PBE_find_ex ? 3_0_0 EXIST::FUNCTION: +PKCS12_SAFEBAG_create_pkcs8_encrypt_ex ? 3_0_0 EXIST::FUNCTION: +PKCS8_decrypt_ex ? 3_0_0 EXIST::FUNCTION: +PKCS12_decrypt_skey_ex ? 3_0_0 EXIST::FUNCTION: +PKCS8_encrypt_ex ? 3_0_0 EXIST::FUNCTION: +PKCS8_set0_pbe_ex ? 3_0_0 EXIST::FUNCTION: +PKCS12_pack_p7encdata_ex ? 3_0_0 EXIST::FUNCTION: +PKCS12_pbe_crypt_ex ? 3_0_0 EXIST::FUNCTION: +PKCS12_item_decrypt_d2i_ex ? 3_0_0 EXIST::FUNCTION: +PKCS12_item_i2d_encrypt_ex ? 3_0_0 EXIST::FUNCTION: +PKCS12_init_ex ? 3_0_0 EXIST::FUNCTION: +PKCS12_key_gen_asc_ex ? 3_0_0 EXIST::FUNCTION: +PKCS12_key_gen_uni_ex ? 3_0_0 EXIST::FUNCTION: +PKCS12_key_gen_utf8_ex ? 3_0_0 EXIST::FUNCTION: +PKCS12_PBE_keyivgen_ex ? 3_0_0 EXIST::FUNCTION: +PKCS12_create_ex ? 3_0_0 EXIST::FUNCTION: +PKCS12_add_key_ex ? 3_0_0 EXIST::FUNCTION: +PKCS12_add_safe_ex ? 3_0_0 EXIST::FUNCTION: +PKCS12_add_safes_ex ? 3_0_0 EXIST::FUNCTION: +PKCS5_pbe_set0_algor_ex ? 3_0_0 EXIST::FUNCTION: +PKCS5_pbe_set_ex ? 3_0_0 EXIST::FUNCTION: +PKCS5_pbe2_set_iv_ex ? 3_0_0 EXIST::FUNCTION: +PKCS5_pbkdf2_set_ex ? 3_0_0 EXIST::FUNCTION: diff --git a/util/missingcrypto.txt b/util/missingcrypto.txt index 662fec4a1c..efd3c7516a 100644 --- a/util/missingcrypto.txt +++ b/util/missingcrypto.txt @@ -650,13 +650,10 @@ EVP_CIPHER_set_asn1_iv(3) EVP_KDF_ctrl(3) EVP_MD_do_all(3) EVP_MD_do_all_sorted(3) -EVP_PBE_CipherInit(3) EVP_PBE_alg_add(3) EVP_PBE_alg_add_type(3) EVP_PBE_cleanup(3) -EVP_PBE_find(3) EVP_PBE_get(3) -EVP_PBE_scrypt(3) EVP_PKEY_CTX_get0_peerkey(3) EVP_PKEY_CTX_get0_pkey(3) EVP_PKEY_CTX_get_data(3) @@ -884,61 +881,22 @@ PKCS12_AUTHSAFES_it(3) PKCS12_BAGS_it(3) PKCS12_MAC_DATA_it(3) PKCS12_PBE_add(3) -PKCS12_PBE_keyivgen(3) PKCS12_SAFEBAGS_it(3) -PKCS12_SAFEBAG_create0_p8inf(3) -PKCS12_SAFEBAG_create0_pkcs8(3) -PKCS12_SAFEBAG_create_cert(3) -PKCS12_SAFEBAG_create_crl(3) -PKCS12_SAFEBAG_create_pkcs8_encrypt(3) -PKCS12_SAFEBAG_get0_attr(3) -PKCS12_SAFEBAG_get0_p8inf(3) -PKCS12_SAFEBAG_get0_pkcs8(3) -PKCS12_SAFEBAG_get0_safes(3) -PKCS12_SAFEBAG_get0_type(3) -PKCS12_SAFEBAG_get1_cert(3) PKCS12_SAFEBAG_get1_crl(3) -PKCS12_SAFEBAG_get_bag_nid(3) -PKCS12_SAFEBAG_get_nid(3) PKCS12_SAFEBAG_it(3) -PKCS12_add_cert(3) -PKCS12_add_key(3) -PKCS12_add_safe(3) -PKCS12_add_safes(3) -PKCS12_decrypt_skey(3) -PKCS12_gen_mac(3) PKCS12_get0_mac(3) PKCS12_get_attr(3) -PKCS12_init(3) PKCS12_it(3) -PKCS12_item_decrypt_d2i(3) -PKCS12_item_i2d_encrypt(3) PKCS12_item_pack_safebag(3) -PKCS12_key_gen_asc(3) -PKCS12_key_gen_uni(3) -PKCS12_key_gen_utf8(3) PKCS12_mac_present(3) PKCS12_pack_authsafes(3) PKCS12_pack_p7data(3) PKCS12_pack_p7encdata(3) -PKCS12_pbe_crypt(3) -PKCS12_set_mac(3) -PKCS12_setup_mac(3) PKCS12_unpack_authsafes(3) PKCS12_unpack_p7data(3) PKCS12_unpack_p7encdata(3) -PKCS12_verify_mac(3) PKCS1_MGF1(3) PKCS5_PBE_add(3) -PKCS5_PBE_keyivgen(3) -PKCS5_pbe2_set(3) -PKCS5_pbe2_set_iv(3) -PKCS5_pbe2_set_scrypt(3) -PKCS5_pbe_set(3) -PKCS5_pbe_set0_algor(3) -PKCS5_pbkdf2_set(3) -PKCS5_v2_PBE_keyivgen(3) -PKCS5_v2_scrypt_keyivgen(3) PKCS7_ATTR_SIGN_it(3) PKCS7_ATTR_VERIFY_it(3) PKCS7_DIGEST_it(3) @@ -995,12 +953,9 @@ PKCS7_stream(3) PKCS7_to_TS_TST_INFO(3) PKCS8_PRIV_KEY_INFO_it(3) PKCS8_add_keyusage(3) -PKCS8_decrypt(3) -PKCS8_encrypt(3) PKCS8_get_attr(3) PKCS8_pkey_get0(3) PKCS8_pkey_set0(3) -PKCS8_set0_pbe(3) PKEY_USAGE_PERIOD_it(3) POLICYINFO_it(3) POLICYQUALINFO_it(3) |