mirrors/openssl
0
0
Fork 0
mirror of https://github.com/openssl/openssl.git synced 2025-01-07 09:43:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

Move ECDH_KDF_X9_62 to crypto/ec

Browse Source 
Reviewed-by: Richard Levitte <levitte@openssl.org>
This commit is contained in:
Dr. Stephen Henson 2015-10-22 15:47:38 +01:00
parent 5a6a1029d2
commit 768c53e1b6
4 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
crypto/ec/Makefile
View File

@ -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)

4
crypto/ecdh/ech_kdf.c → crypto/ec/ecdh_kdf.c
View File

@ -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 <string.h>
#include <openssl/ecdh.h>
#include <openssl/ec.h>
#include <openssl/evp.h>
/* Key derivation function from X9.62/SECG */

12
crypto/ecdh/Makefile
View File

@ -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

5
include/openssl/ec.h
View File

@ -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