summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@cvs.openbsd.org>2015-07-29 08:34:55 +0000
committerDamien Miller <djm@cvs.openbsd.org>2015-07-29 08:34:55 +0000
commit574c7f6acedf14b64c0fe3d5250858413a37434f (patch)
tree75a7d7ac81873d3b7138f22a467e82bd6f1c9a4c
parent6d7e7dfbf7a588790d7909589ec8b9459861acea (diff)
fix bug in previous; was printing incorrect string for failed
host key algorithms negotiation
-rw-r--r--usr.bin/ssh/kex.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/usr.bin/ssh/kex.c b/usr.bin/ssh/kex.c
index 5499b0aed94..1322411023a 100644
--- a/usr.bin/ssh/kex.c
+++ b/usr.bin/ssh/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.
*
@@ -640,8 +640,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;