[openssh-commits] [openssh] 04/04: 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 5cefe769105a2a2e3ca7479d28d9a325d5ef0163
Author: djm at openbsd.org <djm at openbsd.org>
Date:   Wed Jul 29 08:34:54 2015 +0000

    upstream commit
    
    fix bug in previous; was printing incorrect string for
     failed host key algorithms negotiation
    
    Upstream-ID: 22c0dc6bc61930513065d92e11f0753adc4c6e6e
---
 kex.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/kex.c b/kex.c
index 5e8b513..af2a41c 100644
--- a/kex.c
+++ b/kex.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kex.c,v 1.107 2015/07/29 04:43:06 djm Exp $ */
+/* $OpenBSD: kex.c,v 1.108 2015/07/29 08:34:54 djm Exp $ */
 /*
  * Copyright (c) 2000, 2001 Markus Friedl.  All rights reserved.
  *
@@ -661,8 +661,8 @@ kex_choose_conf(struct ssh *ssh)
 	}
 	if ((r = choose_hostkeyalg(kex, cprop[PROPOSAL_SERVER_HOST_KEY_ALGS],
 	    sprop[PROPOSAL_SERVER_HOST_KEY_ALGS])) != 0) {
-		kex->failed_choice = cprop[PROPOSAL_SERVER_HOST_KEY_ALGS];
-		cprop[PROPOSAL_SERVER_HOST_KEY_ALGS] = NULL;
+		kex->failed_choice = peer[PROPOSAL_SERVER_HOST_KEY_ALGS];
+		peer[PROPOSAL_SERVER_HOST_KEY_ALGS] = NULL;
 		goto out;
 	}
 	need = dh_need = 0;

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