From: Pauli Date: Tue, 23 Feb 2021 00:46:58 +0000 (+1000) Subject: core: support modified gettable/settable ctx calls for KDFs X-Git-Tag: openssl-3.0.0-alpha13~166 X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=de43d82b6db142a179485221a56e35fb7d83c64e;p=thirdparty%2Fopenssl.git core: support modified gettable/settable ctx calls for KDFs Reviewed-by: Tomas Mraz (Merged from https://github.com/openssl/openssl/pull/14240) --- diff --git a/include/openssl/core_dispatch.h b/include/openssl/core_dispatch.h index ae3da5b1395..8b0d28ce859 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 3dd02fea275..f65796e506c 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: