From: Pauli Date: Tue, 23 Feb 2021 01:49:55 +0000 (+1000) Subject: core: support modified gettable/settable ctx calls for ciphers X-Git-Tag: openssl-3.0.0-alpha13~157 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e79fb279dfc146af0948d2727656f72226ef104f;p=thirdparty%2Fopenssl.git core: support modified gettable/settable ctx calls for ciphers 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 cb4506f6174..634159524d9 100644 --- a/include/openssl/core_dispatch.h +++ b/include/openssl/core_dispatch.h @@ -315,9 +315,9 @@ OSSL_CORE_MAKE_FUNC(int, cipher_set_ctx_params, (void *cctx, OSSL_CORE_MAKE_FUNC(const OSSL_PARAM *, cipher_gettable_params, (void *provctx)) OSSL_CORE_MAKE_FUNC(const OSSL_PARAM *, cipher_settable_ctx_params, - (void *provctx)) + (void *cctx, void *provctx)) OSSL_CORE_MAKE_FUNC(const OSSL_PARAM *, cipher_gettable_ctx_params, - (void *provctx)) + (void *cctx, void *provctx)) /* MACs */ diff --git a/util/libcrypto.num b/util/libcrypto.num index ac6a7ace64f..aa3071ec306 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_CIPHER_CTX_settable_params ? 3_0_0 EXIST::FUNCTION: +EVP_CIPHER_CTX_gettable_params ? 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_MAC_CTX_gettable_params ? 3_0_0 EXIST::FUNCTION: