diff options
| author | Richard Levitte <levitte@openssl.org> | 2019-10-31 12:10:01 +0100 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2019-11-10 05:00:28 +0100 |
| commit | 0ddf74bf1c47b554c3d2c086ff2acb18bcc81bc6 (patch) | |
| tree | f24485c27e5c6c4a1da84a948f42ab750bd7a89e /crypto/evp/mac_meth.c | |
| parent | 7b97581b90822a8c3027686234fb56ea5346db15 (diff) | |
Final cleanup after move to leaner EVP_PKEY methods
Now that KEYMGMT method pointers have moved away from the diverse
methods that are used with EVP_PKEY_CTX, we no longer need to pass
special argument to evp_generic_fetch() and evp_generic_do_all().
Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/10309)
Diffstat (limited to 'crypto/evp/mac_meth.c')
| -rw-r--r-- | crypto/evp/mac_meth.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/crypto/evp/mac_meth.c b/crypto/evp/mac_meth.c index 2c124aef6a..b1fadb6ceb 100644 --- a/crypto/evp/mac_meth.c +++ b/crypto/evp/mac_meth.c @@ -48,8 +48,7 @@ static void *evp_mac_new(void) static void *evp_mac_from_dispatch(int name_id, const OSSL_DISPATCH *fns, - OSSL_PROVIDER *prov, - void *unused) + OSSL_PROVIDER *prov) { EVP_MAC *mac = NULL; int fnmaccnt = 0, fnctxcnt = 0; @@ -154,7 +153,7 @@ EVP_MAC *EVP_MAC_fetch(OPENSSL_CTX *libctx, const char *algorithm, const char *properties) { return evp_generic_fetch(libctx, OSSL_OP_MAC, algorithm, properties, - evp_mac_from_dispatch, NULL, evp_mac_up_ref, + evp_mac_from_dispatch, evp_mac_up_ref, evp_mac_free); } @@ -200,5 +199,5 @@ void EVP_MAC_do_all_provided(OPENSSL_CTX *libctx, { evp_generic_do_all(libctx, OSSL_OP_MAC, (void (*)(void *, void *))fn, arg, - evp_mac_from_dispatch, NULL, evp_mac_free); + evp_mac_from_dispatch, evp_mac_free); } |