merge 6.3p1

1 files changed, 1 insertions, 19 deletions

diff --git a/kexecdh.c b/kexecdh.c
index f13f69d3b..c948fe20a 100644
--- a/kexecdh.c
+++ b/kexecdh.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kexecdh.c,v 1.3 2010/09/22 05:01:29 djm Exp $ */
+/* $OpenBSD: kexecdh.c,v 1.4 2013/04/19 01:06:50 djm Exp $ */
 /*
  * Copyright (c) 2001 Markus Friedl.  All rights reserved.
  * Copyright (c) 2010 Damien Miller.  All rights reserved.
@@ -45,24 +45,6 @@
 #include "kex.h"
 #include "log.h"
 
-int
-kex_ecdh_name_to_nid(const char *kexname)
-{
-        if (strlen(kexname) < sizeof(KEX_ECDH_SHA2_STEM) - 1)
-                fatal("%s: kexname too short \"%s\"", __func__, kexname);
-        return key_curve_name_to_nid(kexname + sizeof(KEX_ECDH_SHA2_STEM) - 1);
-}
-
-const EVP_MD *
-kex_ecdh_name_to_evpmd(const char *kexname)
-{
-        int nid = kex_ecdh_name_to_nid(kexname);
-
-        if (nid == -1)
-                fatal("%s: unsupported ECDH curve \"%s\"", __func__, kexname);
-        return key_ec_nid_to_evpmd(nid);
-}
-
 void
 kex_ecdh_hash(
     const EVP_MD *evp_md,