From: Daniel Engberg <daniel.engberg.lists@pyret.net>
Date: Fri, 6 Jul 2018 13:45:06 +0000 (+0300)
Subject: mbedtls: cleanup config patch
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=f15f3286e3d1106bc24eb495757bb097377921e8;p=openwrt%2Fstaging%2Flinusw.git

mbedtls: cleanup config patch

Clean up patch, use "//" consistently.

Signed-off-by: Daniel Engberg <daniel.engberg.lists@pyret.net>
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---

diff --git a/package/libs/mbedtls/patches/200-config.patch b/package/libs/mbedtls/patches/200-config.patch
index 7bd0711e2c..2d622417bd 100644
--- a/package/libs/mbedtls/patches/200-config.patch
+++ b/package/libs/mbedtls/patches/200-config.patch
@@ -29,13 +29,12 @@
  
  /**
   * \def MBEDTLS_ECP_NIST_OPTIM
-@@ -635,8 +635,8 @@
-  * Requires: MBEDTLS_HMAC_DRBG_C
+@@ -636,7 +636,7 @@
   *
   * Comment this macro to disable deterministic ECDSA.
-- */
- #define MBEDTLS_ECDSA_DETERMINISTIC
-+ */
+  */
+-#define MBEDTLS_ECDSA_DETERMINISTIC
++//#define MBEDTLS_ECDSA_DETERMINISTIC
  
  /**
   * \def MBEDTLS_KEY_EXCHANGE_PSK_ENABLED
@@ -48,13 +47,12 @@
  
  /**
   * \def MBEDTLS_KEY_EXCHANGE_ECDHE_PSK_ENABLED
-@@ -708,8 +708,8 @@
-  *      MBEDTLS_TLS_ECDHE_PSK_WITH_CAMELLIA_128_CBC_SHA256
+@@ -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
++//#define MBEDTLS_KEY_EXCHANGE_ECDHE_PSK_ENABLED
  
  /**
   * \def MBEDTLS_KEY_EXCHANGE_RSA_PSK_ENABLED
@@ -129,13 +127,12 @@
  
  /**
   * \def MBEDTLS_SSL_SRV_SUPPORT_SSLV2_CLIENT_HELLO
-@@ -1415,8 +1415,8 @@
-  * callbacks are provided by MBEDTLS_SSL_TICKET_C.
+@@ -1416,7 +1416,7 @@
   *
   * Comment this macro to disable support for SSL session tickets
-- */
- #define MBEDTLS_SSL_SESSION_TICKETS
-+ */
+  */
+-#define MBEDTLS_SSL_SESSION_TICKETS
++//#define MBEDTLS_SSL_SESSION_TICKETS
  
  /**
   * \def MBEDTLS_SSL_EXPORT_KEYS
@@ -148,13 +145,12 @@
  
  /**
   * \def MBEDTLS_SSL_TRUNCATED_HMAC_COMPAT
-@@ -1504,8 +1504,8 @@
-  * Requires: MBEDTLS_VERSION_C
+@@ -1505,7 +1505,7 @@
   *
   * Comment this to disable run-time checking and save ROM space
-- */
- #define MBEDTLS_VERSION_FEATURES
-+ */
+  */
+-#define MBEDTLS_VERSION_FEATURES
++//#define MBEDTLS_VERSION_FEATURES
  
  /**
   * \def MBEDTLS_X509_ALLOW_EXTENSIONS_NON_V3
@@ -203,13 +199,12 @@
  
  /**
   * \def MBEDTLS_DHM_C
-@@ -2104,8 +2104,8 @@
-  * Requires: MBEDTLS_MD_C
+@@ -2105,7 +2105,7 @@
   *
   * Uncomment to enable the HMAC_DRBG random number geerator.
-- */
- #define MBEDTLS_HMAC_DRBG_C
-+ */
+  */
+-#define MBEDTLS_HMAC_DRBG_C
++//#define MBEDTLS_HMAC_DRBG_C
  
  /**
   * \def MBEDTLS_MD_C
@@ -231,23 +226,21 @@
  
  /**
   * \def MBEDTLS_RSA_C
-@@ -2505,8 +2505,8 @@
-  * Caller:
+@@ -2506,7 +2506,7 @@
   *
   * Requires: MBEDTLS_CIPHER_C
-- */
- #define MBEDTLS_SSL_TICKET_C
-+ */
+  */
+-#define MBEDTLS_SSL_TICKET_C
++//#define MBEDTLS_SSL_TICKET_C
  
  /**
   * \def MBEDTLS_SSL_CLI_C
-@@ -2605,8 +2605,8 @@
-  * Module:  library/version.c
+@@ -2606,7 +2606,7 @@
   *
   * This module provides run-time version information.
-- */
- #define MBEDTLS_VERSION_C
-+ */
+  */
+-#define MBEDTLS_VERSION_C
++//#define MBEDTLS_VERSION_C
  
  /**
   * \def MBEDTLS_X509_USE_C