--- a/include/polarssl/config.h
+++ b/include/polarssl/config.h
-@@ -315,8 +315,8 @@
+@@ -432,8 +432,8 @@
+ * Requires: POLARSSL_HMAC_DRBG_C
+ *
+ * Comment this macro to disable deterministic ECDSA.
+- */
+ #define POLARSSL_ECDSA_DETERMINISTIC
++ */
+
+ /**
+ * \def POLARSSL_KEY_EXCHANGE_PSK_ENABLED
+@@ -454,8 +454,8 @@
* TLS_PSK_WITH_CAMELLIA_128_CBC_SHA256
* TLS_PSK_WITH_3DES_EDE_CBC_SHA
* TLS_PSK_WITH_RC4_128_SHA
/**
* \def POLARSSL_KEY_EXCHANGE_DHE_PSK_ENABLED
-@@ -339,8 +339,8 @@
+@@ -478,8 +478,8 @@
* TLS_DHE_PSK_WITH_CAMELLIA_128_CBC_SHA256
* TLS_DHE_PSK_WITH_3DES_EDE_CBC_SHA
* TLS_DHE_PSK_WITH_RC4_128_SHA
/**
* \def POLARSSL_KEY_EXCHANGE_ECDHE_PSK_ENABLED
-@@ -359,8 +359,8 @@
+@@ -498,8 +498,8 @@
* TLS_ECDHE_PSK_WITH_CAMELLIA_128_CBC_SHA256
* TLS_ECDHE_PSK_WITH_3DES_EDE_CBC_SHA
* TLS_ECDHE_PSK_WITH_RC4_128_SHA
/**
* \def POLARSSL_KEY_EXCHANGE_RSA_PSK_ENABLED
-@@ -384,8 +384,8 @@
+@@ -523,8 +523,8 @@
* TLS_RSA_PSK_WITH_CAMELLIA_128_CBC_SHA256
* TLS_RSA_PSK_WITH_3DES_EDE_CBC_SHA
* TLS_RSA_PSK_WITH_RC4_128_SHA
/**
* \def POLARSSL_KEY_EXCHANGE_RSA_ENABLED
-@@ -463,8 +463,8 @@
+@@ -602,8 +602,8 @@
* TLS_ECDHE_RSA_WITH_CAMELLIA_128_CBC_SHA256
* TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA
* TLS_ECDHE_RSA_WITH_RC4_128_SHA
/**
* \def POLARSSL_KEY_EXCHANGE_ECDHE_ECDSA_ENABLED
-@@ -487,8 +487,8 @@
+@@ -626,8 +626,8 @@
* TLS_ECDHE_ECDSA_WITH_CAMELLIA_128_CBC_SHA256
* TLS_ECDHE_ECDSA_WITH_3DES_EDE_CBC_SHA
* TLS_ECDHE_ECDSA_WITH_RC4_128_SHA
/**
* \def POLARSSL_KEY_EXCHANGE_ECDH_ECDSA_ENABLED
-@@ -511,8 +511,8 @@
+@@ -650,8 +650,8 @@
* TLS_ECDH_ECDSA_WITH_CAMELLIA_256_CBC_SHA384
* TLS_ECDH_ECDSA_WITH_CAMELLIA_128_GCM_SHA256
* TLS_ECDH_ECDSA_WITH_CAMELLIA_256_GCM_SHA384
/**
* \def POLARSSL_KEY_EXCHANGE_ECDH_RSA_ENABLED
-@@ -535,8 +535,8 @@
+@@ -674,8 +674,8 @@
* TLS_ECDH_RSA_WITH_CAMELLIA_256_CBC_SHA384
* TLS_ECDH_RSA_WITH_CAMELLIA_128_GCM_SHA256
* TLS_ECDH_RSA_WITH_CAMELLIA_256_GCM_SHA384
+ */
/**
- * \def POLARSSL_ERROR_STRERROR_BC
-@@ -566,8 +566,8 @@
- * Enable the prime-number generation code.
+ * \def POLARSSL_PK_PARSE_EC_EXTENDED
+@@ -835,8 +835,8 @@
+ * \def POLARSSL_SELF_TEST
*
- * Requires: POLARSSL_BIGNUM_C
+ * Enable the checkup functions (*_self_test).
- */
- #define POLARSSL_GENPRIME
+ #define POLARSSL_SELF_TEST
+ */
/**
- * \def POLARSSL_FS_IO
-@@ -662,8 +662,8 @@
- * \def POLARSSL_SELF_TEST
+ * \def POLARSSL_SSL_AEAD_RANDOM_IV
+@@ -1138,8 +1138,8 @@
+ * Requires: POLARSSL_VERSION_C
*
- * Enable the checkup functions (*_self_test).
+ * Comment this to disable run-time checking and save ROM space
- */
- #define POLARSSL_SELF_TEST
+ #define POLARSSL_VERSION_FEATURES
+ */
/**
- * \def POLARSSL_SSL_ALL_ALERT_MESSAGES
-@@ -1107,8 +1107,8 @@
+ * \def POLARSSL_X509_ALLOW_EXTENSIONS_NON_V3
+@@ -1457,8 +1457,8 @@
* TLS_PSK_WITH_CAMELLIA_256_CBC_SHA384
* TLS_PSK_WITH_CAMELLIA_128_GCM_SHA256
* TLS_PSK_WITH_CAMELLIA_128_CBC_SHA256
+ */
/**
- * \def POLARSSL_CERTS_C
-@@ -1121,8 +1121,8 @@
+ * \def POLARSSL_CCM_C
+@@ -1485,8 +1485,8 @@
* Requires: POLARSSL_PEM_PARSE_C
*
* This module is used for testing (ssl_client/server).
/**
* \def POLARSSL_CIPHER_C
-@@ -1161,8 +1161,8 @@
+@@ -1525,8 +1525,8 @@
* library/ssl_tls.c
*
* This module provides debugging functions.
/**
* \def POLARSSL_DES_C
-@@ -1217,8 +1217,8 @@
+@@ -1581,8 +1581,8 @@
* ECDHE-ECDSA, ECDHE-RSA, DHE-PSK
*
* Requires: POLARSSL_ECP_C
/**
* \def POLARSSL_ECDSA_C
-@@ -1232,8 +1232,8 @@
+@@ -1596,8 +1596,8 @@
* ECDHE-ECDSA
*
* Requires: POLARSSL_ECP_C, POLARSSL_ASN1_WRITE_C, POLARSSL_ASN1_PARSE_C
/**
* \def POLARSSL_ECP_C
-@@ -1245,8 +1245,8 @@
+@@ -1609,8 +1609,8 @@
* library/ecdsa.c
*
* Requires: POLARSSL_BIGNUM_C and at least one POLARSSL_ECP_DP_XXX_ENABLED
/**
* \def POLARSSL_ENTROPY_C
-@@ -1285,8 +1285,8 @@
+@@ -1649,8 +1649,8 @@
*
* This module enables the AES-GCM and CAMELLIA-GCM ciphersuites, if other
* requisites are enabled as well.
/**
* \def POLARSSL_HAVEGE_C
-@@ -1436,8 +1436,8 @@
+@@ -1686,8 +1686,8 @@
+ * Requires: POLARSSL_MD_C
+ *
+ * Uncomment to enable the HMAC_DRBG random number geerator.
+- */
+ #define POLARSSL_HMAC_DRBG_C
++ */
+
+ /**
+ * \def POLARSSL_MD_C
+@@ -1813,8 +1813,8 @@
* Requires: POLARSSL_HAVE_ASM
*
* This modules adds support for the VIA PadLock on x86.
/**
* \def POLARSSL_PBKDF2_C
-@@ -1584,8 +1584,8 @@
+@@ -1979,8 +1979,8 @@
* Module: library/ripemd160.c
* Caller: library/md.c
*
/**
* \def POLARSSL_RSA_C
-@@ -1664,8 +1664,8 @@
+@@ -2059,8 +2059,8 @@
* Caller:
*
* Requires: POLARSSL_SSL_CACHE_C
/**
* \def POLARSSL_SSL_CLI_C
-@@ -1741,8 +1741,8 @@
+@@ -2136,8 +2136,8 @@
* Caller: library/havege.c
*
* This module is used by the HAVEGE random number generator.
/**
* \def POLARSSL_VERSION_C
-@@ -1862,8 +1862,8 @@
+@@ -2147,8 +2147,8 @@
+ * Module: library/version.c
+ *
+ * This module provides run-time version information.
+- */
+ #define POLARSSL_VERSION_C
++ */
+
+ /**
+ * \def POLARSSL_X509_USE_C
+@@ -2257,8 +2257,8 @@
*
* Module: library/xtea.c
* Caller:
#define POLARSSL_XTEA_C
+ */
- /* \} name SECTION: PolarSSL modules */
+ /* \} name SECTION: mbed TLS modules */