1 files changed, 5 insertions, 11 deletions

diff --git a/kexgexc.c b/kexgexc.c
index ad0d1c8c0..cd1128752 100644
--- a/kexgexc.c
+++ b/kexgexc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kexgexc.c,v 1.23 2016/09/12 01:22:38 deraadt Exp $ */
+/* $OpenBSD: kexgexc.c,v 1.25 2017/05/30 14:23:52 markus Exp $ */
 /*
  * Copyright (c) 2000 Niels Provos.  All rights reserved.
  * Copyright (c) 2001 Markus Friedl.  All rights reserved.
@@ -51,8 +51,8 @@
 #include "sshbuf.h"
 #include "misc.h"
 
-static int input_kex_dh_gex_group(int, u_int32_t, void *);
-static int input_kex_dh_gex_reply(int, u_int32_t, void *);
+static int input_kex_dh_gex_group(int, u_int32_t, struct ssh *);
+static int input_kex_dh_gex_reply(int, u_int32_t, struct ssh *);
 
 int
 kexgex_client(struct ssh *ssh)
@@ -89,9 +89,8 @@ kexgex_client(struct ssh *ssh)
 }
 
 static int
-input_kex_dh_gex_group(int type, u_int32_t seq, void *ctxt)
+input_kex_dh_gex_group(int type, u_int32_t seq, struct ssh *ssh)
 {
-        struct ssh *ssh = ctxt;
         struct kex *kex = ssh->kex;
         BIGNUM *p = NULL, *g = NULL;
         int r, bits;
@@ -143,9 +142,8 @@ out:
 }
 
 static int
-input_kex_dh_gex_reply(int type, u_int32_t seq, void *ctxt)
+input_kex_dh_gex_reply(int type, u_int32_t seq, struct ssh *ssh)
 {
-        struct ssh *ssh = ctxt;
         struct kex *kex = ssh->kex;
         BIGNUM *dh_server_pub = NULL, *shared_secret = NULL;
         struct sshkey *server_host_key = NULL;
@@ -165,10 +163,6 @@ input_kex_dh_gex_reply(int type, u_int32_t seq, void *ctxt)
             (r = sshkey_from_blob(server_host_key_blob, sbloblen,
             &server_host_key)) != 0)
                 goto out;
-        if (server_host_key->type != kex->hostkey_type) {
-                r = SSH_ERR_KEY_TYPE_MISMATCH;
-                goto out;
-        }
         if (server_host_key->type != kex->hostkey_type ||
             (kex->hostkey_type == KEY_ECDSA &&
             server_host_key->ecdsa_nid != kex->hostkey_nid)) {