From 17fa4e8eda466dc36fd0c332bb7adc4f331dd480 Mon Sep 17 00:00:00 2001 From: FdaSilvaYY Date: Sun, 28 Feb 2016 16:01:41 +0100 Subject: [PATCH] GH715: Missed some null-check-removals. follow commits 412bafdcf5, and 7c96dbcdab Signed-off-by: Rich Salz Reviewed-by: Richard Levitte --- crypto/dsa/dsa_lib.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/crypto/dsa/dsa_lib.c b/crypto/dsa/dsa_lib.c index 9f4ddfdf70..f89297313a 100644 --- a/crypto/dsa/dsa_lib.c +++ b/crypto/dsa/dsa_lib.c @@ -144,8 +144,7 @@ DSA *DSA_new_method(ENGINE *engine) CRYPTO_new_ex_data(CRYPTO_EX_INDEX_DSA, ret, &ret->ex_data); if ((ret->meth->init != NULL) && !ret->meth->init(ret)) { #ifndef OPENSSL_NO_ENGINE - if (ret->engine) - ENGINE_finish(ret->engine); + ENGINE_finish(ret->engine); #endif CRYPTO_free_ex_data(CRYPTO_EX_INDEX_DSA, ret, &ret->ex_data); OPENSSL_free(ret); @@ -171,8 +170,7 @@ void DSA_free(DSA *r) if (r->meth->finish) r->meth->finish(r); #ifndef OPENSSL_NO_ENGINE - if (r->engine) - ENGINE_finish(r->engine); + ENGINE_finish(r->engine); #endif CRYPTO_free_ex_data(CRYPTO_EX_INDEX_DSA, r, &r->ex_data); -- 2.25.1