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: fix ssh -O proxy w/mux which got broken by no longer 

making ssh->kex optional in packet.c revision 1.278 ok djm@

OpenBSD-Commit-ID: 2b65df04a064c2c6277359921d2320c90ab7d917
This commit is contained in:
markus@openbsd.org 2020-06-24 15:10:38 +00:00 committed by Damien Miller
parent 250246fef2
commit e35995088c
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
packet.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: packet.c,v 1.291 2020/03/06 18:20:44 markus Exp $ */ /* $OpenBSD: packet.c,v 1.292 2020/06/24 15:10:38 markus Exp $ */
/* /*
* Author: Tatu Ylonen <ylo@cs.hut.fi> * Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@ -282,7 +282,8 @@ ssh_packet_set_input_hook(struct ssh *ssh, ssh_packet_hook_fn *hook, void *ctx)
int int
ssh_packet_is_rekeying(struct ssh *ssh) ssh_packet_is_rekeying(struct ssh *ssh)
{ {
return ssh->state->rekeying || ssh->kex->done == 0; return ssh->state->rekeying ||
(ssh->kex != NULL && ssh->kex->done == 0);
} }
/* /*
@ -345,6 +346,8 @@ ssh_packet_set_mux(struct ssh *ssh)
{ {
ssh->state->mux = 1; ssh->state->mux = 1;
ssh->state->rekeying = 0; ssh->state->rekeying = 0;
kex_free(ssh->kex);
ssh->kex = NULL;
} }
int int