diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2015-10-22 18:35:56 +0100 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2015-12-09 22:09:17 +0000 |
| commit | 168e8374eeb7ae50816efcac23f65e7e1294360a (patch) | |
| tree | 5955e428f7985f3ada8fa1e334d42627c5f73416 | |
| parent | 768c53e1b615023b7eb4b2b5df2f0ab5fc3f4af8 (diff) | |
| download | openssl-168e8374eeb7ae50816efcac23f65e7e1294360a.tar.gz | |
move ECDH implementation to crypto/ec
Reviewed-by: Richard Levitte <levitte@openssl.org>
| -rw-r--r-- | crypto/ec/Makefile | 5 | ||||
| -rw-r--r-- | crypto/ec/ecdh_ossl.c (renamed from crypto/ecdh/ech_ossl.c) | 0 | ||||
| -rw-r--r-- | crypto/ecdh/Makefile | 15 |
3 files changed, 5 insertions, 15 deletions
diff --git a/crypto/ec/Makefile b/crypto/ec/Makefile index 43535f68fa..5b55039d34 100644 --- 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 index ba66bd5af2..ba66bd5af2 100644 --- a/crypto/ecdh/ech_ossl.c +++ b/crypto/ec/ecdh_ossl.c diff --git a/crypto/ecdh/Makefile b/crypto/ecdh/Makefile index 7f8fd47bd0..a31559437a 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 +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 |