diff options
author | Pauli <ppzgs1@gmail.com> | 2021-02-23 11:02:49 +1000 |
---|---|---|
committer | Pauli <ppzgs1@gmail.com> | 2021-02-26 18:08:41 +1000 |
commit | eee323c3390fbee9e7129719473809ab1634c2d7 (patch) | |
tree | e32feab039f4a6550eb42951f65915fce0a82daa /providers/implementations/macs/siphash_prov.c | |
parent | 1e8e5c6092bfa90254dd293ee87f15f9edfdbdde (diff) |
prov: support modified gettable/settable ctx calls for MACs
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/14240)
Diffstat (limited to 'providers/implementations/macs/siphash_prov.c')
-rw-r--r-- | providers/implementations/macs/siphash_prov.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/providers/implementations/macs/siphash_prov.c b/providers/implementations/macs/siphash_prov.c index 221db4b83b..95a345495e 100644 --- a/providers/implementations/macs/siphash_prov.c +++ b/providers/implementations/macs/siphash_prov.c @@ -36,7 +36,7 @@ static OSSL_FUNC_mac_dupctx_fn siphash_dup; static OSSL_FUNC_mac_freectx_fn siphash_free; static OSSL_FUNC_mac_gettable_ctx_params_fn siphash_gettable_ctx_params; static OSSL_FUNC_mac_get_ctx_params_fn siphash_get_ctx_params; -static OSSL_FUNC_mac_settable_ctx_params_fn siphash_settable_params; +static OSSL_FUNC_mac_settable_ctx_params_fn siphash_settable_ctx_params; static OSSL_FUNC_mac_set_ctx_params_fn siphash_set_params; static OSSL_FUNC_mac_init_fn siphash_init; static OSSL_FUNC_mac_update_fn siphash_update; @@ -121,7 +121,8 @@ static const OSSL_PARAM known_gettable_ctx_params[] = { OSSL_PARAM_size_t(OSSL_MAC_PARAM_SIZE, NULL), OSSL_PARAM_END }; -static const OSSL_PARAM *siphash_gettable_ctx_params(ossl_unused void *provctx) +static const OSSL_PARAM *siphash_gettable_ctx_params(ossl_unused void *ctx, + ossl_unused void *provctx) { return known_gettable_ctx_params; } @@ -141,7 +142,9 @@ static const OSSL_PARAM known_settable_ctx_params[] = { OSSL_PARAM_octet_string(OSSL_MAC_PARAM_KEY, NULL, 0), OSSL_PARAM_END }; -static const OSSL_PARAM *siphash_settable_params(void *provctx) + +static const OSSL_PARAM *siphash_settable_ctx_params(ossl_unused void *ctx, + void *provctx) { return known_settable_ctx_params; } @@ -177,7 +180,7 @@ const OSSL_DISPATCH ossl_siphash_functions[] = { (void (*)(void))siphash_gettable_ctx_params }, { OSSL_FUNC_MAC_GET_CTX_PARAMS, (void (*)(void))siphash_get_ctx_params }, { OSSL_FUNC_MAC_SETTABLE_CTX_PARAMS, - (void (*)(void))siphash_settable_params }, + (void (*)(void))siphash_settable_ctx_params }, { OSSL_FUNC_MAC_SET_CTX_PARAMS, (void (*)(void))siphash_set_params }, { 0, NULL } }; |