[openssh-commits] [openssh] 02/03: upstream commit

[git+noreply at mindrot.org]

This is an automated email from the git hooks/post-receive script.

djm pushed a commit to branch master
in repository openssh.

commit 277abcda3f1b08d2376686f0ef20320160d4c8ab
Author: djm at openbsd.org <djm at openbsd.org>
Date:   Tue May 16 16:56:15 2017 +0000

    upstream commit
    
    remove duplicate check; spotted by Jakub Jelen
    
    Upstream-ID: 30c2996c1767616a8fdc49d4cee088efac69c3b0
---
 kexgexc.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/kexgexc.c b/kexgexc.c
index ad0d1c8c..b881c4e9 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.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)) {

-- 
To stop receiving notification emails like this one, please contact
djm at mindrot.org.