diff options
| author | markus@openbsd.org <markus@openbsd.org> | 2020-06-24 15:10:38 +0000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2020-06-26 15:18:44 +1000 |
| commit | e35995088cd6691a712bfd586bae8084a3a922ba (patch) | |
| tree | 623a1f22e8dcba32af0c055be57e6c1654fdee70 /packet.c | |
| parent | 250246fef22b87a54a63211c60a2def9be431fbd (diff) | |
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
Diffstat (limited to 'packet.c')
| -rw-r--r-- | packet.c | 7 |
1 files changed, 5 insertions, 2 deletions
@@ -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> * 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 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->rekeying = 0; + kex_free(ssh->kex); + ssh->kex = NULL; } int |