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: only send ext_info for KEX_INITIAL; bz#2929 ok dtucker 

OpenBSD-Commit-ID: 00f5c6062f6863769f5447c6346f78c05d2e4a63
This commit is contained in:
djm@openbsd.org 2019-09-05 09:25:13 +00:00 committed by Damien Miller
parent f23d91f9fa
commit 0ea332497b
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
kex.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: kex.c,v 1.150 2019/01/21 12:08:13 djm Exp $ */ /* $OpenBSD: kex.c,v 1.151 2019/09/05 09:25:13 djm Exp $ */
/* /*
* Copyright (c) 2000, 2001 Markus Friedl. All rights reserved. * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved.
* *
@ -409,6 +409,7 @@ kex_send_ext_info(struct ssh *ssh)
int r; int r;
char *algs; char *algs;
debug("Sending SSH2_MSG_EXT_INFO");
if ((algs = sshkey_alg_list(0, 1, 1, ',')) == NULL) if ((algs = sshkey_alg_list(0, 1, 1, ',')) == NULL)
return SSH_ERR_ALLOC_FAIL; return SSH_ERR_ALLOC_FAIL;
/* XXX filter algs list by allowed pubkey/hostbased types */ /* XXX filter algs list by allowed pubkey/hostbased types */
@ -435,11 +436,11 @@ kex_send_newkeys(struct ssh *ssh)
(r = sshpkt_send(ssh)) != 0) (r = sshpkt_send(ssh)) != 0)
return r; return r;
debug("SSH2_MSG_NEWKEYS sent"); debug("SSH2_MSG_NEWKEYS sent");
debug("expecting SSH2_MSG_NEWKEYS");
ssh_dispatch_set(ssh, SSH2_MSG_NEWKEYS, &kex_input_newkeys); ssh_dispatch_set(ssh, SSH2_MSG_NEWKEYS, &kex_input_newkeys);
if (ssh->kex->ext_info_c) if (ssh->kex->ext_info_c && (ssh->kex->flags & KEX_INITIAL) != 0)
if ((r = kex_send_ext_info(ssh)) != 0) if ((r = kex_send_ext_info(ssh)) != 0)
return r; return r;
debug("expecting SSH2_MSG_NEWKEYS");
return 0; return 0;
} }