diff options
| author | Rich Salz <rsalz@akamai.com> | 2016-02-25 16:34:27 -0500 |
|---|---|---|
| committer | Rich Salz <rsalz@openssl.org> | 2016-02-28 09:41:23 -0500 |
| commit | 412bafdcf5621603e91c862025be4c0f1d38bd81 (patch) | |
| tree | 34ffe2629d38d56c9cc8f001d003901f0ee97cd0 /crypto/rsa | |
| parent | 91a61513a80a7710db5f61a61a815c945443b65a (diff) | |
GH715: Missed some null-check-removals.
Reviewed-by: Richard Levitte <levitte@openssl.org>
Diffstat (limited to 'crypto/rsa')
| -rw-r--r-- | crypto/rsa/rsa_lib.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/crypto/rsa/rsa_lib.c b/crypto/rsa/rsa_lib.c index b049d0b998..8b5015703c 100644 --- a/crypto/rsa/rsa_lib.c +++ b/crypto/rsa/rsa_lib.c @@ -154,8 +154,7 @@ RSA *RSA_new_method(ENGINE *engine) ret->flags = ret->meth->flags & ~RSA_FLAG_NON_FIPS_ALLOW; if (!CRYPTO_new_ex_data(CRYPTO_EX_INDEX_RSA, ret, &ret->ex_data)) { #ifndef OPENSSL_NO_ENGINE - if (ret->engine) - ENGINE_finish(ret->engine); + ENGINE_finish(ret->engine); #endif OPENSSL_free(ret); return (NULL); @@ -163,8 +162,7 @@ RSA *RSA_new_method(ENGINE *engine) 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_RSA, ret, &ret->ex_data); OPENSSL_free(ret); @@ -189,8 +187,7 @@ void RSA_free(RSA *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_RSA, r, &r->ex_data); |