X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=package%2Flibs%2Fmbedtls%2Fpatches%2F200-config.patch;h=ca4f4c7a32df50bfe5a94c254daa9ca2467cbe94;hb=e8f230251654edc43432c20f49ee33b67cabf6c9;hp=75d8342d3ea7e9ac98c023fffc5a9f9148468980;hpb=4b8c69258e5ff10178638f0503e59175e452a3df;p=openwrt%2Fstaging%2Fmkresin.git

diff --git a/package/libs/mbedtls/patches/200-config.patch b/package/libs/mbedtls/patches/200-config.patch
index 75d8342d3e..ca4f4c7a32 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
-@@ -191,7 +191,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 */
- 
-@@ -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
+@@ -696,19 +696,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
-@@ -523,7 +523,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
+@@ -810,7 +810,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
-@@ -568,7 +568,7 @@
+@@ -830,7 +830,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
+@@ -855,7 +855,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
-@@ -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 @@
+@@ -989,7 +989,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
-@@ -719,7 +719,7 @@
+@@ -1013,7 +1013,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
-@@ -885,7 +885,7 @@
-  *
-  * Comment this macro to disable support for external private RSA keys.
+@@ -1117,7 +1117,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
+@@ -1212,14 +1212,14 @@
   * Uncomment this macro to disable the use of CRT in RSA.
   *
   */
@@ -107,43 +117,43 @@
  
  /**
   * \def MBEDTLS_SHA256_SMALLER
-@@ -940,7 +940,7 @@
+@@ -1373,7 +1373,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
-@@ -1265,7 +1265,7 @@
+  * \def MBEDTLS_SSL_SRV_SUPPORT_SSLV2_CLIENT_HELLO
+@@ -1548,7 +1548,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
-@@ -1501,7 +1501,7 @@
-  *      MBEDTLS_TLS_RSA_PSK_WITH_RC4_128_SHA
-  *      MBEDTLS_TLS_PSK_WITH_RC4_128_SHA
+  * \def MBEDTLS_SSL_EXPORT_KEYS
+@@ -1578,7 +1578,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
-@@ -1566,7 +1566,7 @@
+  * \def MBEDTLS_SSL_TRUNCATED_HMAC_COMPAT
+@@ -1637,7 +1637,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
-@@ -1621,7 +1621,7 @@
+  * \def MBEDTLS_X509_ALLOW_EXTENSIONS_NON_V3
+@@ -1967,7 +1967,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
-@@ -1635,7 +1635,7 @@
+  * \def MBEDTLS_ARIA_C
+@@ -2033,7 +2033,7 @@
   * This module enables the AES-CCM ciphersuites, if other requisites are
   * enabled as well.
   */
@@ -161,7 +171,7 @@
  
  /**
   * \def MBEDTLS_CERTS_C
-@@ -1647,7 +1647,7 @@
+@@ -2045,7 +2045,7 @@
   *
   * This module is used for testing (ssl_client/server).
   */
@@ -169,8 +179,8 @@
 +//#define MBEDTLS_CERTS_C
  
  /**
-  * \def MBEDTLS_CIPHER_C
-@@ -1700,7 +1700,7 @@
+  * \def MBEDTLS_CHACHA20_C
+@@ -2120,7 +2120,7 @@
   *
   * This module provides debugging functions.
   */
@@ -179,8 +189,35 @@
  
  /**
   * \def MBEDTLS_DES_C
-@@ -2158,7 +2158,7 @@
-  * Caller:  library/mbedtls_md.c
+@@ -2149,7 +2149,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
+@@ -2312,7 +2312,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
+@@ -2622,7 +2622,7 @@
+  *
+  * This module enables abstraction of common (libc) functions.
+  */
+-#define MBEDTLS_PLATFORM_C
++//#define MBEDTLS_PLATFORM_C
+ 
+ /**
+  * \def MBEDTLS_POLY1305_C
+@@ -2643,7 +2643,7 @@
+  * Caller:  library/md.c
   *
   */
 -#define MBEDTLS_RIPEMD160_C
@@ -188,7 +225,25 @@
  
  /**
   * \def MBEDTLS_RSA_C
-@@ -2468,7 +2468,7 @@
+@@ -2750,7 +2750,7 @@
+  *
+  * Requires: MBEDTLS_CIPHER_C
+  */
+-#define MBEDTLS_SSL_TICKET_C
++//#define MBEDTLS_SSL_TICKET_C
+ 
+ /**
+  * \def MBEDTLS_SSL_CLI_C
+@@ -2850,7 +2850,7 @@
+  *
+  * This module provides run-time version information.
+  */
+-#define MBEDTLS_VERSION_C
++//#define MBEDTLS_VERSION_C
+ 
+ /**
+  * \def MBEDTLS_X509_USE_C
+@@ -2960,7 +2960,7 @@
   * Module:  library/xtea.c
   * Caller:
   */