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/evp_enc.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/evp_enc.c')
| -rw-r--r-- | crypto/evp/evp_enc.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/crypto/evp/evp_enc.c b/crypto/evp/evp_enc.c index 53bd02d3c4..ec02283b5e 100644 --- a/crypto/evp/evp_enc.c +++ b/crypto/evp/evp_enc.c @@ -1360,8 +1360,7 @@ static void set_legacy_nid(const char *name, void *vlegacy_nid) static void *evp_cipher_from_dispatch(const int name_id, const OSSL_DISPATCH *fns, - OSSL_PROVIDER *prov, - void *unused) + OSSL_PROVIDER *prov) { EVP_CIPHER *cipher = NULL; int fnciphcnt = 0, fnctxcnt = 0; @@ -1501,7 +1500,7 @@ EVP_CIPHER *EVP_CIPHER_fetch(OPENSSL_CTX *ctx, const char *algorithm, { EVP_CIPHER *cipher = evp_generic_fetch(ctx, OSSL_OP_CIPHER, algorithm, properties, - evp_cipher_from_dispatch, NULL, evp_cipher_up_ref, + evp_cipher_from_dispatch, evp_cipher_up_ref, evp_cipher_free); return cipher; @@ -1536,5 +1535,5 @@ void EVP_CIPHER_do_all_provided(OPENSSL_CTX *libctx, { evp_generic_do_all(libctx, OSSL_OP_CIPHER, (void (*)(void *, void *))fn, arg, - evp_cipher_from_dispatch, NULL, evp_cipher_free); + evp_cipher_from_dispatch, evp_cipher_free); } |