===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/kex.c,v
retrieving revision 1.60.2.1
retrieving revision 1.61
diff -u -r1.60.2.1 -r1.61
--- src/usr.bin/ssh/kex.c	2005/09/02 03:45:00	1.60.2.1
+++ src/usr.bin/ssh/kex.c	2005/06/17 02:44:32	1.61
@@ -23,7 +23,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: kex.c,v 1.60.2.1 2005/09/02 03:45:00 brad Exp $");
+RCSID("$OpenBSD: kex.c,v 1.61 2005/06/17 02:44:32 djm Exp $");
 
 #include <openssl/crypto.h>
 
@@ -275,12 +275,10 @@
 	char *name = match_list(client, server, NULL);
 	if (name == NULL)
 		fatal("no matching comp found: client %s server %s", client, server);
-	if (strcmp(name, "zlib@openssh.com") == 0) {
-		comp->type = COMP_DELAYED;
-	} else if (strcmp(name, "zlib") == 0) {
-		comp->type = COMP_ZLIB;
+	if (strcmp(name, "zlib") == 0) {
+		comp->type = 1;
 	} else if (strcmp(name, "none") == 0) {
-		comp->type = COMP_NONE;
+		comp->type = 0;
 	} else {
 		fatal("unsupported comp %s", name);
 	}
@@ -394,7 +392,7 @@
 
 	/* ignore the next message if the proposals do not match */
 	if (first_kex_follows && !proposals_match(my, peer) &&
-	    !(datafellows & SSH_BUG_FIRSTKEX)) {
+	   !(datafellows & SSH_BUG_FIRSTKEX)) {
 		type = packet_read();
 		debug2("skipping next packet (type %u)", type);
 	}
@@ -413,7 +411,7 @@
 	u_int have;
 	int mdsz = EVP_MD_size(evp_md);
 	u_char *digest;
-
+	
 	if (mdsz < 0)
 		fatal("derive_key: mdsz < 0");
 	digest = xmalloc(roundup(need, mdsz));