diff options
| author | des <des@FreeBSD.org> | 2013-09-21 21:36:09 +0000 |
|---|---|---|
| committer | des <des@FreeBSD.org> | 2013-09-21 21:36:09 +0000 |
| commit | cda41f674dcdd03b86d4e53cd0dbd08b534f9e7a (patch) | |
| tree | a72d0647ecce54e017341118e11204ee4ba0de68 /crypto/openssh/kexecdh.c | |
| parent | 3e16db31d109ec87db0aa5d7fcd63e93398259d4 (diff) | |
| parent | ff2597d3eebc3da3f7cf2a638607274cad9b199e (diff) | |
| download | FreeBSD-src-cda41f674dcdd03b86d4e53cd0dbd08b534f9e7a.zip FreeBSD-src-cda41f674dcdd03b86d4e53cd0dbd08b534f9e7a.tar.gz | |
Upgrade to 6.3p1.
Approved by: re (gjb)
Diffstat (limited to 'crypto/openssh/kexecdh.c')
| -rw-r--r-- | crypto/openssh/kexecdh.c | 20 |
1 files changed, 1 insertions, 19 deletions
diff --git a/crypto/openssh/kexecdh.c b/crypto/openssh/kexecdh.c index f13f69d..c948fe2 100644 --- a/crypto/openssh/kexecdh.c +++ b/crypto/openssh/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, |
