tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

upstream commit 

remove duplicate check; spotted by Jakub Jelen

Upstream-ID: 30c2996c1767616a8fdc49d4cee088efac69c3b0
This commit is contained in:
djm@openbsd.org 2017-05-16 16:56:15 +00:00 committed by Damien Miller
parent adb47ce839
commit 277abcda3f
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
kexgexc.c
View File

@ -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) 2000 Niels Provos. All rights reserved.
* Copyright (c) 2001 Markus Friedl. 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, (r = sshkey_from_blob(server_host_key_blob, sbloblen,
&server_host_key)) != 0) &server_host_key)) != 0)
goto out; 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 || if (server_host_key->type != kex->hostkey_type ||
(kex->hostkey_type == KEY_ECDSA && (kex->hostkey_type == KEY_ECDSA &&
server_host_key->ecdsa_nid != kex->hostkey_nid)) { server_host_key->ecdsa_nid != kex->hostkey_nid)) {