tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

upstream commit 

fix bug in previous; was printing incorrect string for
 failed host key algorithms negotiation

Upstream-ID: 22c0dc6bc61930513065d92e11f0753adc4c6e6e
This commit is contained in:
djm@openbsd.org 2015-07-29 08:34:54 +00:00 committed by Damien Miller
parent f319912b0d
commit 5cefe76910
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
kex.c
View File

@ -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. * 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], if ((r = choose_hostkeyalg(kex, cprop[PROPOSAL_SERVER_HOST_KEY_ALGS],
sprop[PROPOSAL_SERVER_HOST_KEY_ALGS])) != 0) { sprop[PROPOSAL_SERVER_HOST_KEY_ALGS])) != 0) {
kex->failed_choice = cprop[PROPOSAL_SERVER_HOST_KEY_ALGS]; kex->failed_choice = peer[PROPOSAL_SERVER_HOST_KEY_ALGS];
cprop[PROPOSAL_SERVER_HOST_KEY_ALGS] = NULL; peer[PROPOSAL_SERVER_HOST_KEY_ALGS] = NULL;
goto out; goto out;
} }
need = dh_need = 0; need = dh_need = 0;