===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/kex.c,v
retrieving revision 1.118.4.1
retrieving revision 1.119
diff -u -r1.118.4.1 -r1.119
--- src/usr.bin/ssh/kex.c	2016/10/10 19:35:47	1.118.4.1
+++ src/usr.bin/ssh/kex.c	2016/09/06 09:14:05	1.119
@@ -1,4 +1,4 @@
-/* $OpenBSD: kex.c,v 1.118.4.1 2016/10/10 19:35:47 markus Exp $ */
+/* $OpenBSD: kex.c,v 1.119 2016/09/06 09:14:05 markus Exp $ */
 /*
  * Copyright (c) 2000, 2001 Markus Friedl.  All rights reserved.
  *
@@ -452,7 +452,6 @@
 	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;
@@ -754,10 +753,8 @@
 		char *ext;
 
 		ext = match_list("ext-info-c", peer[PROPOSAL_KEX_ALGS], NULL);
-		if (ext) {
-			kex->ext_info_c = 1;
-			free(ext);
-		}
+		kex->ext_info_c = (ext != NULL);
+		free(ext);
 	}
 
 	/* Algorithm Negotiation */