X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=package%2Flibs%2Fmbedtls%2Fpatches%2F200-config.patch;h=d925ee3750c8f420c1fb4cd28a951648eee4af79;hb=b19622044d492e9eff9d880d6bc1fc9486774886;hp=54910b95a27295d888a8da2c8b7d5cc01e5cb10e;hpb=c5e48abcc6c09d5f2d55c63985a769c74d245a08;p=openwrt%2Fopenwrt.git

diff --git a/package/libs/mbedtls/patches/200-config.patch b/package/libs/mbedtls/patches/200-config.patch
index 54910b95a2..d925ee3750 100644
--- a/package/libs/mbedtls/patches/200-config.patch
+++ b/package/libs/mbedtls/patches/200-config.patch
@@ -1,24 +1,23 @@
 --- a/include/mbedtls/config.h
 +++ b/include/mbedtls/config.h
-@@ -185,7 +185,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 */
- 
-@@ -341,7 +341,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
-@@ -435,13 +435,13 @@
+  * \def MBEDTLS_CIPHER_NULL_CIPHER
+@@ -619,19 +619,19 @@
   *
   * Comment macros to disable the curve and functions for it
   */
@@ -28,24 +27,44 @@
 +//#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 @@
-  *      MBEDTLS_TLS_DHE_PSK_WITH_3DES_EDE_CBC_SHA
-  *      MBEDTLS_TLS_DHE_PSK_WITH_RC4_128_SHA
+-#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
+@@ -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
-@@ -562,7 +562,7 @@
+@@ -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
+ 
+ /**
+  * \def MBEDTLS_KEY_EXCHANGE_RSA_PSK_ENABLED
+@@ -754,7 +754,7 @@
   *      MBEDTLS_TLS_RSA_PSK_WITH_3DES_EDE_CBC_SHA
   *      MBEDTLS_TLS_RSA_PSK_WITH_RC4_128_SHA
   */
@@ -54,16 +73,7 @@
  
  /**
   * \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 @@
+@@ -888,7 +888,7 @@
   *      MBEDTLS_TLS_ECDH_ECDSA_WITH_CAMELLIA_128_GCM_SHA256
   *      MBEDTLS_TLS_ECDH_ECDSA_WITH_CAMELLIA_256_GCM_SHA384
   */
@@ -72,7 +82,7 @@
  
  /**
   * \def MBEDTLS_KEY_EXCHANGE_ECDH_RSA_ENABLED
-@@ -713,7 +713,7 @@
+@@ -912,7 +912,7 @@
   *      MBEDTLS_TLS_ECDH_RSA_WITH_CAMELLIA_128_GCM_SHA256
   *      MBEDTLS_TLS_ECDH_RSA_WITH_CAMELLIA_256_GCM_SHA384
   */
@@ -81,16 +91,16 @@
  
  /**
   * \def MBEDTLS_KEY_EXCHANGE_ECJPAKE_ENABLED
-@@ -879,7 +879,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
-@@ -911,14 +911,14 @@
+  * \def MBEDTLS_ENTROPY_NV_SEED
+@@ -1111,14 +1111,14 @@
   * Uncomment this macro to disable the use of CRT in RSA.
   *
   */
@@ -107,43 +117,43 @@
  
  /**
   * \def MBEDTLS_SHA256_SMALLER
-@@ -934,7 +934,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_AEAD_RANDOM_IV
-@@ -1271,7 +1271,7 @@
+  * \def MBEDTLS_SSL_SRV_SUPPORT_SSLV2_CLIENT_HELLO
+@@ -1447,7 +1447,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
-@@ -1507,7 +1507,7 @@
-  *      MBEDTLS_TLS_RSA_PSK_WITH_RC4_128_SHA
-  *      MBEDTLS_TLS_PSK_WITH_RC4_128_SHA
+  * \def MBEDTLS_SSL_EXPORT_KEYS
+@@ -1477,7 +1477,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
-@@ -1572,7 +1572,7 @@
+  * \def MBEDTLS_SSL_TRUNCATED_HMAC_COMPAT
+@@ -1536,7 +1536,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
-@@ -1627,7 +1627,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
   */
@@ -151,8 +161,8 @@
 +//#define MBEDTLS_CAMELLIA_C
  
  /**
-  * \def MBEDTLS_CCM_C
-@@ -1641,7 +1641,7 @@
+  * \def MBEDTLS_ARIA_C
+@@ -1932,7 +1932,7 @@
   * This module enables the AES-CCM ciphersuites, if other requisites are
   * enabled as well.
   */
@@ -161,7 +171,7 @@
  
  /**
   * \def MBEDTLS_CERTS_C
-@@ -1653,7 +1653,7 @@
+@@ -1944,7 +1944,7 @@
   *
   * This module is used for testing (ssl_client/server).
   */
@@ -170,7 +180,7 @@
  
  /**
   * \def MBEDTLS_CIPHER_C
-@@ -1693,7 +1693,7 @@
+@@ -1997,7 +1997,7 @@
   *
   * This module provides debugging functions.
   */
@@ -179,17 +189,35 @@
  
  /**
   * \def MBEDTLS_DES_C
-@@ -1733,7 +1733,7 @@
-  * This module is used by the following key exchanges:
-  *      DHE-RSA, DHE-PSK
+@@ -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 @@
+  *
+  * 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
-@@ -2151,7 +2151,7 @@
-  * Caller:  library/mbedtls_md.c
+  * \def MBEDTLS_RIPEMD160_C
+@@ -2497,7 +2497,7 @@
+  * Caller:  library/md.c
   *
   */
 -#define MBEDTLS_RIPEMD160_C
@@ -197,7 +225,25 @@
  
  /**
   * \def MBEDTLS_RSA_C
-@@ -2461,7 +2461,7 @@
+@@ -2604,7 +2604,7 @@
+  *
+  * Requires: MBEDTLS_CIPHER_C
+  */
+-#define MBEDTLS_SSL_TICKET_C
++//#define MBEDTLS_SSL_TICKET_C
+ 
+ /**
+  * \def MBEDTLS_SSL_CLI_C
+@@ -2704,7 +2704,7 @@
+  *
+  * This module provides run-time version information.
+  */
+-#define MBEDTLS_VERSION_C
++//#define MBEDTLS_VERSION_C
+ 
+ /**
+  * \def MBEDTLS_X509_USE_C
+@@ -2814,7 +2814,7 @@
   * Module:  library/xtea.c
   * Caller:
   */