===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/kex.c,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- src/usr.bin/ssh/kex.c	2010/08/31 09:58:37	1.83
+++ src/usr.bin/ssh/kex.c	2010/08/31 11:54:45	1.84
@@ -1,4 +1,4 @@
-/* $OpenBSD: kex.c,v 1.83 2010/08/31 09:58:37 djm Exp $ */
+/* $OpenBSD: kex.c,v 1.84 2010/08/31 11:54:45 djm Exp $ */
 /*
  * Copyright (c) 2000, 2001 Markus Friedl.  All rights reserved.
  *
@@ -313,6 +313,10 @@
 	} else if (strcmp(k->name, KEX_DHGEX_SHA256) == 0) {
 		k->kex_type = KEX_DH_GEX_SHA256;
 		k->evp_md = EVP_sha256();
+	} else if (strncmp(k->name, KEX_ECDH_SHA256,
+	    sizeof(KEX_ECDH_SHA256) - 1) == 0) {
+		k->kex_type = KEX_ECDH_SHA2;
+		k->evp_md = EVP_sha256();
 	} else
 		fatal("bad kex alg %s", k->name);
 }
@@ -546,11 +550,11 @@
 	memset(&md, 0, sizeof(md));
 }
 
-#if defined(DEBUG_KEX) || defined(DEBUG_KEXDH)
+#if defined(DEBUG_KEX) || defined(DEBUG_KEXDH) || defined(DEBUG_KEXECDH)
 void
 dump_digest(char *msg, u_char *digest, int len)
 {
-	u_int i;
+	int i;
 
 	fprintf(stderr, "%s\n", msg);
 	for (i = 0; i < len; i++) {