upstream commit

Remove all guards for calls to OpenSSL free functions -
all of these functions handle NULL, from at least OpenSSL 1.0.1g onwards.

Prompted by dtucker@ asking about guards for RSA_free(), when looking at
openssh-portable pr#84 on github.

ok deraadt@ dtucker@

OpenBSD-Commit-ID: 954f1c51b94297d0ae1f749271e184141e0cadae

1 files changed, 3 insertions, 5 deletions

diff --git a/kexdhc.c b/kexdhc.c
index 5e1a353a5..9a9f1ea78 100644
--- a/kexdhc.c
+++ b/kexdhc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kexdhc.c,v 1.21 2017/12/18 02:25:15 djm Exp $ */
+/* $OpenBSD: kexdhc.c,v 1.22 2018/02/07 02:06:51 jsing Exp $ */
 /*
  * Copyright (c) 2001 Markus Friedl.  All rights reserved.
  *
@@ -203,14 +203,12 @@ input_kex_dh(int type, u_int32_t seq, struct ssh *ssh)
         explicit_bzero(hash, sizeof(hash));
         DH_free(kex->dh);
         kex->dh = NULL;
-        if (dh_server_pub)
-                BN_clear_free(dh_server_pub);
+        BN_clear_free(dh_server_pub);
         if (kbuf) {
                 explicit_bzero(kbuf, klen);
                 free(kbuf);
         }
-        if (shared_secret)
-                BN_clear_free(shared_secret);
+        BN_clear_free(shared_secret);
         sshkey_free(server_host_key);
         free(server_host_key_blob);
         free(signature);