diff options
| author | djm@openbsd.org <djm@openbsd.org> | 2015-07-29 10:34:54 +0200 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2015-07-29 11:35:43 +0200 |
| commit | 5cefe769105a2a2e3ca7479d28d9a325d5ef0163 (patch) | |
| tree | 6329afd465686d063553e3ff07b1c461ab8c9d02 /kex.c | |
| parent | upstream commit (diff) | |
| download | openssh-5cefe769105a2a2e3ca7479d28d9a325d5ef0163.tar.xz openssh-5cefe769105a2a2e3ca7479d28d9a325d5ef0163.zip | |
upstream commit
fix bug in previous; was printing incorrect string for
failed host key algorithms negotiation
Upstream-ID: 22c0dc6bc61930513065d92e11f0753adc4c6e6e
Diffstat (limited to 'kex.c')
| -rw-r--r-- | kex.c | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -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; |