diff options
author | Rich Salz <rsalz@akamai.com> | 2016-02-25 12:09:06 -0500 |
---|---|---|
committer | Rich Salz <rsalz@openssl.org> | 2016-02-25 15:19:42 -0500 |
commit | 7c96dbcdab959fef74c4caae63cdebaa354ab252 (patch) | |
tree | af59789bb5bc85efd7e700d657db004910f8ba64 /crypto/ec/ec_kmeth.c | |
parent | 07b3ce8f8029f647c1babf0d8a03599885e7e284 (diff) | |
download | openssl-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 'crypto/ec/ec_kmeth.c')
-rw-r--r-- | crypto/ec/ec_kmeth.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/crypto/ec/ec_kmeth.c b/crypto/ec/ec_kmeth.c index 51992af..1a15877 100644 --- a/crypto/ec/ec_kmeth.c +++ b/crypto/ec/ec_kmeth.c @@ -105,10 +105,8 @@ int EC_KEY_set_method(EC_KEY *key, const EC_KEY_METHOD *meth) finish(key); #ifndef OPENSSL_NO_ENGINE - if (key->engine != NULL) { - ENGINE_finish(key->engine); - key->engine = NULL; - } + ENGINE_finish(key->engine); + key->engine = NULL; #endif key->meth = meth; |