diff options
author | djm@openbsd.org <djm@openbsd.org> | 2017-05-16 16:56:15 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2017-05-17 11:25:22 +1000 |
commit | 277abcda3f1b08d2376686f0ef20320160d4c8ab (patch) | |
tree | 2c7586ab88c5bbadf235b4fa3da88c45d94e7a30 | |
parent | adb47ce839c977fa197e770c1be8f852508d65aa (diff) | |
download | openssh-git-277abcda3f1b08d2376686f0ef20320160d4c8ab.tar.gz |
upstream commit
remove duplicate check; spotted by Jakub Jelen
Upstream-ID: 30c2996c1767616a8fdc49d4cee088efac69c3b0
-rw-r--r-- | kexgexc.c | 6 |
1 files changed, 1 insertions, 5 deletions
@@ -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. @@ -165,10 +165,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)) { |