From 768c53e1b615023b7eb4b2b5df2f0ab5fc3f4af8 Mon Sep 17 00:00:00 2001 From: "Dr. Stephen Henson" Date: Thu, 22 Oct 2015 15:47:38 +0100 Subject: [PATCH] Move ECDH_KDF_X9_62 to crypto/ec Reviewed-by: Richard Levitte --- crypto/ec/Makefile | 4 ++-- crypto/{ecdh/ech_kdf.c => ec/ecdh_kdf.c} | 4 ++-- crypto/ecdh/Makefile | 12 ++---------- include/openssl/ec.h | 5 +++++ 4 files changed, 11 insertions(+), 14 deletions(-) rename crypto/{ecdh/ech_kdf.c => ec/ecdh_kdf.c} (98%) diff --git a/crypto/ec/Makefile b/crypto/ec/Makefile index 2ecac0fa74..43535f68fa 100644 --- a/crypto/ec/Makefile +++ b/crypto/ec/Makefile @@ -21,13 +21,13 @@ LIBSRC= ec_lib.c ecp_smpl.c ecp_mont.c ecp_nist.c ec_cvt.c ec_mult.c\ ec_err.c ec_curve.c ec_check.c ec_print.c ec_asn1.c ec_key.c\ ec2_smpl.c ec2_mult.c ec_ameth.c ec_pmeth.c eck_prn.c \ ecp_nistp224.c ecp_nistp256.c ecp_nistp521.c ecp_nistputil.c \ - ecp_oct.c ec2_oct.c ec_oct.c ec_kmeth.c + ecp_oct.c ec2_oct.c ec_oct.c ec_kmeth.c ecdh_kdf.c LIBOBJ= ec_lib.o ecp_smpl.o ecp_mont.o ecp_nist.o ec_cvt.o ec_mult.o\ ec_err.o ec_curve.o ec_check.o ec_print.o ec_asn1.o ec_key.o\ ec2_smpl.o ec2_mult.o ec_ameth.o ec_pmeth.o eck_prn.o \ ecp_nistp224.o ecp_nistp256.o ecp_nistp521.o ecp_nistputil.o \ - ecp_oct.o ec2_oct.o ec_oct.o ec_kmeth.o $(EC_ASM) + ecp_oct.o ec2_oct.o ec_oct.o ec_kmeth.o ecdh_kdf.o $(EC_ASM) SRC= $(LIBSRC) diff --git a/crypto/ecdh/ech_kdf.c b/crypto/ec/ecdh_kdf.c similarity index 98% rename from crypto/ecdh/ech_kdf.c rename to crypto/ec/ecdh_kdf.c index cbcbfd9ea4..8bb141e035 100644 --- a/crypto/ecdh/ech_kdf.c +++ b/crypto/ec/ecdh_kdf.c @@ -1,4 +1,4 @@ -/* crypto/ecdh/ec_kdf.c */ +/* crypto/ec/ecdh_kdf.c */ /* * Written by Stephen Henson for the OpenSSL project. */ @@ -52,7 +52,7 @@ */ #include -#include +#include #include /* Key derivation function from X9.62/SECG */ diff --git a/crypto/ecdh/Makefile b/crypto/ecdh/Makefile index e980a1c186..7f8fd47bd0 100644 --- a/crypto/ecdh/Makefile +++ b/crypto/ecdh/Makefile @@ -15,9 +15,9 @@ CFLAGS= $(INCLUDES) $(CFLAG) GENERAL=Makefile LIB=$(TOP)/libcrypto.a -LIBSRC= ech_lib.c ech_ossl.c ech_key.c ech_err.c ech_kdf.c +LIBSRC= ech_lib.c ech_ossl.c ech_key.c ech_err.c -LIBOBJ= ech_lib.o ech_ossl.o ech_key.o ech_err.o ech_kdf.o +LIBOBJ= ech_lib.o ech_ossl.o ech_key.o ech_err.o SRC= $(LIBSRC) @@ -69,14 +69,6 @@ ech_err.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h ech_err.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h ech_err.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h ech_err.o: ech_err.c -ech_kdf.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h -ech_kdf.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h -ech_kdf.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h -ech_kdf.o: ../../include/openssl/evp.h ../../include/openssl/obj_mac.h -ech_kdf.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h -ech_kdf.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -ech_kdf.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h -ech_kdf.o: ../../include/openssl/symhacks.h ech_kdf.c ech_key.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h ech_key.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h ech_key.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h diff --git a/include/openssl/ec.h b/include/openssl/ec.h index 7f420b5636..de0e5760cb 100644 --- a/include/openssl/ec.h +++ b/include/openssl/ec.h @@ -989,6 +989,11 @@ const EC_KEY_METHOD *EC_KEY_get_default_method(void); void EC_KEY_set_default_method(const EC_KEY_METHOD *meth); EC_KEY *EC_KEY_new_method(ENGINE *engine); +int ECDH_KDF_X9_62(unsigned char *out, size_t outlen, + const unsigned char *Z, size_t Zlen, + const unsigned char *sinfo, size_t sinfolen, + const EVP_MD *md); + # define ECParameters_dup(x) ASN1_dup_of(EC_KEY,i2d_ECParameters,d2i_ECParameters,x) # ifndef __cplusplus -- 2.25.1