diff options
| author | Richard Levitte <levitte@openssl.org> | 2019-09-03 18:11:49 +0200 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2019-09-04 10:38:13 +0200 |
| commit | 550f974a09942ace37cf3cf14021ea5e51e6dd11 (patch) | |
| tree | 6a5fc648e9b04b21f844e4998540c4b8c286394e /crypto/rand | |
| parent | 3fd7026276475d72a3b5bbbe42cd1f5ff6b0e736 (diff) | |
New function EVP_CIPHER_free()
This function re-implements EVP_CIPHER_meth_free(), but has a name that
isn't encumbered by legacy EVP_CIPHER construction functionality.
We also refactor most of EVP_CIPHER_meth_new() into an internal
evp_cipher_new() that's used when creating fetched methods.
EVP_CIPHER_meth_new() and EVP_CIPHER_meth_free() are rewritten in terms of
evp_cipher_new() and EVP_CIPHER_free(). This means that at any time, we can
deprecate all the EVP_CIPHER_meth_ functions with no harmful consequence.
Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/9758)
Diffstat (limited to 'crypto/rand')
| -rw-r--r-- | crypto/rand/drbg_ctr.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crypto/rand/drbg_ctr.c b/crypto/rand/drbg_ctr.c index 23e504bfac..28db4eed7f 100644 --- a/crypto/rand/drbg_ctr.c +++ b/crypto/rand/drbg_ctr.c @@ -354,7 +354,7 @@ static int drbg_ctr_uninstantiate(RAND_DRBG *drbg) { EVP_CIPHER_CTX_free(drbg->data.ctr.ctx); EVP_CIPHER_CTX_free(drbg->data.ctr.ctx_df); - EVP_CIPHER_meth_free(drbg->data.ctr.cipher); + EVP_CIPHER_free(drbg->data.ctr.cipher); OPENSSL_cleanse(&drbg->data.ctr, sizeof(drbg->data.ctr)); return 1; } @@ -392,7 +392,7 @@ int drbg_ctr_init(RAND_DRBG *drbg) if (cipher == NULL) return 0; - EVP_CIPHER_meth_free(ctr->cipher); + EVP_CIPHER_free(ctr->cipher); ctr->cipher = cipher; drbg->meth = &drbg_ctr_meth; |