diff -Naur -x '*.rej' -x '*.orig' openssh-7.3p1/kex.c openssh-7.3p1-CVE-2016-8858/kex.c
--- openssh-7.3p1/kex.c	2016-07-28 00:54:27.000000000 +0200
+++ openssh-7.3p1-CVE-2016-8858/kex.c	2016-10-22 10:02:58.367806454 +0200
@@ -472,6 +472,7 @@
 	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;