From 5cefe769105a2a2e3ca7479d28d9a325d5ef0163 Mon Sep 17 00:00:00 2001 From: "djm@openbsd.org" Date: Wed, 29 Jul 2015 08:34:54 +0000 Subject: 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 5e8b5139..af2a41cc 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; -- cgit v1.2.3