diff options
| author |   djm <djm@openbsd.org> | 2015-07-29 08:34:54 +0000 |
|---|---|---|
| committer | djm <djm@openbsd.org> | 2015-07-29 08:34:54 +0000 |
| commit | 244a347e3ebad1624bbdfbbc8b65c312a00bc832 (patch) | |
| tree | eee07ffb7d678c48da32ea9fd85b5f9d93e7b9dc | |
| parent | Rework buffer position reporting code. (diff) | |
| download | wireguard-openbsd-244a347e3ebad1624bbdfbbc8b65c312a00bc832.tar.xz wireguard-openbsd-244a347e3ebad1624bbdfbbc8b65c312a00bc832.zip | |
fix bug in previous; was printing incorrect string for failed
host key algorithms negotiation
| -rw-r--r-- | usr.bin/ssh/kex.c | 6 |
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; |