diff options
| author | Pauli <paul.dale@oracle.com> | 2020-02-13 11:00:57 +1000 |
|---|---|---|
| committer | Pauli <paul.dale@oracle.com> | 2020-07-22 20:19:01 +1000 |
| commit | 41bbba537598522daaf8369778de6d1225a4998e (patch) | |
| tree | cf4eb63dab871fc339eb4ca325fd30b0019752ca /apps/genpkey.c | |
| parent | 77ae4f6ff7af7d099206a1fc229be7a3ea0e0596 (diff) | |
EVP: deprecate the EVP_X_meth_ functions.
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/11082)
Diffstat (limited to 'apps/genpkey.c')
| -rw-r--r-- | apps/genpkey.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/apps/genpkey.c b/apps/genpkey.c index 17fb42eba6..389f0e620c 100644 --- a/apps/genpkey.c +++ b/apps/genpkey.c @@ -280,7 +280,7 @@ int init_gen_str(EVP_PKEY_CTX **pctx, ameth = EVP_PKEY_asn1_find_str(&tmpeng, algname, -1); -#ifndef OPENSSL_NO_ENGINE +#if !defined(OPENSSL_NO_ENGINE) && !defined(OPENSSL_NO_DEPRECATED_3_0) if (!ameth && e) ameth = ENGINE_get_pkey_asn1_meth_str(e, algname, -1); #endif @@ -293,7 +293,7 @@ int init_gen_str(EVP_PKEY_CTX **pctx, ERR_clear_error(); EVP_PKEY_asn1_get0_info(&pkey_id, NULL, NULL, NULL, NULL, ameth); -#ifndef OPENSSL_NO_ENGINE +#if !defined(OPENSSL_NO_ENGINE) && !defined(OPENSSL_NO_DEPRECATED_3_0) ENGINE_finish(tmpeng); #endif ctx = EVP_PKEY_CTX_new_id(pkey_id, e); |