2014-08-08 05:20:50 +00:00
|
|
|
--- a/include/polarssl/config.h
|
|
|
|
+++ b/include/polarssl/config.h
|
2015-05-05 10:00:36 +00:00
|
|
|
@@ -370,8 +370,8 @@
|
|
|
|
* Requires: POLARSSL_HMAC_DRBG_C
|
|
|
|
*
|
|
|
|
* Comment this macro to disable deterministic ECDSA.
|
|
|
|
- */
|
|
|
|
#define POLARSSL_ECDSA_DETERMINISTIC
|
|
|
|
+ */
|
|
|
|
|
|
|
|
/**
|
|
|
|
* \def POLARSSL_KEY_EXCHANGE_PSK_ENABLED
|
2015-02-09 12:44:32 +00:00
|
|
|
@@ -392,8 +392,8 @@
|
2014-03-14 15:05:46 +00:00
|
|
|
* TLS_PSK_WITH_CAMELLIA_128_CBC_SHA256
|
|
|
|
* TLS_PSK_WITH_3DES_EDE_CBC_SHA
|
|
|
|
* TLS_PSK_WITH_RC4_128_SHA
|
|
|
|
- */
|
|
|
|
#define POLARSSL_KEY_EXCHANGE_PSK_ENABLED
|
|
|
|
+ */
|
|
|
|
|
|
|
|
/**
|
|
|
|
* \def POLARSSL_KEY_EXCHANGE_DHE_PSK_ENABLED
|
2015-02-09 12:44:32 +00:00
|
|
|
@@ -416,8 +416,8 @@
|
2014-03-14 15:05:46 +00:00
|
|
|
* TLS_DHE_PSK_WITH_CAMELLIA_128_CBC_SHA256
|
|
|
|
* TLS_DHE_PSK_WITH_3DES_EDE_CBC_SHA
|
|
|
|
* TLS_DHE_PSK_WITH_RC4_128_SHA
|
|
|
|
- */
|
|
|
|
#define POLARSSL_KEY_EXCHANGE_DHE_PSK_ENABLED
|
|
|
|
+ */
|
|
|
|
|
|
|
|
/**
|
|
|
|
* \def POLARSSL_KEY_EXCHANGE_ECDHE_PSK_ENABLED
|
2015-02-09 12:44:32 +00:00
|
|
|
@@ -436,8 +436,8 @@
|
2014-03-14 15:05:46 +00:00
|
|
|
* TLS_ECDHE_PSK_WITH_CAMELLIA_128_CBC_SHA256
|
|
|
|
* TLS_ECDHE_PSK_WITH_3DES_EDE_CBC_SHA
|
|
|
|
* TLS_ECDHE_PSK_WITH_RC4_128_SHA
|
|
|
|
- */
|
|
|
|
#define POLARSSL_KEY_EXCHANGE_ECDHE_PSK_ENABLED
|
|
|
|
+ */
|
|
|
|
|
|
|
|
/**
|
|
|
|
* \def POLARSSL_KEY_EXCHANGE_RSA_PSK_ENABLED
|
2015-02-09 12:44:32 +00:00
|
|
|
@@ -461,8 +461,8 @@
|
2014-03-14 15:05:46 +00:00
|
|
|
* TLS_RSA_PSK_WITH_CAMELLIA_128_CBC_SHA256
|
|
|
|
* TLS_RSA_PSK_WITH_3DES_EDE_CBC_SHA
|
|
|
|
* TLS_RSA_PSK_WITH_RC4_128_SHA
|
|
|
|
- */
|
|
|
|
#define POLARSSL_KEY_EXCHANGE_RSA_PSK_ENABLED
|
|
|
|
+ */
|
|
|
|
|
|
|
|
/**
|
|
|
|
* \def POLARSSL_KEY_EXCHANGE_RSA_ENABLED
|
2015-02-09 12:44:32 +00:00
|
|
|
@@ -540,8 +540,8 @@
|
2014-03-14 15:05:46 +00:00
|
|
|
* TLS_ECDHE_RSA_WITH_CAMELLIA_128_CBC_SHA256
|
|
|
|
* TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA
|
|
|
|
* TLS_ECDHE_RSA_WITH_RC4_128_SHA
|
|
|
|
- */
|
|
|
|
#define POLARSSL_KEY_EXCHANGE_ECDHE_RSA_ENABLED
|
|
|
|
+ */
|
|
|
|
|
|
|
|
/**
|
|
|
|
* \def POLARSSL_KEY_EXCHANGE_ECDHE_ECDSA_ENABLED
|
2015-02-09 12:44:32 +00:00
|
|
|
@@ -564,8 +564,8 @@
|
2014-03-14 15:05:46 +00:00
|
|
|
* TLS_ECDHE_ECDSA_WITH_CAMELLIA_128_CBC_SHA256
|
|
|
|
* TLS_ECDHE_ECDSA_WITH_3DES_EDE_CBC_SHA
|
|
|
|
* TLS_ECDHE_ECDSA_WITH_RC4_128_SHA
|
|
|
|
- */
|
|
|
|
#define POLARSSL_KEY_EXCHANGE_ECDHE_ECDSA_ENABLED
|
|
|
|
+ */
|
|
|
|
|
|
|
|
/**
|
|
|
|
* \def POLARSSL_KEY_EXCHANGE_ECDH_ECDSA_ENABLED
|
2015-02-09 12:44:32 +00:00
|
|
|
@@ -588,8 +588,8 @@
|
2014-03-14 15:05:46 +00:00
|
|
|
* TLS_ECDH_ECDSA_WITH_CAMELLIA_256_CBC_SHA384
|
|
|
|
* TLS_ECDH_ECDSA_WITH_CAMELLIA_128_GCM_SHA256
|
|
|
|
* TLS_ECDH_ECDSA_WITH_CAMELLIA_256_GCM_SHA384
|
|
|
|
- */
|
|
|
|
#define POLARSSL_KEY_EXCHANGE_ECDH_ECDSA_ENABLED
|
|
|
|
+ */
|
|
|
|
|
|
|
|
/**
|
|
|
|
* \def POLARSSL_KEY_EXCHANGE_ECDH_RSA_ENABLED
|
2015-02-09 12:44:32 +00:00
|
|
|
@@ -612,8 +612,8 @@
|
2014-03-14 15:05:46 +00:00
|
|
|
* TLS_ECDH_RSA_WITH_CAMELLIA_256_CBC_SHA384
|
|
|
|
* TLS_ECDH_RSA_WITH_CAMELLIA_128_GCM_SHA256
|
|
|
|
* TLS_ECDH_RSA_WITH_CAMELLIA_256_GCM_SHA384
|
|
|
|
- */
|
|
|
|
#define POLARSSL_KEY_EXCHANGE_ECDH_RSA_ENABLED
|
|
|
|
+ */
|
|
|
|
|
|
|
|
/**
|
2014-06-01 09:49:24 +00:00
|
|
|
* \def POLARSSL_PK_PARSE_EC_EXTENDED
|
2015-02-09 12:44:32 +00:00
|
|
|
@@ -775,8 +775,8 @@
|
2013-01-30 20:07:04 +00:00
|
|
|
* \def POLARSSL_SELF_TEST
|
|
|
|
*
|
|
|
|
* Enable the checkup functions (*_self_test).
|
|
|
|
- */
|
|
|
|
#define POLARSSL_SELF_TEST
|
|
|
|
+ */
|
|
|
|
|
|
|
|
/**
|
2015-02-09 12:44:32 +00:00
|
|
|
* \def POLARSSL_SSL_AEAD_RANDOM_IV
|
|
|
|
@@ -1395,8 +1395,8 @@
|
2014-03-14 15:05:46 +00:00
|
|
|
* TLS_PSK_WITH_CAMELLIA_256_CBC_SHA384
|
|
|
|
* TLS_PSK_WITH_CAMELLIA_128_GCM_SHA256
|
|
|
|
* TLS_PSK_WITH_CAMELLIA_128_CBC_SHA256
|
2013-01-30 20:07:04 +00:00
|
|
|
- */
|
|
|
|
#define POLARSSL_CAMELLIA_C
|
|
|
|
+ */
|
|
|
|
|
|
|
|
/**
|
2014-08-08 05:20:50 +00:00
|
|
|
* \def POLARSSL_CCM_C
|
2015-02-09 12:44:32 +00:00
|
|
|
@@ -1423,8 +1423,8 @@
|
2014-03-14 15:05:46 +00:00
|
|
|
* Requires: POLARSSL_PEM_PARSE_C
|
2013-01-30 20:07:04 +00:00
|
|
|
*
|
|
|
|
* This module is used for testing (ssl_client/server).
|
|
|
|
- */
|
|
|
|
#define POLARSSL_CERTS_C
|
|
|
|
+ */
|
|
|
|
|
|
|
|
/**
|
|
|
|
* \def POLARSSL_CIPHER_C
|
2015-02-09 12:44:32 +00:00
|
|
|
@@ -1463,8 +1463,8 @@
|
2013-01-30 20:07:04 +00:00
|
|
|
* library/ssl_tls.c
|
|
|
|
*
|
|
|
|
* This module provides debugging functions.
|
|
|
|
- */
|
|
|
|
#define POLARSSL_DEBUG_C
|
|
|
|
+ */
|
|
|
|
|
|
|
|
/**
|
|
|
|
* \def POLARSSL_DES_C
|
2015-02-09 12:44:32 +00:00
|
|
|
@@ -1519,8 +1519,8 @@
|
2014-03-14 15:05:46 +00:00
|
|
|
* ECDHE-ECDSA, ECDHE-RSA, DHE-PSK
|
|
|
|
*
|
|
|
|
* Requires: POLARSSL_ECP_C
|
|
|
|
- */
|
|
|
|
#define POLARSSL_ECDH_C
|
|
|
|
+ */
|
|
|
|
|
|
|
|
/**
|
|
|
|
* \def POLARSSL_ECDSA_C
|
2015-02-09 12:44:32 +00:00
|
|
|
@@ -1534,8 +1534,8 @@
|
2014-03-14 15:05:46 +00:00
|
|
|
* ECDHE-ECDSA
|
|
|
|
*
|
|
|
|
* Requires: POLARSSL_ECP_C, POLARSSL_ASN1_WRITE_C, POLARSSL_ASN1_PARSE_C
|
|
|
|
- */
|
|
|
|
#define POLARSSL_ECDSA_C
|
|
|
|
+ */
|
|
|
|
|
|
|
|
/**
|
|
|
|
* \def POLARSSL_ECP_C
|
2015-02-09 12:44:32 +00:00
|
|
|
@@ -1547,8 +1547,8 @@
|
2014-03-14 15:05:46 +00:00
|
|
|
* library/ecdsa.c
|
|
|
|
*
|
|
|
|
* Requires: POLARSSL_BIGNUM_C and at least one POLARSSL_ECP_DP_XXX_ENABLED
|
|
|
|
- */
|
|
|
|
#define POLARSSL_ECP_C
|
|
|
|
+ */
|
|
|
|
|
|
|
|
/**
|
|
|
|
* \def POLARSSL_ENTROPY_C
|
2015-02-09 12:44:32 +00:00
|
|
|
@@ -1587,8 +1587,8 @@
|
2014-03-14 15:05:46 +00:00
|
|
|
*
|
|
|
|
* This module enables the AES-GCM and CAMELLIA-GCM ciphersuites, if other
|
|
|
|
* requisites are enabled as well.
|
2013-01-30 20:07:04 +00:00
|
|
|
- */
|
|
|
|
#define POLARSSL_GCM_C
|
|
|
|
+ */
|
|
|
|
|
|
|
|
/**
|
|
|
|
* \def POLARSSL_HAVEGE_C
|
2015-05-05 10:00:36 +00:00
|
|
|
@@ -1624,8 +1624,8 @@
|
|
|
|
* Requires: POLARSSL_MD_C
|
|
|
|
*
|
|
|
|
* Uncomment to enable the HMAC_DRBG random number geerator.
|
|
|
|
- */
|
|
|
|
#define POLARSSL_HMAC_DRBG_C
|
|
|
|
+ */
|
|
|
|
|
|
|
|
/**
|
|
|
|
* \def POLARSSL_MD_C
|
2015-02-09 12:44:32 +00:00
|
|
|
@@ -1746,8 +1746,8 @@
|
2014-03-14 15:05:46 +00:00
|
|
|
* Requires: POLARSSL_HAVE_ASM
|
2013-01-30 20:07:04 +00:00
|
|
|
*
|
|
|
|
* This modules adds support for the VIA PadLock on x86.
|
|
|
|
- */
|
|
|
|
#define POLARSSL_PADLOCK_C
|
|
|
|
+ */
|
|
|
|
|
|
|
|
/**
|
|
|
|
* \def POLARSSL_PBKDF2_C
|
2015-02-09 12:44:32 +00:00
|
|
|
@@ -1907,8 +1907,8 @@
|
2014-03-14 15:05:46 +00:00
|
|
|
* Module: library/ripemd160.c
|
|
|
|
* Caller: library/md.c
|
|
|
|
*
|
|
|
|
- */
|
|
|
|
#define POLARSSL_RIPEMD160_C
|
|
|
|
+ */
|
|
|
|
|
|
|
|
/**
|
|
|
|
* \def POLARSSL_RSA_C
|
2015-02-09 12:44:32 +00:00
|
|
|
@@ -1987,8 +1987,8 @@
|
2013-01-30 20:07:04 +00:00
|
|
|
* Caller:
|
|
|
|
*
|
|
|
|
* Requires: POLARSSL_SSL_CACHE_C
|
|
|
|
- */
|
|
|
|
#define POLARSSL_SSL_CACHE_C
|
|
|
|
+ */
|
|
|
|
|
|
|
|
/**
|
|
|
|
* \def POLARSSL_SSL_CLI_C
|
2015-02-09 12:44:32 +00:00
|
|
|
@@ -2064,8 +2064,8 @@
|
2013-01-30 20:07:04 +00:00
|
|
|
* Caller: library/havege.c
|
|
|
|
*
|
|
|
|
* This module is used by the HAVEGE random number generator.
|
|
|
|
- */
|
|
|
|
#define POLARSSL_TIMING_C
|
|
|
|
+ */
|
|
|
|
|
|
|
|
/**
|
|
|
|
* \def POLARSSL_VERSION_C
|
2015-02-09 12:44:32 +00:00
|
|
|
@@ -2185,8 +2185,8 @@
|
2013-01-30 20:07:04 +00:00
|
|
|
*
|
|
|
|
* Module: library/xtea.c
|
|
|
|
* Caller:
|
|
|
|
- */
|
|
|
|
#define POLARSSL_XTEA_C
|
|
|
|
+ */
|
|
|
|
|
2015-02-09 12:44:32 +00:00
|
|
|
/* \} name SECTION: mbed TLS modules */
|
2014-03-14 15:05:46 +00:00
|
|
|
|