===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/kex.c,v
retrieving revision 1.56.2.1
retrieving revision 1.57
diff -u -r1.56.2.1 -r1.57
--- src/usr.bin/ssh/kex.c	2004/08/19 04:13:26	1.56.2.1
+++ src/usr.bin/ssh/kex.c	2004/05/09 01:19:27	1.57
@@ -23,7 +23,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: kex.c,v 1.56.2.1 2004/08/19 04:13:26 brad Exp $");
+RCSID("$OpenBSD: kex.c,v 1.57 2004/05/09 01:19:27 djm Exp $");
 
 #include <openssl/crypto.h>
 
@@ -148,7 +148,7 @@
 void
 kex_send_kexinit(Kex *kex)
 {
-	u_int32_t rnd = 0;
+	u_int32_t rand = 0;
 	u_char *cookie;
 	int i;
 
@@ -168,9 +168,9 @@
 	cookie = buffer_ptr(&kex->my);
 	for (i = 0; i < KEX_COOKIE_LEN; i++) {
 		if (i % 4 == 0)
-			rnd = arc4random();
-		cookie[i] = rnd;
-		rnd >>= 8;
+			rand = arc4random();
+		cookie[i] = rand;
+		rand >>= 8;
 	}
 	packet_start(SSH2_MSG_KEXINIT);
 	packet_put_raw(buffer_ptr(&kex->my), buffer_len(&kex->my));
@@ -293,8 +293,6 @@
 		fatal("no kex alg");
 	if (strcmp(k->name, KEX_DH1) == 0) {
 		k->kex_type = KEX_DH_GRP1_SHA1;
-	} else if (strcmp(k->name, KEX_DH14) == 0) {
-		k->kex_type = KEX_DH_GRP14_SHA1;
 	} else if (strcmp(k->name, KEX_DHGEX) == 0) {
 		k->kex_type = KEX_DH_GEX_SHA1;
 	} else
@@ -506,7 +504,7 @@
 
 	EVP_DigestUpdate(&md, cookie, 8);
 
-	EVP_DigestFinal(&md, obuf, NULL);
+	EVP_DigestFinal(&md, id, NULL);
 	memcpy(id, obuf, 16);
 
 	memset(nbuf, 0, sizeof(nbuf));