core: support modified gettable/settable ctx calls for ciphers

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 cb4506f6174670ebdf04bff44f231ae7ee62ed55..634159524d949840b11776b59de38d4662b6357f 100644 (file)
--- 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 ac6a7ace64f5764acf4895963213321d330ab469..aa3071ec306f72aa0826611ec7eed1c9c8bcb376 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_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: