--- a/include/mbedtls/config.h
+++ b/include/mbedtls/config.h
-@@ -181,7 +181,7 @@
- *
- * Uncomment to get errors on using deprecated functions.
- */
--//#define MBEDTLS_DEPRECATED_REMOVED
-+#define MBEDTLS_DEPRECATED_REMOVED
-
- /* \} name SECTION: System support */
-
-@@ -320,7 +320,7 @@
- *
- * Enable Cipher Feedback mode (CFB) for symmetric ciphers.
- */
--#define MBEDTLS_CIPHER_MODE_CFB
-+//#define MBEDTLS_CIPHER_MODE_CFB
-
- /**
- * \def MBEDTLS_CIPHER_MODE_CTR
-@@ -413,13 +413,13 @@
+@@ -599,19 +599,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
-@@ -435,7 +435,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
+@@ -636,7 +636,7 @@
*
- * Comment this macro to disable NIST curves optimisation.
+ * Comment this macro to disable deterministic ECDSA.
*/
--#define MBEDTLS_ECP_NIST_OPTIM
-+//#define MBEDTLS_ECP_NIST_OPTIM
+-#define MBEDTLS_ECDSA_DETERMINISTIC
++//#define MBEDTLS_ECDSA_DETERMINISTIC
/**
- * \def MBEDTLS_ECDSA_DETERMINISTIC
-@@ -443,7 +443,7 @@
- * Enable deterministic ECDSA (RFC 6979).
- * Standard ECDSA is "fragile" in the sense that lack of entropy when signing
- * may result in a compromise of the long-term signing key. This is avoided by
-- * the deterministic variant.
-+ DH * the deterministic variant.
- *
- * Requires: MBEDTLS_HMAC_DRBG_C
+ * \def MBEDTLS_KEY_EXCHANGE_PSK_ENABLED
+@@ -689,7 +689,7 @@
+ * See dhm.h for more details.
*
-@@ -495,7 +495,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
-@@ -540,7 +540,7 @@
+@@ -709,7 +709,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
+@@ -734,7 +734,7 @@
* MBEDTLS_TLS_RSA_PSK_WITH_3DES_EDE_CBC_SHA
* MBEDTLS_TLS_RSA_PSK_WITH_RC4_128_SHA
*/
/**
* \def MBEDTLS_KEY_EXCHANGE_RSA_ENABLED
-@@ -594,7 +594,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
-@@ -667,7 +667,7 @@
+@@ -868,7 +868,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
-@@ -691,7 +691,7 @@
+@@ -892,7 +892,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
-@@ -810,7 +810,7 @@
- *
- * Comment this macro to disable support for external private RSA keys.
+ * \def MBEDTLS_KEY_EXCHANGE_ECJPAKE_ENABLED
+@@ -996,7 +996,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
-@@ -842,14 +842,14 @@
+ * \def MBEDTLS_ENTROPY_NV_SEED
+@@ -1091,14 +1091,14 @@
* Uncomment this macro to disable the use of CRT in RSA.
*
*/
/**
* \def MBEDTLS_SHA256_SMALLER
-@@ -865,7 +865,7 @@
+@@ -1114,7 +1114,7 @@
*
* Uncomment to enable the smaller implementation of SHA256.
*/
+#define MBEDTLS_SHA256_SMALLER
/**
- * \def MBEDTLS_SSL_AEAD_RANDOM_IV
-@@ -1038,7 +1038,7 @@
+ * \def MBEDTLS_SSL_ALL_ALERT_MESSAGES
+@@ -1241,7 +1241,7 @@
+ * configuration of this extension).
*
- * Comment this macro to disable support for SSL 3.0
*/
--#define MBEDTLS_SSL_PROTO_SSL3
-+//#define MBEDTLS_SSL_PROTO_SSL3
+-#define MBEDTLS_SSL_RENEGOTIATION
++//#define MBEDTLS_SSL_RENEGOTIATION
/**
- * \def MBEDTLS_SSL_PROTO_TLS1
-@@ -1176,7 +1176,7 @@
+ * \def MBEDTLS_SSL_SRV_SUPPORT_SSLV2_CLIENT_HELLO
+@@ -1416,7 +1416,7 @@
*
- * Comment this macro to disable support for truncated HMAC in SSL
+ * Comment this macro to disable support for SSL session tickets
*/
--#define MBEDTLS_SSL_TRUNCATED_HMAC
-+//#define MBEDTLS_SSL_TRUNCATED_HMAC
+-#define MBEDTLS_SSL_SESSION_TICKETS
++//#define MBEDTLS_SSL_SESSION_TICKETS
/**
- * \def MBEDTLS_THREADING_ALT
-@@ -1410,7 +1410,7 @@
- * MBEDTLS_TLS_RSA_PSK_WITH_RC4_128_SHA
- * MBEDTLS_TLS_PSK_WITH_RC4_128_SHA
+ * \def MBEDTLS_SSL_EXPORT_KEYS
+@@ -1446,7 +1446,7 @@
+ *
+ * Comment this macro to disable support for truncated HMAC in SSL
*/
--#define MBEDTLS_ARC4_C
-+//#define MBEDTLS_ARC4_C
+-#define MBEDTLS_SSL_TRUNCATED_HMAC
++//#define MBEDTLS_SSL_TRUNCATED_HMAC
/**
- * \def MBEDTLS_ASN1_PARSE_C
-@@ -1475,7 +1475,7 @@
+ * \def MBEDTLS_SSL_TRUNCATED_HMAC_COMPAT
+@@ -1505,7 +1505,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
-@@ -1530,7 +1530,7 @@
+ * \def MBEDTLS_X509_ALLOW_EXTENSIONS_NON_V3
+@@ -1835,7 +1835,7 @@
* MBEDTLS_TLS_PSK_WITH_CAMELLIA_128_GCM_SHA256
* MBEDTLS_TLS_PSK_WITH_CAMELLIA_128_CBC_SHA256
*/
/**
* \def MBEDTLS_CCM_C
-@@ -1544,7 +1544,7 @@
+@@ -1849,7 +1849,7 @@
* This module enables the AES-CCM ciphersuites, if other requisites are
* enabled as well.
*/
/**
* \def MBEDTLS_CERTS_C
-@@ -1556,7 +1556,7 @@
+@@ -1861,7 +1861,7 @@
*
* This module is used for testing (ssl_client/server).
*/
/**
* \def MBEDTLS_CIPHER_C
-@@ -1596,7 +1596,7 @@
+@@ -1914,7 +1914,7 @@
*
* This module provides debugging functions.
*/
/**
* \def MBEDTLS_DES_C
-@@ -1636,7 +1636,7 @@
- * This module is used by the following key exchanges:
- * DHE-RSA, DHE-PSK
+@@ -1943,7 +1943,7 @@
+ * \warning DES is considered a weak cipher and its use constitutes a
+ * security risk. We recommend considering stronger ciphers instead.
*/
--#define MBEDTLS_DHM_C
-+//#define MBEDTLS_DHM_C
+-#define MBEDTLS_DES_C
++//#define MBEDTLS_DES_C
/**
- * \def MBEDTLS_ECDH_C
-@@ -2026,7 +2026,7 @@
- * Caller: library/mbedtls_md.c
+ * \def MBEDTLS_DHM_C
+@@ -2105,7 +2105,7 @@
+ *
+ * Uncomment to enable the HMAC_DRBG random number geerator.
+ */
+-#define MBEDTLS_HMAC_DRBG_C
++//#define MBEDTLS_HMAC_DRBG_C
+
+ /**
+ * \def MBEDTLS_MD_C
+@@ -2388,7 +2388,7 @@
+ *
+ * This module enables abstraction of common (libc) functions.
+ */
+-#define MBEDTLS_PLATFORM_C
++//#define MBEDTLS_PLATFORM_C
+
+ /**
+ * \def MBEDTLS_RIPEMD160_C
+@@ -2399,7 +2399,7 @@
+ * Caller: library/md.c
*
*/
-#define MBEDTLS_RIPEMD160_C
/**
* \def MBEDTLS_RSA_C
-@@ -2324,7 +2324,7 @@
+@@ -2506,7 +2506,7 @@
+ *
+ * Requires: MBEDTLS_CIPHER_C
+ */
+-#define MBEDTLS_SSL_TICKET_C
++//#define MBEDTLS_SSL_TICKET_C
+
+ /**
+ * \def MBEDTLS_SSL_CLI_C
+@@ -2606,7 +2606,7 @@
+ *
+ * This module provides run-time version information.
+ */
+-#define MBEDTLS_VERSION_C
++//#define MBEDTLS_VERSION_C
+
+ /**
+ * \def MBEDTLS_X509_USE_C
+@@ -2716,7 +2716,7 @@
* Module: library/xtea.c
* Caller:
*/
projects / openwrt / openwrt.git / blobdiff