Modified Makefiles to include new files and and config.h to PolarSSL standard

This commit is contained in:
Paul Bakker 2013-03-13 16:30:17 +01:00
parent f35b739dff
commit d589a0ddb6
3 changed files with 48 additions and 38 deletions

View File

@ -480,6 +480,43 @@
*/ */
#define POLARSSL_DHM_C #define POLARSSL_DHM_C
/**
* \def POLARSSL_ECDH_C
*
* Enable the elliptic curve Diffie-Hellman library.
*
* Module: library/ecdh.c
* Caller:
*
* Requires: POLARSSL_ECP_C
*/
#define POLARSSL_ECDH_C
/**
* \def POLARSSL_ECDSA_C
*
* Enable the elliptic curve DSA library.
*
* Module: library/ecdsa.c
* Caller:
*
* Requires: POLARSSL_ECP_C
*/
#define POLARSSL_ECDSA_C
/**
* \def POLARSSL_ECP_C
*
* Enable the elliptic curve over GF(p) library.
*
* Module: library/ecp.c
* Caller: library/ecdh.c
* library/ecdsa.c
*
* Requires: POLARSSL_BIGNUM_C
*/
#define POLARSSL_ECP_C
/** /**
* \def POLARSSL_ENTROPY_C * \def POLARSSL_ENTROPY_C
* *
@ -830,43 +867,6 @@
*/ */
#define POLARSSL_XTEA_C #define POLARSSL_XTEA_C
/**
* \def POLARSSL_ECP_C
*
* Enable the elliptic curve over GF(p) library.
*
* Module: library/ecp.c
* Caller: library/ecdh.c
* library/ecdsa.c
*
* Requires: POLARSSL_BIGNUM_C
*/
#define POLARSSL_ECP_C
/**
* \def POLARSSL_ECDH_C
*
* Enable the elliptic curve Diffie-Hellman library.
*
* Module: library/ecdh.c
* Caller:
*
* Requires: POLARSSL_ECP_C
*/
#define POLARSSL_ECDH_C
/**
* \def POLARSSL_ECDSA_C
*
* Enable the elliptic curve DSA library.
*
* Module: library/ecdsa.c
* Caller:
*
* Requires: POLARSSL_ECP_C
*/
#define POLARSSL_ECDSA_C
/* \} name */ /* \} name */
#endif /* config.h */ #endif /* config.h */

View File

@ -39,7 +39,8 @@ OBJS= aes.o arc4.o asn1parse.o \
blowfish.o camellia.o \ blowfish.o camellia.o \
certs.o cipher.o cipher_wrap.o \ certs.o cipher.o cipher_wrap.o \
ctr_drbg.o debug.o des.o \ ctr_drbg.o debug.o des.o \
dhm.o ecp.o \ dhm.o ecdh.o ecdsa.o \
ecp.o \
entropy.o entropy_poll.o \ entropy.o entropy_poll.o \
error.o gcm.o havege.o \ error.o gcm.o havege.o \
md.o md_wrap.o md2.o \ md.o md_wrap.o md2.o \

View File

@ -30,6 +30,7 @@ APPS = test_suite_aes test_suite_arc4 \
test_suite_cipher.des test_suite_cipher.null \ test_suite_cipher.des test_suite_cipher.null \
test_suite_ctr_drbg test_suite_debug \ test_suite_ctr_drbg test_suite_debug \
test_suite_des test_suite_dhm \ test_suite_des test_suite_dhm \
test_suite_ecdh test_suite_ecdsa \
test_suite_ecp \ test_suite_ecp \
test_suite_error test_suite_gcm.decrypt \ test_suite_error test_suite_gcm.decrypt \
test_suite_gcm.decrypt test_suite_hmac_shax \ test_suite_gcm.decrypt test_suite_hmac_shax \
@ -128,6 +129,14 @@ test_suite_dhm: test_suite_dhm.c ../library/libpolarssl.a
echo " CC $@.c" echo " CC $@.c"
$(CC) $(CFLAGS) $(OFLAGS) $@.c $(LDFLAGS) -o $@ $(CC) $(CFLAGS) $(OFLAGS) $@.c $(LDFLAGS) -o $@
test_suite_ecdh: test_suite_ecdh.c ../library/libpolarssl.a
echo " CC $@.c"
$(CC) $(CFLAGS) $(OFLAGS) $@.c $(LDFLAGS) -o $@
test_suite_ecdsa: test_suite_ecdsa.c ../library/libpolarssl.a
echo " CC $@.c"
$(CC) $(CFLAGS) $(OFLAGS) $@.c $(LDFLAGS) -o $@
test_suite_ecp: test_suite_ecp.c ../library/libpolarssl.a test_suite_ecp: test_suite_ecp.c ../library/libpolarssl.a
echo " CC $@.c" echo " CC $@.c"
$(CC) $(CFLAGS) $(OFLAGS) $@.c $(LDFLAGS) -o $@ $(CC) $(CFLAGS) $(OFLAGS) $@.c $(LDFLAGS) -o $@