===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/kexecdh.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- src/usr.bin/ssh/kexecdh.c	2010/08/31 11:54:45	1.1
+++ src/usr.bin/ssh/kexecdh.c	2010/09/09 10:45:45	1.2
@@ -1,4 +1,4 @@
-/* $OpenBSD: kexecdh.c,v 1.1 2010/08/31 11:54:45 djm Exp $ */
+/* $OpenBSD: kexecdh.c,v 1.2 2010/09/09 10:45:45 djm Exp $ */
 /*
  * Copyright (c) 2001 Markus Friedl.  All rights reserved.
  * Copyright (c) 2010 Damien Miller.  All rights reserved.
@@ -46,13 +46,21 @@
 {
 	int ret;
 
-	if (strlen(kexname) < sizeof(KEX_ECDH_SHA256) - 1)
+	if (strlen(kexname) < sizeof(KEX_ECDH_SHA2_STEM) - 1)
 		fatal("%s: kexname too short \"%s\"", __func__, kexname);
-	ret = key_curve_name_to_nid(kexname + sizeof(KEX_ECDH_SHA256) - 1);
+	ret = key_curve_name_to_nid(kexname + sizeof(KEX_ECDH_SHA2_STEM) - 1);
 	if (ret == -1)
 		fatal("%s: unsupported curve negotiated \"%s\"", __func__,
 		    kexname);
 	return ret;
+}
+
+const EVP_MD *
+kex_ecdh_name_to_evpmd(const char *kexname)
+{
+	int nid = kex_ecdh_name_to_nid(kexname);
+
+	return key_ec_nid_to_evpmd(nid);
 }
 
 void