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 /test/evp_extra_test.c | |
| 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 'test/evp_extra_test.c')
| -rw-r--r-- | test/evp_extra_test.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/test/evp_extra_test.c b/test/evp_extra_test.c index eba7f64bab..1ad62d2f79 100644 --- a/test/evp_extra_test.c +++ b/test/evp_extra_test.c @@ -1317,8 +1317,8 @@ static int test_EVP_CIPHER_fetch(int tst) if (!TEST_true(EVP_CIPHER_up_ref(cipher))) goto err; /* Ref count should now be 2. Release both */ - EVP_CIPHER_meth_free(cipher); - EVP_CIPHER_meth_free(cipher); + EVP_CIPHER_free(cipher); + EVP_CIPHER_free(cipher); cipher = NULL; /* @@ -1336,7 +1336,7 @@ static int test_EVP_CIPHER_fetch(int tst) goto err; } - EVP_CIPHER_meth_free(cipher); + EVP_CIPHER_free(cipher); cipher = NULL; /* @@ -1355,7 +1355,7 @@ static int test_EVP_CIPHER_fetch(int tst) goto err; } - EVP_CIPHER_meth_free(cipher); + EVP_CIPHER_free(cipher); cipher = NULL; /* @@ -1381,7 +1381,7 @@ static int test_EVP_CIPHER_fetch(int tst) ret = 1; err: - EVP_CIPHER_meth_free(cipher); + EVP_CIPHER_free(cipher); OSSL_PROVIDER_unload(defltprov); OSSL_PROVIDER_unload(fipsprov); /* Not normally needed, but we would like to test that |