The DH_free, EC_KEY_free, EVP_PKEY_free and RSA_free functions all have

implicit NULL checks, so there is no point ensuring that the pointer is
non-NULL before calling them.

1 files changed, 6 insertions, 11 deletions

diff --git a/src/lib/libssl/s3_srvr.c b/src/lib/libssl/s3_srvr.c
index 552f8290b5..bd22569ef0 100644
--- a/src/lib/libssl/s3_srvr.c
+++ b/src/lib/libssl/s3_srvr.c
@@ -866,14 +866,10 @@ ssl3_check_client_hello(SSL *s)
                  * which will now be aborted. (A full SSL_clear would be too
                  * much.)
                  */
-                if (s->s3->tmp.dh != NULL) {
-                        DH_free(s->s3->tmp.dh);
-                        s->s3->tmp.dh = NULL;
-                }
-                if (s->s3->tmp.ecdh != NULL) {
-                        EC_KEY_free(s->s3->tmp.ecdh);
-                        s->s3->tmp.ecdh = NULL;
-                }
+                DH_free(s->s3->tmp.dh);
+                s->s3->tmp.dh = NULL;
+                EC_KEY_free(s->s3->tmp.ecdh);
+                s->s3->tmp.ecdh = NULL;
                 s->s3->flags |= SSL3_FLAGS_SGC_RESTART_DONE;
                 return (2);
         }
@@ -2465,7 +2461,7 @@ ssl3_get_client_key_exchange(SSL *s)
                         ret = 2;
                 else
                         ret = 1;
-                gerr:
+gerr:
                 EVP_PKEY_free(client_pub_pkey);
                 EVP_PKEY_CTX_free(pkey_ctx);
                 if (ret)
@@ -2485,8 +2481,7 @@ f_err:
 err:
         EVP_PKEY_free(clnt_pub_pkey);
         EC_POINT_free(clnt_ecpoint);
-        if (srvr_ecdh != NULL)
-                EC_KEY_free(srvr_ecdh);
+        EC_KEY_free(srvr_ecdh);
         BN_CTX_free(bn_ctx);
         return (-1);
 }