--- a/include/mbedtls/config.h
+++ b/include/mbedtls/config.h
-@@ -191,7 +191,7 @@
+@@ -522,14 +522,14 @@
*
- * Uncomment to get errors on using deprecated functions.
+ * Enable Output Feedback mode (OFB) for symmetric ciphers.
*/
--//#define MBEDTLS_DEPRECATED_REMOVED
-+#define MBEDTLS_DEPRECATED_REMOVED
+-#define MBEDTLS_CIPHER_MODE_OFB
++//#define MBEDTLS_CIPHER_MODE_OFB
- /* \} name SECTION: System support */
-
-@@ -347,7 +347,7 @@
+ /**
+ * \def MBEDTLS_CIPHER_MODE_XTS
*
- * Enable Cipher Feedback mode (CFB) for symmetric ciphers.
+ * Enable Xor-encrypt-xor with ciphertext stealing mode (XTS) for AES.
*/
--#define MBEDTLS_CIPHER_MODE_CFB
-+//#define MBEDTLS_CIPHER_MODE_CFB
+-#define MBEDTLS_CIPHER_MODE_XTS
++//#define MBEDTLS_CIPHER_MODE_XTS
/**
- * \def MBEDTLS_CIPHER_MODE_CTR
-@@ -441,13 +441,13 @@
+ * \def MBEDTLS_CIPHER_NULL_CIPHER
+@@ -619,19 +619,19 @@
*
* Comment macros to disable the curve and functions for it
*/
+//#define MBEDTLS_ECP_DP_SECP224R1_ENABLED
#define MBEDTLS_ECP_DP_SECP256R1_ENABLED
#define MBEDTLS_ECP_DP_SECP384R1_ENABLED
- #define MBEDTLS_ECP_DP_SECP521R1_ENABLED
+-#define MBEDTLS_ECP_DP_SECP521R1_ENABLED
-#define MBEDTLS_ECP_DP_SECP192K1_ENABLED
-#define MBEDTLS_ECP_DP_SECP224K1_ENABLED
++//#define MBEDTLS_ECP_DP_SECP521R1_ENABLED
+//#define MBEDTLS_ECP_DP_SECP192K1_ENABLED
+//#define MBEDTLS_ECP_DP_SECP224K1_ENABLED
#define MBEDTLS_ECP_DP_SECP256K1_ENABLED
- #define MBEDTLS_ECP_DP_BP256R1_ENABLED
- #define MBEDTLS_ECP_DP_BP384R1_ENABLED
-@@ -476,8 +476,8 @@
- * Requires: MBEDTLS_HMAC_DRBG_C
- *
- * Comment this macro to disable deterministic ECDSA.
-- */
- #define MBEDTLS_ECDSA_DETERMINISTIC
-+ */
+-#define MBEDTLS_ECP_DP_BP256R1_ENABLED
+-#define MBEDTLS_ECP_DP_BP384R1_ENABLED
+-#define MBEDTLS_ECP_DP_BP512R1_ENABLED
++//#define MBEDTLS_ECP_DP_BP256R1_ENABLED
++//#define MBEDTLS_ECP_DP_BP384R1_ENABLED
++//#define MBEDTLS_ECP_DP_BP512R1_ENABLED
+ #define MBEDTLS_ECP_DP_CURVE25519_ENABLED
+-#define MBEDTLS_ECP_DP_CURVE448_ENABLED
++//#define MBEDTLS_ECP_DP_CURVE448_ENABLED
/**
- * \def MBEDTLS_KEY_EXCHANGE_PSK_ENABLED
-@@ -523,7 +523,7 @@
- * MBEDTLS_TLS_DHE_PSK_WITH_3DES_EDE_CBC_SHA
- * MBEDTLS_TLS_DHE_PSK_WITH_RC4_128_SHA
+ * \def MBEDTLS_ECP_NIST_OPTIM
+@@ -709,7 +709,7 @@
+ * See dhm.h for more details.
+ *
*/
-#define MBEDTLS_KEY_EXCHANGE_DHE_PSK_ENABLED
+//#define MBEDTLS_KEY_EXCHANGE_DHE_PSK_ENABLED
/**
* \def MBEDTLS_KEY_EXCHANGE_ECDHE_PSK_ENABLED
-@@ -542,8 +542,8 @@
- * MBEDTLS_TLS_ECDHE_PSK_WITH_CAMELLIA_128_CBC_SHA256
+@@ -729,7 +729,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
-@@ -568,7 +568,7 @@
+@@ -754,7 +754,7 @@
* MBEDTLS_TLS_RSA_PSK_WITH_3DES_EDE_CBC_SHA
* MBEDTLS_TLS_RSA_PSK_WITH_RC4_128_SHA
*/
/**
* \def MBEDTLS_KEY_EXCHANGE_RSA_ENABLED
-@@ -622,7 +622,7 @@
- * MBEDTLS_TLS_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA
- * MBEDTLS_TLS_DHE_RSA_WITH_3DES_EDE_CBC_SHA
- */
--#define MBEDTLS_KEY_EXCHANGE_DHE_RSA_ENABLED
-+//#define MBEDTLS_KEY_EXCHANGE_DHE_RSA_ENABLED
-
- /**
- * \def MBEDTLS_KEY_EXCHANGE_ECDHE_RSA_ENABLED
-@@ -695,7 +695,7 @@
+@@ -888,7 +888,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
-@@ -719,7 +719,7 @@
+@@ -912,7 +912,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
-@@ -885,7 +885,7 @@
- *
- * Comment this macro to disable support for external private RSA keys.
+@@ -1016,7 +1016,7 @@
+ * This option is only useful if both MBEDTLS_SHA256_C and
+ * MBEDTLS_SHA512_C are defined. Otherwise the available hash module is used.
*/
--#define MBEDTLS_PK_RSA_ALT_SUPPORT
-+//#define MBEDTLS_PK_RSA_ALT_SUPPORT
+-//#define MBEDTLS_ENTROPY_FORCE_SHA256
++#define MBEDTLS_ENTROPY_FORCE_SHA256
/**
- * \def MBEDTLS_PKCS1_V15
-@@ -917,14 +917,14 @@
+ * \def MBEDTLS_ENTROPY_NV_SEED
+@@ -1111,14 +1111,14 @@
* Uncomment this macro to disable the use of CRT in RSA.
*
*/
/**
* \def MBEDTLS_SHA256_SMALLER
-@@ -940,7 +940,7 @@
+@@ -1272,7 +1272,7 @@
+ * configuration of this extension).
*
- * Uncomment to enable the smaller implementation of SHA256.
*/
--//#define MBEDTLS_SHA256_SMALLER
-+#define MBEDTLS_SHA256_SMALLER
+-#define MBEDTLS_SSL_RENEGOTIATION
++//#define MBEDTLS_SSL_RENEGOTIATION
/**
- * \def MBEDTLS_SSL_ALL_ALERT_MESSAGES
-@@ -1234,8 +1234,8 @@
- * callbacks are provided by MBEDTLS_SSL_TICKET_C.
+ * \def MBEDTLS_SSL_SRV_SUPPORT_SSLV2_CLIENT_HELLO
+@@ -1447,7 +1447,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
-@@ -1265,7 +1265,7 @@
+@@ -1477,7 +1477,7 @@
*
* Comment this macro to disable support for truncated HMAC in SSL
*/
+//#define MBEDTLS_SSL_TRUNCATED_HMAC
/**
- * \def MBEDTLS_THREADING_ALT
-@@ -1299,8 +1299,8 @@
- * Requires: MBEDTLS_VERSION_C
+ * \def MBEDTLS_SSL_TRUNCATED_HMAC_COMPAT
+@@ -1536,7 +1536,7 @@
*
* Comment this to disable run-time checking and save ROM space
-- */
- #define MBEDTLS_VERSION_FEATURES
-+ */
-
- /**
- * \def MBEDTLS_X509_ALLOW_EXTENSIONS_NON_V3
-@@ -1501,7 +1501,7 @@
- * MBEDTLS_TLS_RSA_PSK_WITH_RC4_128_SHA
- * MBEDTLS_TLS_PSK_WITH_RC4_128_SHA
*/
--#define MBEDTLS_ARC4_C
-+//#define MBEDTLS_ARC4_C
+-#define MBEDTLS_VERSION_FEATURES
++//#define MBEDTLS_VERSION_FEATURES
/**
- * \def MBEDTLS_ASN1_PARSE_C
-@@ -1621,7 +1621,7 @@
+ * \def MBEDTLS_X509_ALLOW_EXTENSIONS_NON_V3
+@@ -1866,7 +1866,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
-@@ -1635,7 +1635,7 @@
+ * \def MBEDTLS_ARIA_C
+@@ -1932,7 +1932,7 @@
* This module enables the AES-CCM ciphersuites, if other requisites are
* enabled as well.
*/
/**
* \def MBEDTLS_CERTS_C
-@@ -1647,7 +1647,7 @@
+@@ -1944,7 +1944,7 @@
*
* This module is used for testing (ssl_client/server).
*/
/**
* \def MBEDTLS_CIPHER_C
-@@ -1700,7 +1700,7 @@
+@@ -1997,7 +1997,7 @@
*
* This module provides debugging functions.
*/
/**
* \def MBEDTLS_DES_C
-@@ -1880,8 +1880,8 @@
- * Requires: MBEDTLS_MD_C
+@@ -2026,7 +2026,7 @@
+ * \warning DES is considered a weak cipher and its use constitutes a
+ * security risk. We recommend considering stronger ciphers instead.
+ */
+-#define MBEDTLS_DES_C
++//#define MBEDTLS_DES_C
+
+ /**
+ * \def MBEDTLS_DHM_C
+@@ -2189,7 +2189,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
+@@ -2486,7 +2486,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
-@@ -2158,7 +2158,7 @@
- * Caller: library/mbedtls_md.c
+ * \def MBEDTLS_RIPEMD160_C
+@@ -2497,7 +2497,7 @@
+ * Caller: library/md.c
*
*/
-#define MBEDTLS_RIPEMD160_C
/**
* \def MBEDTLS_RSA_C
-@@ -2235,8 +2235,8 @@
- * Caller:
- *
- * Requires: MBEDTLS_SSL_CACHE_C
-- */
- #define MBEDTLS_SSL_CACHE_C
-+ */
-
- /**
- * \def MBEDTLS_SSL_COOKIE_C
-@@ -2257,8 +2257,8 @@
- * Caller:
+@@ -2604,7 +2604,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
-@@ -2357,8 +2357,8 @@
- * Module: library/version.c
+@@ -2704,7 +2704,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
-@@ -2468,7 +2468,7 @@
+@@ -2814,7 +2814,7 @@
* Module: library/xtea.c
* Caller:
*/
projects / openwrt / openwrt.git / blobdiff