diff options
| author | Pauli <ppzgs1@gmail.com> | 2021-02-23 10:46:58 +1000 |
|---|---|---|
| committer | Pauli <ppzgs1@gmail.com> | 2021-02-26 18:08:41 +1000 |
| commit | de43d82b6db142a179485221a56e35fb7d83c64e (patch) | |
| tree | 6ef7bb1709a59265954e93929a3b5fe444a3a243 | |
| parent | a5120afda32e67435624cef1fe0d49bf699e4ca5 (diff) | |
core: support modified gettable/settable ctx calls for KDFs
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/14240)
| -rw-r--r-- | include/openssl/core_dispatch.h | 4 | ||||
| -rw-r--r-- | util/libcrypto.num | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/include/openssl/core_dispatch.h b/include/openssl/core_dispatch.h index ae3da5b139..8b0d28ce85 100644 --- a/include/openssl/core_dispatch.h +++ b/include/openssl/core_dispatch.h @@ -376,9 +376,9 @@ OSSL_CORE_MAKE_FUNC(int, kdf_derive, (void *kctx, unsigned char *key, size_t keylen)) OSSL_CORE_MAKE_FUNC(const OSSL_PARAM *, kdf_gettable_params, (void *provctx)) OSSL_CORE_MAKE_FUNC(const OSSL_PARAM *, kdf_gettable_ctx_params, - (void *provctx)) + (void *kctx, void *provctx)) OSSL_CORE_MAKE_FUNC(const OSSL_PARAM *, kdf_settable_ctx_params, - (void *provctx)) + (void *kctx, void *provctx)) OSSL_CORE_MAKE_FUNC(int, kdf_get_params, (OSSL_PARAM params[])) OSSL_CORE_MAKE_FUNC(int, kdf_get_ctx_params, (void *kctx, OSSL_PARAM params[])) diff --git a/util/libcrypto.num b/util/libcrypto.num index 3dd02fea27..f65796e506 100644 --- a/util/libcrypto.num +++ b/util/libcrypto.num @@ -5302,6 +5302,8 @@ EVP_PKEY_fromdata_settable ? 3_0_0 EXIST::FUNCTION: EVP_PKEY_param_check_quick ? 3_0_0 EXIST::FUNCTION: EVP_PKEY_public_check_quick ? 3_0_0 EXIST::FUNCTION: EVP_PKEY_CTX_is_a ? 3_0_0 EXIST::FUNCTION: +EVP_KDF_CTX_gettable_params ? 3_0_0 EXIST::FUNCTION: +EVP_KDF_CTX_settable_params ? 3_0_0 EXIST::FUNCTION: EVP_RAND_CTX_gettable_params ? 3_0_0 EXIST::FUNCTION: EVP_RAND_CTX_settable_params ? 3_0_0 EXIST::FUNCTION: RAND_set_DRBG_type ? 3_0_0 EXIST::FUNCTION: |