--- a/include/mbedtls/config.h
+++ b/include/mbedtls/config.h
-@@ -599,19 +599,19 @@
+@@ -599,14 +599,14 @@
+ *
+ * Enable Output Feedback mode (OFB) for symmetric ciphers.
+ */
+-#define MBEDTLS_CIPHER_MODE_OFB
++//#define MBEDTLS_CIPHER_MODE_OFB
+
+ /**
+ * \def MBEDTLS_CIPHER_MODE_XTS
+ *
+ * Enable Xor-encrypt-xor with ciphertext stealing mode (XTS) for AES.
+ */
+-#define MBEDTLS_CIPHER_MODE_XTS
++//#define MBEDTLS_CIPHER_MODE_XTS
+
+ /**
+ * \def MBEDTLS_CIPHER_NULL_CIPHER
+@@ -696,19 +696,19 @@
*
* Comment macros to disable the curve and functions for it
*/
/**
* \def MBEDTLS_ECP_NIST_OPTIM
-@@ -635,8 +635,8 @@
- * Requires: MBEDTLS_HMAC_DRBG_C
- *
- * Comment this macro to disable deterministic ECDSA.
-- */
- #define MBEDTLS_ECDSA_DETERMINISTIC
-+ */
-
- /**
- * \def MBEDTLS_KEY_EXCHANGE_PSK_ENABLED
-@@ -689,7 +689,7 @@
+@@ -810,7 +810,7 @@
* See dhm.h for more details.
*
*/
/**
* \def MBEDTLS_KEY_EXCHANGE_ECDHE_PSK_ENABLED
-@@ -708,8 +708,8 @@
- * MBEDTLS_TLS_ECDHE_PSK_WITH_CAMELLIA_128_CBC_SHA256
+@@ -830,7 +830,7 @@
* MBEDTLS_TLS_ECDHE_PSK_WITH_3DES_EDE_CBC_SHA
* MBEDTLS_TLS_ECDHE_PSK_WITH_RC4_128_SHA
-- */
- #define MBEDTLS_KEY_EXCHANGE_ECDHE_PSK_ENABLED
-+ */
+ */
+-#define MBEDTLS_KEY_EXCHANGE_ECDHE_PSK_ENABLED
++//#define MBEDTLS_KEY_EXCHANGE_ECDHE_PSK_ENABLED
/**
* \def MBEDTLS_KEY_EXCHANGE_RSA_PSK_ENABLED
-@@ -734,7 +734,7 @@
+@@ -855,7 +855,7 @@
* MBEDTLS_TLS_RSA_PSK_WITH_3DES_EDE_CBC_SHA
* MBEDTLS_TLS_RSA_PSK_WITH_RC4_128_SHA
*/
/**
* \def MBEDTLS_KEY_EXCHANGE_RSA_ENABLED
-@@ -868,7 +868,7 @@
+@@ -989,7 +989,7 @@
* MBEDTLS_TLS_ECDH_ECDSA_WITH_CAMELLIA_128_GCM_SHA256
* MBEDTLS_TLS_ECDH_ECDSA_WITH_CAMELLIA_256_GCM_SHA384
*/
/**
* \def MBEDTLS_KEY_EXCHANGE_ECDH_RSA_ENABLED
-@@ -892,7 +892,7 @@
+@@ -1013,7 +1013,7 @@
* MBEDTLS_TLS_ECDH_RSA_WITH_CAMELLIA_128_GCM_SHA256
* MBEDTLS_TLS_ECDH_RSA_WITH_CAMELLIA_256_GCM_SHA384
*/
/**
* \def MBEDTLS_KEY_EXCHANGE_ECJPAKE_ENABLED
-@@ -996,7 +996,7 @@
+@@ -1117,7 +1117,7 @@
* This option is only useful if both MBEDTLS_SHA256_C and
* MBEDTLS_SHA512_C are defined. Otherwise the available hash module is used.
*/
/**
* \def MBEDTLS_ENTROPY_NV_SEED
-@@ -1091,14 +1091,14 @@
+@@ -1212,14 +1212,14 @@
* Uncomment this macro to disable the use of CRT in RSA.
*
*/
/**
* \def MBEDTLS_SHA256_SMALLER
-@@ -1114,7 +1114,7 @@
- *
- * Uncomment to enable the smaller implementation of SHA256.
- */
--//#define MBEDTLS_SHA256_SMALLER
-+#define MBEDTLS_SHA256_SMALLER
-
- /**
- * \def MBEDTLS_SSL_ALL_ALERT_MESSAGES
-@@ -1241,7 +1241,7 @@
+@@ -1373,7 +1373,7 @@
* configuration of this extension).
*
*/
/**
* \def MBEDTLS_SSL_SRV_SUPPORT_SSLV2_CLIENT_HELLO
-@@ -1415,8 +1415,8 @@
- * callbacks are provided by MBEDTLS_SSL_TICKET_C.
+@@ -1548,7 +1548,7 @@
*
* Comment this macro to disable support for SSL session tickets
-- */
- #define MBEDTLS_SSL_SESSION_TICKETS
-+ */
+ */
+-#define MBEDTLS_SSL_SESSION_TICKETS
++//#define MBEDTLS_SSL_SESSION_TICKETS
/**
* \def MBEDTLS_SSL_EXPORT_KEYS
-@@ -1446,7 +1446,7 @@
+@@ -1578,7 +1578,7 @@
*
* Comment this macro to disable support for truncated HMAC in SSL
*/
/**
* \def MBEDTLS_SSL_TRUNCATED_HMAC_COMPAT
-@@ -1504,8 +1504,8 @@
- * Requires: MBEDTLS_VERSION_C
+@@ -1637,7 +1637,7 @@
*
* Comment this to disable run-time checking and save ROM space
-- */
- #define MBEDTLS_VERSION_FEATURES
-+ */
+ */
+-#define MBEDTLS_VERSION_FEATURES
++//#define MBEDTLS_VERSION_FEATURES
/**
* \def MBEDTLS_X509_ALLOW_EXTENSIONS_NON_V3
-@@ -1835,7 +1835,7 @@
+@@ -1967,7 +1967,7 @@
* MBEDTLS_TLS_PSK_WITH_CAMELLIA_128_GCM_SHA256
* MBEDTLS_TLS_PSK_WITH_CAMELLIA_128_CBC_SHA256
*/
+//#define MBEDTLS_CAMELLIA_C
/**
- * \def MBEDTLS_CCM_C
-@@ -1849,7 +1849,7 @@
+ * \def MBEDTLS_ARIA_C
+@@ -2033,7 +2033,7 @@
* This module enables the AES-CCM ciphersuites, if other requisites are
* enabled as well.
*/
/**
* \def MBEDTLS_CERTS_C
-@@ -1861,7 +1861,7 @@
+@@ -2045,7 +2045,7 @@
*
* This module is used for testing (ssl_client/server).
*/
+//#define MBEDTLS_CERTS_C
/**
- * \def MBEDTLS_CIPHER_C
-@@ -1914,7 +1914,7 @@
+ * \def MBEDTLS_CHACHA20_C
+@@ -2120,7 +2120,7 @@
*
* This module provides debugging functions.
*/
/**
* \def MBEDTLS_DES_C
-@@ -1943,7 +1943,7 @@
+@@ -2149,7 +2149,7 @@
* \warning DES is considered a weak cipher and its use constitutes a
* security risk. We recommend considering stronger ciphers instead.
*/
/**
* \def MBEDTLS_DHM_C
-@@ -2104,8 +2104,8 @@
- * Requires: MBEDTLS_MD_C
+@@ -2312,7 +2312,7 @@
+ * This module adds support for the Hashed Message Authentication Code
+ * (HMAC)-based key derivation function (HKDF).
+ */
+-#define MBEDTLS_HKDF_C
++//#define MBEDTLS_HKDF_C
+
+ /**
+ * \def MBEDTLS_HMAC_DRBG_C
+@@ -2622,7 +2622,7 @@
*
- * Uncomment to enable the HMAC_DRBG random number geerator.
-- */
- #define MBEDTLS_HMAC_DRBG_C
-+ */
+ * This module enables abstraction of common (libc) functions.
+ */
+-#define MBEDTLS_PLATFORM_C
++//#define MBEDTLS_PLATFORM_C
/**
- * \def MBEDTLS_MD_C
-@@ -2399,7 +2399,7 @@
+ * \def MBEDTLS_POLY1305_C
+@@ -2643,7 +2643,7 @@
* Caller: library/md.c
*
*/
/**
* \def MBEDTLS_RSA_C
-@@ -2505,8 +2505,8 @@
- * Caller:
+@@ -2750,7 +2750,7 @@
*
* Requires: MBEDTLS_CIPHER_C
-- */
- #define MBEDTLS_SSL_TICKET_C
-+ */
+ */
+-#define MBEDTLS_SSL_TICKET_C
++//#define MBEDTLS_SSL_TICKET_C
/**
* \def MBEDTLS_SSL_CLI_C
-@@ -2605,8 +2605,8 @@
- * Module: library/version.c
+@@ -2850,7 +2850,7 @@
*
* This module provides run-time version information.
-- */
- #define MBEDTLS_VERSION_C
-+ */
+ */
+-#define MBEDTLS_VERSION_C
++//#define MBEDTLS_VERSION_C
/**
* \def MBEDTLS_X509_USE_C
-@@ -2716,7 +2716,7 @@
+@@ -2960,7 +2960,7 @@
* Module: library/xtea.c
* Caller:
*/