move ECDH implementation to crypto/ec

Reviewed-by: Richard Levitte <levitte@openssl.org>

diff --git a/crypto/ec/Makefile b/crypto/ec/Makefile
index 43535f68fa4aa59f67ac0281251b8e64ecfa9a43..5b55039d34f5103c254be8a1ff769daf9bed5458 100644 (file)
--- a/crypto/ec/Makefile
+++ b/crypto/ec/Makefile
@@ -21,13 +21,14 @@ 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 ecdh_kdf.c
+       ecp_oct.c ec2_oct.c ec_oct.c ec_kmeth.c ecdh_ossl.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 ecdh_kdf.o $(EC_ASM)
+       ecp_oct.o ec2_oct.o ec_oct.o ec_kmeth.o ecdh_ossl.o ecdh_kdf.o \
+       $(EC_ASM)
 
 SRC= $(LIBSRC)
 

diff --git a/crypto/ecdh/ech_ossl.c b/crypto/ec/ecdh_ossl.c
similarity index 100%
rename from crypto/ecdh/ech_ossl.c
rename to crypto/ec/ecdh_ossl.c

diff --git a/crypto/ecdh/Makefile b/crypto/ecdh/Makefile
index 7f8fd47bd0e986b01f98f5a0616d141e0f6403c2..a31559437ae2497c3aa1b55031a8fa1b21ae154d 100644 (file)
--- 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
+LIBSRC=        ech_lib.c ech_key.c ech_err.c
 
-LIBOBJ=        ech_lib.o ech_ossl.o ech_key.o ech_err.o
+LIBOBJ=        ech_lib.o ech_key.o ech_err.o
 
 SRC= $(LIBSRC)
 
@@ -89,14 +89,3 @@ ech_lib.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
 ech_lib.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
 ech_lib.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
 ech_lib.o: ech_lib.c ech_locl.h
-ech_ossl.o: ../../e_os.h ../../include/openssl/asn1.h
-ech_ossl.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
-ech_ossl.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
-ech_ossl.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
-ech_ossl.o: ../../include/openssl/ecdh.h ../../include/openssl/err.h
-ech_ossl.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
-ech_ossl.o: ../../include/openssl/opensslconf.h
-ech_ossl.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
-ech_ossl.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
-ech_ossl.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
-ech_ossl.o: ../include/internal/cryptlib.h ech_locl.h ech_ossl.c