New upstream release (7.7p1)

1 files changed, 5 insertions, 9 deletions

diff --git a/kexecdhs.c b/kexecdhs.c
index dc24a3af6..af4f30309 100644
--- a/kexecdhs.c
+++ b/kexecdhs.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kexecdhs.c,v 1.16 2017/05/30 14:23:52 markus Exp $ */
+/* $OpenBSD: kexecdhs.c,v 1.17 2018/02/07 02:06:51 jsing Exp $ */
 /*
  * Copyright (c) 2001 Markus Friedl.  All rights reserved.
  * Copyright (c) 2010 Damien Miller.  All rights reserved.
@@ -187,18 +187,14 @@ input_kex_ecdh_init(int type, u_int32_t seq, struct ssh *ssh)
                 r = kex_send_newkeys(ssh);
  out:
         explicit_bzero(hash, sizeof(hash));
-        if (kex->ec_client_key) {
-                EC_KEY_free(kex->ec_client_key);
-                kex->ec_client_key = NULL;
-        }
-        if (server_key)
-                EC_KEY_free(server_key);
+        EC_KEY_free(kex->ec_client_key);
+        kex->ec_client_key = NULL;
+        EC_KEY_free(server_key);
         if (kbuf) {
                 explicit_bzero(kbuf, klen);
                 free(kbuf);
         }
-        if (shared_secret)
-                BN_clear_free(shared_secret);
+        BN_clear_free(shared_secret);
         free(server_host_key_blob);
         free(signature);
         return r;