core: core: support modified gettable/settable ctx calls for MACs

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 8b0d28ce859fdad6e421a27fb9ae1e1dc94d3742..cb4506f6174670ebdf04bff44f231ae7ee62ed55 100644 (file)
--- a/include/openssl/core_dispatch.h
+++ b/include/openssl/core_dispatch.h
@@ -345,9 +345,9 @@ OSSL_CORE_MAKE_FUNC(int, mac_final,
                      unsigned char *out, size_t *outl, size_t outsize))
 OSSL_CORE_MAKE_FUNC(const OSSL_PARAM *, mac_gettable_params, (void *provctx))
 OSSL_CORE_MAKE_FUNC(const OSSL_PARAM *, mac_gettable_ctx_params,
-                    (void *provctx))
+                    (void *mctx, void *provctx))
 OSSL_CORE_MAKE_FUNC(const OSSL_PARAM *, mac_settable_ctx_params,
-                    (void *provctx))
+                    (void *mctx, void *provctx))
 OSSL_CORE_MAKE_FUNC(int, mac_get_params, (OSSL_PARAM params[]))
 OSSL_CORE_MAKE_FUNC(int, mac_get_ctx_params,
                     (void *mctx, OSSL_PARAM params[]))

diff --git a/util/libcrypto.num b/util/libcrypto.num
index f65796e506c294a6b947ffd0abc22391da91e18a..ac6a7ace64f5764acf4895963213321d330ab469 100644 (file)
--- a/util/libcrypto.num
+++ b/util/libcrypto.num
@@ -5304,6 +5304,8 @@ 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_MAC_CTX_gettable_params             ?      3_0_0   EXIST::FUNCTION:
+EVP_MAC_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: