1 files changed, 4 insertions, 6 deletions

diff --git a/kexdhc.c b/kexdhc.c
index 9864ee2ec..9a9f1ea78 100644
--- a/kexdhc.c
+++ b/kexdhc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kexdhc.c,v 1.20 2017/05/30 14:23:52 markus Exp $ */
+/* $OpenBSD: kexdhc.c,v 1.22 2018/02/07 02:06:51 jsing Exp $ */
 /*
  * Copyright (c) 2001 Markus Friedl.  All rights reserved.
  *
@@ -183,7 +183,7 @@ input_kex_dh(int type, u_int32_t seq, struct ssh *ssh)
                 goto out;
 
         if ((r = sshkey_verify(server_host_key, signature, slen, hash, hashlen,
-            ssh->compat)) != 0)
+            kex->hostkey_alg, ssh->compat)) != 0)
                 goto out;
 
         /* save session id */
@@ -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);