1 files changed, 8 insertions, 3 deletions

diff --git a/packet.c b/packet.c
index e7abb3416..00e3180cb 100644
--- a/packet.c
+++ b/packet.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: packet.c,v 1.291 2020/03/06 18:20:44 markus Exp $ */
+/* $OpenBSD: packet.c,v 1.296 2020/07/05 23:59:45 djm 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
@@ -651,6 +654,8 @@ ssh_packet_close_internal(struct ssh *ssh, int do_close)
                 ssh->remote_ipaddr = NULL;
                 free(ssh->state);
                 ssh->state = NULL;
+                kex_free(ssh->kex);
+                ssh->kex = NULL;
         }
 }
 
@@ -2445,7 +2450,7 @@ ssh_packet_set_state(struct ssh *ssh, struct sshbuf *m)
             (r = sshbuf_get_u64(m, &state->p_read.bytes)) != 0)
                 return r;
         /*
-         * We set the time here so that in post-auth privsep slave we
+         * We set the time here so that in post-auth privsep child we
          * count from the completion of the authentication.
          */
         state->rekey_time = monotime();