diff options
| author | David Makepeace <david.p.makepeace@oracle.com> | 2018-06-22 07:16:18 +1000 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2019-02-13 12:11:49 +0100 |
| commit | 5a285addbf39f91d567f95f04b2b41764127950d (patch) | |
| tree | 4cdf512d4217da5b6b959552a20a33b6a23a9aaa /util | |
| parent | e0ae0585bee898184cbbe8144d2fa8ce25e8ca72 (diff) | |
Added new EVP/KDF API.
Changed PKEY/KDF API to call the new API.
Added wrappers for PKCS5_PBKDF2_HMAC() and EVP_PBE_scrypt() to call the new EVP KDF APIs.
Documentation updated.
Reviewed-by: Paul Dale <paul.dale@oracle.com>
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/6674)
Diffstat (limited to 'util')
| -rw-r--r-- | util/libcrypto.num | 8 | ||||
| -rw-r--r-- | util/private.num | 1 |
2 files changed, 9 insertions, 0 deletions
diff --git a/util/libcrypto.num b/util/libcrypto.num index cc88ac4652..2b5365ecea 100644 --- a/util/libcrypto.num +++ b/util/libcrypto.num @@ -4631,3 +4631,11 @@ CMS_add1_signing_cert_v2 4586 3_0_0 EXIST::FUNCTION:CMS ESS_SIGNING_CERT_new_init 4587 3_0_0 EXIST::FUNCTION: ESS_SIGNING_CERT_V2_new_init 4588 3_0_0 EXIST::FUNCTION: ERR_load_ESS_strings 4589 3_0_0 EXIST::FUNCTION: +EVP_KDF_CTX_new_id 4590 3_0_0 EXIST::FUNCTION: +EVP_KDF_CTX_free 4591 3_0_0 EXIST::FUNCTION: +EVP_KDF_reset 4592 3_0_0 EXIST::FUNCTION: +EVP_KDF_ctrl 4593 3_0_0 EXIST::FUNCTION: +EVP_KDF_vctrl 4594 3_0_0 EXIST::FUNCTION: +EVP_KDF_ctrl_str 4595 3_0_0 EXIST::FUNCTION: +EVP_KDF_size 4596 3_0_0 EXIST::FUNCTION: +EVP_KDF_derive 4597 3_0_0 EXIST::FUNCTION: diff --git a/util/private.num b/util/private.num index 6fe4392581..383284169f 100644 --- a/util/private.num +++ b/util/private.num @@ -22,6 +22,7 @@ CRYPTO_EX_dup datatype CRYPTO_EX_free datatype CRYPTO_EX_new datatype DTLS_timer_cb datatype +EVP_KDF_CTX datatype EVP_MAC datatype EVP_MAC_CTX datatype EVP_PKEY_gen_cb datatype |