summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@cvs.openbsd.org>2017-05-16 16:56:16 +0000
committerDamien Miller <djm@cvs.openbsd.org>2017-05-16 16:56:16 +0000
commit9105adfe16e53039e90772d3594b86cf741fa942 (patch)
treeecb6dcc4fbf209d8f1c99066f7384281c9647350
parentb7de8c3f56c3506306cbfe41d6a9cd9b1299344b (diff)
remove duplicate check; spotted by Jakub Jelen
-rw-r--r--usr.bin/ssh/kexgexc.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/usr.bin/ssh/kexgexc.c b/usr.bin/ssh/kexgexc.c
index 2916ab4a99f..70ee2e32bdf 100644
--- a/usr.bin/ssh/kexgexc.c
+++ b/usr.bin/ssh/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.24 2017/05/16 16:56:15 djm Exp $ */
/*
* Copyright (c) 2000 Niels Provos. All rights reserved.
* Copyright (c) 2001 Markus Friedl. All rights reserved.
@@ -160,10 +160,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)) {