aboutsummaryrefslogtreecommitdiff
path: root/apps/genpkey.c
diff options
context:
space:
mode:
authorRich Salz <rsalz@akamai.com>2016-02-25 12:09:06 -0500
committerRich Salz <rsalz@openssl.org>2016-02-25 15:19:42 -0500
commit7c96dbcdab959fef74c4caae63cdebaa354ab252 (patch)
treeaf59789bb5bc85efd7e700d657db004910f8ba64 /apps/genpkey.c
parent07b3ce8f8029f647c1babf0d8a03599885e7e284 (diff)
downloadopenssl-7c96dbcdab959fef74c4caae63cdebaa354ab252.zip
openssl-7c96dbcdab959fef74c4caae63cdebaa354ab252.tar.gz
openssl-7c96dbcdab959fef74c4caae63cdebaa354ab252.tar.bz2
GH715: ENGINE_finish can take NULL
Simplifies calling code. Also fixed up any !ptr tests that were nearby, turning them into NULL tests. Reviewed-by: Richard Levitte <levitte@openssl.org>
Diffstat (limited to 'apps/genpkey.c')
-rw-r--r--apps/genpkey.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/apps/genpkey.c b/apps/genpkey.c
index 905eb19..ca5d848 100644
--- a/apps/genpkey.c
+++ b/apps/genpkey.c
@@ -317,8 +317,7 @@ int init_gen_str(EVP_PKEY_CTX **pctx,
EVP_PKEY_asn1_get0_info(&pkey_id, NULL, NULL, NULL, NULL, ameth);
#ifndef OPENSSL_NO_ENGINE
- if (tmpeng)
- ENGINE_finish(tmpeng);
+ ENGINE_finish(tmpeng);
#endif
ctx = EVP_PKEY_CTX_new_id(pkey_id, e);