diff options
-rw-r--r-- | packet.c | 7 |
1 files changed, 5 insertions, 2 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: packet.c,v 1.291 2020/03/06 18:20:44 markus Exp $ */ | 1 | /* $OpenBSD: packet.c,v 1.292 2020/06/24 15:10:38 markus Exp $ */ |
2 | /* | 2 | /* |
3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 4 | * 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) | |||
282 | int | 282 | int |
283 | ssh_packet_is_rekeying(struct ssh *ssh) | 283 | ssh_packet_is_rekeying(struct ssh *ssh) |
284 | { | 284 | { |
285 | return ssh->state->rekeying || ssh->kex->done == 0; | 285 | return ssh->state->rekeying || |
286 | (ssh->kex != NULL && ssh->kex->done == 0); | ||
286 | } | 287 | } |
287 | 288 | ||
288 | /* | 289 | /* |
@@ -345,6 +346,8 @@ ssh_packet_set_mux(struct ssh *ssh) | |||
345 | { | 346 | { |
346 | ssh->state->mux = 1; | 347 | ssh->state->mux = 1; |
347 | ssh->state->rekeying = 0; | 348 | ssh->state->rekeying = 0; |
349 | kex_free(ssh->kex); | ||
350 | ssh->kex = NULL; | ||
348 | } | 351 | } |
349 | 352 | ||
350 | int | 353 | int |