===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/kex.c,v
retrieving revision 1.49.2.4
retrieving revision 1.50
diff -u -r1.49.2.4 -r1.50
--- src/usr.bin/ssh/kex.c	2003/04/03 22:35:17	1.49.2.4
+++ src/usr.bin/ssh/kex.c	2002/05/15 15:47:49	1.50
@@ -23,7 +23,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: kex.c,v 1.49.2.4 2003/04/03 22:35:17 miod Exp $");
+RCSID("$OpenBSD: kex.c,v 1.50 2002/05/15 15:47:49 mouring Exp $");
 
 #include <openssl/crypto.h>
 
@@ -44,6 +44,11 @@
 
 #define KEX_COOKIE_LEN	16
 
+/* Use privilege separation for sshd */
+int use_privsep;
+struct monitor *pmonitor;
+
+
 /* prototype */
 static void kex_kexinit_finish(Kex *);
 static void kex_choose_conf(Kex *);
@@ -69,7 +74,7 @@
 
 /* parse buffer and return algorithm proposal */
 static char **
-kex_buf2prop(Buffer *raw, int *first_kex_follows)
+kex_buf2prop(Buffer *raw)
 {
 	Buffer b;
 	int i;
@@ -89,8 +94,6 @@
 	}
 	/* first kex follows / reserved */
 	i = buffer_get_char(&b);
-	if (first_kex_follows != NULL)
-		*first_kex_follows = i;
 	debug2("kex_parse_kexinit: first_kex_follows %d ", i);
 	i = buffer_get_int(&b);
 	debug2("kex_parse_kexinit: reserved %d ", i);
@@ -132,7 +135,7 @@
 	/* packet_write_wait(); */
 	debug("SSH2_MSG_NEWKEYS sent");
 
-	debug("expecting SSH2_MSG_NEWKEYS");
+	debug("waiting for SSH2_MSG_NEWKEYS");
 	packet_read_expect(SSH2_MSG_NEWKEYS);
 	packet_check_eom();
 	debug("SSH2_MSG_NEWKEYS received");
@@ -199,8 +202,8 @@
 		packet_get_char();
 	for (i = 0; i < PROPOSAL_MAX; i++)
 		xfree(packet_get_string(NULL));
-	(void) packet_get_char();
-	(void) packet_get_int();
+	packet_get_char();
+	packet_get_int();
 	packet_check_eom();
 
 	kex_kexinit_finish(kex);
@@ -232,10 +235,14 @@
 
 	kex_choose_conf(kex);
 
-	if (kex->kex_type >= 0 && kex->kex_type < KEX_MAX &&
-	    kex->kex[kex->kex_type] != NULL) {
-		(kex->kex[kex->kex_type])(kex);
-	} else {
+	switch (kex->kex_type) {
+	case DH_GRP1_SHA1:
+		kexdh(kex);
+		break;
+	case DH_GEX_SHA1:
+		kexgex(kex);
+		break;
+	default:
 		fatal("Unsupported key exchange %d", kex->kex_type);
 	}
 }
@@ -292,9 +299,9 @@
 	if (k->name == NULL)
 		fatal("no kex alg");
 	if (strcmp(k->name, KEX_DH1) == 0) {
-		k->kex_type = KEX_DH_GRP1_SHA1;
+		k->kex_type = DH_GRP1_SHA1;
 	} else if (strcmp(k->name, KEX_DHGEX) == 0) {
-		k->kex_type = KEX_DH_GEX_SHA1;
+		k->kex_type = DH_GEX_SHA1;
 	} else
 		fatal("bad kex alg %s", k->name);
 }
@@ -310,30 +317,6 @@
 	xfree(hostkeyalg);
 }
 
-static int 
-proposals_match(char *my[PROPOSAL_MAX], char *peer[PROPOSAL_MAX])
-{
-	static int check[] = {
-		PROPOSAL_KEX_ALGS, PROPOSAL_SERVER_HOST_KEY_ALGS, -1
-	};
-	int *idx;
-	char *p;
-
-	for (idx = &check[0]; *idx != -1; idx++) {
-		if ((p = strchr(my[*idx], ',')) != NULL)
-			*p = '\0';
-		if ((p = strchr(peer[*idx], ',')) != NULL)
-			*p = '\0';
-		if (strcmp(my[*idx], peer[*idx]) != 0) {
-			debug2("proposal mismatch: my %s peer %s",
-			    my[*idx], peer[*idx]);
-			return (0);
-		}
-	}
-	debug2("proposals match");
-	return (1);
-}
-
 static void
 kex_choose_conf(Kex *kex)
 {
@@ -344,10 +327,9 @@
 	int mode;
 	int ctos;				/* direction: if true client-to-server */
 	int need;
-	int first_kex_follows, type;
 
-	my   = kex_buf2prop(&kex->my, NULL);
-	peer = kex_buf2prop(&kex->peer, &first_kex_follows);
+	my   = kex_buf2prop(&kex->my);
+	peer = kex_buf2prop(&kex->peer);
 
 	if (kex->server) {
 		cprop=peer;
@@ -391,13 +373,6 @@
 	/* XXX need runden? */
 	kex->we_need = need;
 
-	/* ignore the next message if the proposals do not match */
-	if (first_kex_follows && !proposals_match(my, peer) && 
-	   !(datafellows & SSH_BUG_FIRSTKEX)) {
-		type = packet_read();
-		debug2("skipping next packet (type %u)", type);
-	}
-
 	kex_prop_free(my);
 	kex_prop_free(peer);
 }
@@ -458,7 +433,7 @@
 	for (i = 0; i < NKEYS; i++)
 		keys[i] = derive_key(kex, 'A'+i, kex->we_need, hash, shared_secret);
 
-	debug2("kex_derive_keys");
+	debug("kex_derive_keys");
 	for (mode = 0; mode < MODE_MAX; mode++) {
 		current_keys[mode] = kex->newkeys[mode];
 		kex->newkeys[mode] = NULL;