--- a/include/mbedtls/config.h
+++ b/include/mbedtls/config.h
-@@ -185,7 +185,7 @@
+@@ -191,7 +191,7 @@
*
* Uncomment to get errors on using deprecated functions.
*/
/* \} name SECTION: System support */
-@@ -341,7 +341,7 @@
- *
- * Enable Cipher Feedback mode (CFB) for symmetric ciphers.
- */
--#define MBEDTLS_CIPHER_MODE_CFB
-+//#define MBEDTLS_CIPHER_MODE_CFB
-
- /**
- * \def MBEDTLS_CIPHER_MODE_CTR
-@@ -435,13 +435,13 @@
+@@ -441,17 +441,17 @@
*
* 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
-@@ -517,7 +517,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
+
+ /**
+@@ -476,8 +476,8 @@
+ * Requires: MBEDTLS_HMAC_DRBG_C
+ *
+ * Comment this macro to disable deterministic ECDSA.
+- */
+ #define MBEDTLS_ECDSA_DETERMINISTIC
++ */
+
+ /**
+ * \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_KEY_EXCHANGE_ECDHE_PSK_ENABLED
-@@ -562,7 +562,7 @@
+@@ -542,8 +542,8 @@
+ * MBEDTLS_TLS_ECDHE_PSK_WITH_CAMELLIA_128_CBC_SHA256
+ * MBEDTLS_TLS_ECDHE_PSK_WITH_3DES_EDE_CBC_SHA
+ * MBEDTLS_TLS_ECDHE_PSK_WITH_RC4_128_SHA
+- */
+ #define MBEDTLS_KEY_EXCHANGE_ECDHE_PSK_ENABLED
++ */
+
+ /**
+ * \def MBEDTLS_KEY_EXCHANGE_RSA_PSK_ENABLED
+@@ -568,7 +568,7 @@
* MBEDTLS_TLS_RSA_PSK_WITH_3DES_EDE_CBC_SHA
* MBEDTLS_TLS_RSA_PSK_WITH_RC4_128_SHA
*/
/**
* \def MBEDTLS_KEY_EXCHANGE_RSA_ENABLED
-@@ -616,7 +616,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
-@@ -689,7 +689,7 @@
+@@ -695,7 +695,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
-@@ -713,7 +713,7 @@
+@@ -719,7 +719,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
-@@ -879,7 +879,7 @@
- *
- * Comment this macro to disable support for external private RSA keys.
+@@ -823,7 +823,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
-@@ -911,14 +911,14 @@
+ * \def MBEDTLS_ENTROPY_NV_SEED
+@@ -917,14 +917,14 @@
* Uncomment this macro to disable the use of CRT in RSA.
*
*/
/**
* \def MBEDTLS_SHA256_SMALLER
-@@ -934,7 +934,7 @@
+@@ -940,7 +940,7 @@
*
* Uncomment to enable the smaller implementation of SHA256.
*/
+#define MBEDTLS_SHA256_SMALLER
/**
- * \def MBEDTLS_SSL_AEAD_RANDOM_IV
-@@ -1271,7 +1271,7 @@
+ * \def MBEDTLS_SSL_ALL_ALERT_MESSAGES
+@@ -1059,8 +1059,8 @@
+ * misuse/misunderstand.
+ *
+ * Comment this to disable support for renegotiation.
+- */
+ #define MBEDTLS_SSL_RENEGOTIATION
++ */
+
+ /**
+ * \def MBEDTLS_SSL_SRV_SUPPORT_SSLV2_CLIENT_HELLO
+@@ -1234,8 +1234,8 @@
+ * callbacks are provided by MBEDTLS_SSL_TICKET_C.
+ *
+ * Comment this macro to disable support for SSL session tickets
+- */
+ #define MBEDTLS_SSL_SESSION_TICKETS
++ */
+
+ /**
+ * \def MBEDTLS_SSL_EXPORT_KEYS
+@@ -1265,7 +1265,7 @@
*
* Comment this macro to disable support for truncated HMAC in SSL
*/
/**
* \def MBEDTLS_THREADING_ALT
-@@ -1507,7 +1507,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
-@@ -1572,7 +1572,7 @@
+@@ -1299,8 +1299,8 @@
+ * Requires: MBEDTLS_VERSION_C
*
- * Module: library/blowfish.c
- */
--#define MBEDTLS_BLOWFISH_C
-+//#define MBEDTLS_BLOWFISH_C
+ * Comment this to disable run-time checking and save ROM space
+- */
+ #define MBEDTLS_VERSION_FEATURES
++ */
/**
- * \def MBEDTLS_CAMELLIA_C
-@@ -1627,7 +1627,7 @@
+ * \def MBEDTLS_X509_ALLOW_EXTENSIONS_NON_V3
+@@ -1621,7 +1621,7 @@
* MBEDTLS_TLS_PSK_WITH_CAMELLIA_128_GCM_SHA256
* MBEDTLS_TLS_PSK_WITH_CAMELLIA_128_CBC_SHA256
*/
/**
* \def MBEDTLS_CCM_C
-@@ -1641,7 +1641,7 @@
+@@ -1635,7 +1635,7 @@
* This module enables the AES-CCM ciphersuites, if other requisites are
* enabled as well.
*/
/**
* \def MBEDTLS_CERTS_C
-@@ -1653,7 +1653,7 @@
+@@ -1647,7 +1647,7 @@
*
* This module is used for testing (ssl_client/server).
*/
/**
* \def MBEDTLS_CIPHER_C
-@@ -1693,7 +1693,7 @@
+@@ -1700,7 +1700,7 @@
*
* This module provides debugging functions.
*/
/**
* \def MBEDTLS_DES_C
-@@ -1733,7 +1733,7 @@
- * This module is used by the following key exchanges:
- * DHE-RSA, DHE-PSK
- */
--#define MBEDTLS_DHM_C
-+//#define MBEDTLS_DHM_C
+@@ -1725,8 +1725,8 @@
+ * MBEDTLS_TLS_PSK_WITH_3DES_EDE_CBC_SHA
+ *
+ * PEM_PARSE uses DES/3DES for decrypting encrypted keys.
+- */
+ #define MBEDTLS_DES_C
++ */
/**
- * \def MBEDTLS_ECDH_C
-@@ -2151,7 +2151,7 @@
+ * \def MBEDTLS_DHM_C
+@@ -1880,8 +1880,8 @@
+ * Requires: MBEDTLS_MD_C
+ *
+ * Uncomment to enable the HMAC_DRBG random number geerator.
+- */
+ #define MBEDTLS_HMAC_DRBG_C
++ */
+
+ /**
+ * \def MBEDTLS_MD_C
+@@ -2158,7 +2158,7 @@
* Caller: library/mbedtls_md.c
*
*/
/**
* \def MBEDTLS_RSA_C
-@@ -2461,7 +2461,7 @@
+@@ -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:
+ *
+ * Requires: MBEDTLS_CIPHER_C
+- */
+ #define MBEDTLS_SSL_TICKET_C
++ */
+
+ /**
+ * \def MBEDTLS_SSL_CLI_C
+@@ -2357,8 +2357,8 @@
+ * Module: library/version.c
+ *
+ * This module provides run-time version information.
+- */
+ #define MBEDTLS_VERSION_C
++ */
+
+ /**
+ * \def MBEDTLS_X509_USE_C
+@@ -2468,7 +2468,7 @@
* Module: library/xtea.c
* Caller:
*/
projects / openwrt / staging / yousong.git / blobdiff