CVE-2016-8858: Unregister the KEXINIT handler after message has been received (closes: #841884).

1 files changed, 1 insertions, 0 deletions

diff --git a/kex.c b/kex.c
index c17d652c9..7ab72ba19 100644
--- a/kex.c
+++ b/kex.c
@@ -488,6 +488,7 @@ kex_input_kexinit(int type, u_int32_t seq, void *ctxt)
         if (kex == NULL)
                 return SSH_ERR_INVALID_ARGUMENT;
 
+        ssh_dispatch_set(ssh, SSH2_MSG_KEXINIT, NULL);
         ptr = sshpkt_ptr(ssh, &dlen);
         if ((r = sshbuf_put(kex->peer, ptr, dlen)) != 0)
                 return r;