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 /ssl | |
| parent | 07b3ce8f8029f647c1babf0d8a03599885e7e284 (diff) | |
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 'ssl')
| -rw-r--r-- | ssl/ssl_ciph.c | 3 | ||||
| -rw-r--r-- | ssl/ssl_lib.c | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/ssl/ssl_ciph.c b/ssl/ssl_ciph.c index cd6c3c91bd..9fbdc543fa 100644 --- a/ssl/ssl_ciph.c +++ b/ssl/ssl_ciph.c @@ -439,8 +439,7 @@ static int get_optional_pkey_id(const char *pkey_name) ameth) <= 0) pkey_id = 0; } - if (tmpeng) - ENGINE_finish(tmpeng); + ENGINE_finish(tmpeng); return pkey_id; } diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c index c0cb16543b..0cbb024a55 100644 --- a/ssl/ssl_lib.c +++ b/ssl/ssl_lib.c @@ -2433,8 +2433,7 @@ void SSL_CTX_free(SSL_CTX *a) SSL_CTX_SRP_CTX_free(a); #endif #ifndef OPENSSL_NO_ENGINE - if (a->client_cert_engine) - ENGINE_finish(a->client_cert_engine); + ENGINE_finish(a->client_cert_engine); #endif #ifndef OPENSSL_NO_EC |