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)

diff --git a/include/openssl/core_dispatch.h b/include/openssl/core_dispatch.h
index ae3da5b1395328268d98fc0c9b4dda1e35acbbea..8b0d28ce859fdad6e421a27fb9ae1e1dc94d3742 100644 (file)
--- 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 3dd02fea275ec1b1469138cd99ed848071e7dbd1..f65796e506c294a6b947ffd0abc22391da91e18a 100644 (file)
--- 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: