--- a/include/mbedtls/config.h
+++ b/include/mbedtls/config.h
-@@ -184,7 +184,7 @@
+@@ -599,14 +599,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 */
-
-@@ -323,7 +323,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
-@@ -416,13 +416,13 @@
+ * \def MBEDTLS_CIPHER_NULL_CIPHER
+@@ -716,19 +716,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
-@@ -438,7 +438,7 @@
+-#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_ECP_NIST_OPTIM
+@@ -830,7 +830,7 @@
+ * See dhm.h for more details.
*
- * Comment this macro to disable NIST curves optimisation.
- */
--#define MBEDTLS_ECP_NIST_OPTIM
-+//#define MBEDTLS_ECP_NIST_OPTIM
-
- /**
- * \def MBEDTLS_ECDSA_DETERMINISTIC
-@@ -498,7 +498,7 @@
- * MBEDTLS_TLS_DHE_PSK_WITH_3DES_EDE_CBC_SHA
- * MBEDTLS_TLS_DHE_PSK_WITH_RC4_128_SHA
*/
-#define MBEDTLS_KEY_EXCHANGE_DHE_PSK_ENABLED
+//#define MBEDTLS_KEY_EXCHANGE_DHE_PSK_ENABLED
/**
* \def MBEDTLS_KEY_EXCHANGE_ECDHE_PSK_ENABLED
-@@ -543,7 +543,7 @@
+@@ -850,7 +850,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
+
+ /**
+ * \def MBEDTLS_KEY_EXCHANGE_RSA_PSK_ENABLED
+@@ -875,7 +875,7 @@
* MBEDTLS_TLS_RSA_PSK_WITH_3DES_EDE_CBC_SHA
* MBEDTLS_TLS_RSA_PSK_WITH_RC4_128_SHA
*/
/**
* \def MBEDTLS_KEY_EXCHANGE_RSA_ENABLED
-@@ -597,7 +597,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
-@@ -670,7 +670,7 @@
+@@ -1009,7 +1009,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
-@@ -694,7 +694,7 @@
+@@ -1033,7 +1033,7 @@
* MBEDTLS_TLS_ECDH_RSA_WITH_CAMELLIA_128_GCM_SHA256
* MBEDTLS_TLS_ECDH_RSA_WITH_CAMELLIA_256_GCM_SHA384
*/
+//#define MBEDTLS_KEY_EXCHANGE_ECDH_RSA_ENABLED
/**
- * \def MBEDTLS_PK_PARSE_EC_EXTENDED
-@@ -813,7 +813,7 @@
- *
- * Comment this macro to disable support for external private RSA keys.
+ * \def MBEDTLS_KEY_EXCHANGE_ECJPAKE_ENABLED
+@@ -1137,7 +1137,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
-@@ -845,14 +845,14 @@
+ * \def MBEDTLS_ENTROPY_NV_SEED
+@@ -1232,14 +1232,14 @@
* Uncomment this macro to disable the use of CRT in RSA.
*
*/
/**
* \def MBEDTLS_SHA256_SMALLER
-@@ -868,7 +868,7 @@
+@@ -1393,7 +1393,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_AEAD_RANDOM_IV
-@@ -1041,7 +1041,7 @@
+ * \def MBEDTLS_SSL_SRV_SUPPORT_SSLV2_CLIENT_HELLO
+@@ -1568,7 +1568,7 @@
*
- * Comment this macro to disable support for SSL 3.0
+ * Comment this macro to disable support for SSL session tickets
*/
--#define MBEDTLS_SSL_PROTO_SSL3
-+//#define MBEDTLS_SSL_PROTO_SSL3
+-#define MBEDTLS_SSL_SESSION_TICKETS
++//#define MBEDTLS_SSL_SESSION_TICKETS
/**
- * \def MBEDTLS_SSL_PROTO_TLS1
-@@ -1195,7 +1195,7 @@
+ * \def MBEDTLS_SSL_EXPORT_KEYS
+@@ -1598,7 +1598,7 @@
*
* Comment this macro to disable support for truncated HMAC in SSL
*/
+//#define MBEDTLS_SSL_TRUNCATED_HMAC
/**
- * \def MBEDTLS_THREADING_ALT
-@@ -1431,7 +1431,7 @@
- * MBEDTLS_TLS_RSA_PSK_WITH_RC4_128_SHA
- * MBEDTLS_TLS_PSK_WITH_RC4_128_SHA
- */
--#define MBEDTLS_ARC4_C
-+//#define MBEDTLS_ARC4_C
-
- /**
- * \def MBEDTLS_ASN1_PARSE_C
-@@ -1496,7 +1496,7 @@
+ * \def MBEDTLS_SSL_TRUNCATED_HMAC_COMPAT
+@@ -1657,7 +1657,7 @@
*
- * Module: library/blowfish.c
+ * Comment this to disable run-time checking and save ROM space
*/
--#define MBEDTLS_BLOWFISH_C
-+//#define MBEDTLS_BLOWFISH_C
+-#define MBEDTLS_VERSION_FEATURES
++//#define MBEDTLS_VERSION_FEATURES
/**
- * \def MBEDTLS_CAMELLIA_C
-@@ -1551,7 +1551,7 @@
+ * \def MBEDTLS_X509_ALLOW_EXTENSIONS_NON_V3
+@@ -1987,7 +1987,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
-@@ -1565,7 +1565,7 @@
+ * \def MBEDTLS_ARIA_C
+@@ -2053,7 +2053,7 @@
* This module enables the AES-CCM ciphersuites, if other requisites are
* enabled as well.
*/
/**
* \def MBEDTLS_CERTS_C
-@@ -1577,7 +1577,7 @@
+@@ -2065,7 +2065,7 @@
*
* This module is used for testing (ssl_client/server).
*/
+//#define MBEDTLS_CERTS_C
/**
- * \def MBEDTLS_CIPHER_C
-@@ -1617,7 +1617,7 @@
- *
- * This module provides debugging functions.
+ * \def MBEDTLS_CHACHA20_C
+@@ -2169,7 +2169,7 @@
+ * \warning DES is considered a weak cipher and its use constitutes a
+ * security risk. We recommend considering stronger ciphers instead.
*/
--#define MBEDTLS_DEBUG_C
-+//#define MBEDTLS_DEBUG_C
+-#define MBEDTLS_DES_C
++//#define MBEDTLS_DES_C
/**
- * \def MBEDTLS_DES_C
-@@ -1657,7 +1657,7 @@
- * This module is used by the following key exchanges:
- * DHE-RSA, DHE-PSK
+ * \def MBEDTLS_DHM_C
+@@ -2332,7 +2332,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
+@@ -2642,7 +2642,7 @@
+ *
+ * This module enables abstraction of common (libc) functions.
*/
--#define MBEDTLS_DHM_C
-+//#define MBEDTLS_DHM_C
+-#define MBEDTLS_PLATFORM_C
++//#define MBEDTLS_PLATFORM_C
/**
- * \def MBEDTLS_ECDH_C
-@@ -2047,7 +2047,7 @@
- * Caller: library/mbedtls_md.c
+ * \def MBEDTLS_POLY1305_C
+@@ -2663,7 +2663,7 @@
+ * Caller: library/md.c
*
*/
-#define MBEDTLS_RIPEMD160_C
/**
* \def MBEDTLS_RSA_C
-@@ -2345,7 +2345,7 @@
+@@ -2770,7 +2770,7 @@
+ *
+ * Requires: MBEDTLS_CIPHER_C
+ */
+-#define MBEDTLS_SSL_TICKET_C
++//#define MBEDTLS_SSL_TICKET_C
+
+ /**
+ * \def MBEDTLS_SSL_CLI_C
+@@ -2870,7 +2870,7 @@
+ *
+ * This module provides run-time version information.
+ */
+-#define MBEDTLS_VERSION_C
++//#define MBEDTLS_VERSION_C
+
+ /**
+ * \def MBEDTLS_X509_USE_C
+@@ -2980,7 +2980,7 @@
* Module: library/xtea.c
* Caller:
*/
projects / openwrt / openwrt.git / blobdiff