armvirt: add kernel config change missing from 0d44f0cb

[openwrt/openwrt.git] / package / libs / polarssl / patches / 200-reduce_config.patch

diff --git a/package/libs/polarssl/patches/200-reduce_config.patch b/package/libs/polarssl/patches/200-reduce_config.patch
index 5d4b26aa55b9ceaf5a14a541a9b8281d68b648e7..491ecec3886084d07b319b6ef01bae2c1d5b25f7 100644 (file)
--- a/package/libs/polarssl/patches/200-reduce_config.patch
+++ b/package/libs/polarssl/patches/200-reduce_config.patch
@@ -1,8 +1,16 @@
-Index: polarssl-1.3.7/include/polarssl/config.h
-===================================================================
---- polarssl-1.3.7.orig/include/polarssl/config.h      2014-06-01 11:46:18.981400804 +0200
-+++ polarssl-1.3.7/include/polarssl/config.h   2014-06-01 11:46:18.977400804 +0200
-@@ -382,8 +382,8 @@
+--- a/include/polarssl/config.h
++++ b/include/polarssl/config.h
+@@ -432,8 +432,8 @@
+  * Requires: POLARSSL_HMAC_DRBG_C
+  *
+  * Comment this macro to disable deterministic ECDSA.
+- */
+ #define POLARSSL_ECDSA_DETERMINISTIC
++ */
+ 
+ /**
+  * \def POLARSSL_KEY_EXCHANGE_PSK_ENABLED
+@@ -454,8 +454,8 @@
   *      TLS_PSK_WITH_CAMELLIA_128_CBC_SHA256
   *      TLS_PSK_WITH_3DES_EDE_CBC_SHA
   *      TLS_PSK_WITH_RC4_128_SHA
@@ -12,7 +20,7 @@ Index: polarssl-1.3.7/include/polarssl/config.h
  
  /**
   * \def POLARSSL_KEY_EXCHANGE_DHE_PSK_ENABLED
-@@ -406,8 +406,8 @@
+@@ -478,8 +478,8 @@
   *      TLS_DHE_PSK_WITH_CAMELLIA_128_CBC_SHA256
   *      TLS_DHE_PSK_WITH_3DES_EDE_CBC_SHA
   *      TLS_DHE_PSK_WITH_RC4_128_SHA
@@ -22,7 +30,7 @@ Index: polarssl-1.3.7/include/polarssl/config.h
  
  /**
   * \def POLARSSL_KEY_EXCHANGE_ECDHE_PSK_ENABLED
-@@ -426,8 +426,8 @@
+@@ -498,8 +498,8 @@
   *      TLS_ECDHE_PSK_WITH_CAMELLIA_128_CBC_SHA256
   *      TLS_ECDHE_PSK_WITH_3DES_EDE_CBC_SHA
   *      TLS_ECDHE_PSK_WITH_RC4_128_SHA
@@ -32,7 +40,7 @@ Index: polarssl-1.3.7/include/polarssl/config.h
  
  /**
   * \def POLARSSL_KEY_EXCHANGE_RSA_PSK_ENABLED
-@@ -451,8 +451,8 @@
+@@ -523,8 +523,8 @@
   *      TLS_RSA_PSK_WITH_CAMELLIA_128_CBC_SHA256
   *      TLS_RSA_PSK_WITH_3DES_EDE_CBC_SHA
   *      TLS_RSA_PSK_WITH_RC4_128_SHA
@@ -42,7 +50,7 @@ Index: polarssl-1.3.7/include/polarssl/config.h
  
  /**
   * \def POLARSSL_KEY_EXCHANGE_RSA_ENABLED
-@@ -530,8 +530,8 @@
+@@ -602,8 +602,8 @@
   *      TLS_ECDHE_RSA_WITH_CAMELLIA_128_CBC_SHA256
   *      TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA
   *      TLS_ECDHE_RSA_WITH_RC4_128_SHA
@@ -52,7 +60,7 @@ Index: polarssl-1.3.7/include/polarssl/config.h
  
  /**
   * \def POLARSSL_KEY_EXCHANGE_ECDHE_ECDSA_ENABLED
-@@ -554,8 +554,8 @@
+@@ -626,8 +626,8 @@
   *      TLS_ECDHE_ECDSA_WITH_CAMELLIA_128_CBC_SHA256
   *      TLS_ECDHE_ECDSA_WITH_3DES_EDE_CBC_SHA
   *      TLS_ECDHE_ECDSA_WITH_RC4_128_SHA
@@ -62,7 +70,7 @@ Index: polarssl-1.3.7/include/polarssl/config.h
  
  /**
   * \def POLARSSL_KEY_EXCHANGE_ECDH_ECDSA_ENABLED
-@@ -578,8 +578,8 @@
+@@ -650,8 +650,8 @@
   *      TLS_ECDH_ECDSA_WITH_CAMELLIA_256_CBC_SHA384
   *      TLS_ECDH_ECDSA_WITH_CAMELLIA_128_GCM_SHA256
   *      TLS_ECDH_ECDSA_WITH_CAMELLIA_256_GCM_SHA384
@@ -72,7 +80,7 @@ Index: polarssl-1.3.7/include/polarssl/config.h
  
  /**
   * \def POLARSSL_KEY_EXCHANGE_ECDH_RSA_ENABLED
-@@ -602,8 +602,8 @@
+@@ -674,8 +674,8 @@
   *      TLS_ECDH_RSA_WITH_CAMELLIA_256_CBC_SHA384
   *      TLS_ECDH_RSA_WITH_CAMELLIA_128_GCM_SHA256
   *      TLS_ECDH_RSA_WITH_CAMELLIA_256_GCM_SHA384
@@ -82,7 +90,7 @@ Index: polarssl-1.3.7/include/polarssl/config.h
  
  /**
   * \def POLARSSL_PK_PARSE_EC_EXTENDED
-@@ -758,8 +758,8 @@
+@@ -835,8 +835,8 @@
   * \def POLARSSL_SELF_TEST
   *
   * Enable the checkup functions (*_self_test).
@@ -92,7 +100,17 @@ Index: polarssl-1.3.7/include/polarssl/config.h
  
  /**
   * \def POLARSSL_SSL_ALL_ALERT_MESSAGES
-@@ -1271,8 +1271,8 @@
+@@ -1139,8 +1139,8 @@
+  * Requires: POLARSSL_VERSION_C
+  *
+  * Comment this to disable run-time checking and save ROM space
+- */
+ #define POLARSSL_VERSION_FEATURES
++ */
+ 
+ /**
+  * \def POLARSSL_X509_ALLOW_EXTENSIONS_NON_V3
+@@ -1469,8 +1469,8 @@
   *      TLS_PSK_WITH_CAMELLIA_256_CBC_SHA384
   *      TLS_PSK_WITH_CAMELLIA_128_GCM_SHA256
   *      TLS_PSK_WITH_CAMELLIA_128_CBC_SHA256
@@ -101,8 +119,8 @@ Index: polarssl-1.3.7/include/polarssl/config.h
 + */
  
  /**
-  * \def POLARSSL_CERTS_C
-@@ -1285,8 +1285,8 @@
+  * \def POLARSSL_CCM_C
+@@ -1497,8 +1497,8 @@
   * Requires: POLARSSL_PEM_PARSE_C
   *
   * This module is used for testing (ssl_client/server).
@@ -112,7 +130,7 @@ Index: polarssl-1.3.7/include/polarssl/config.h
  
  /**
   * \def POLARSSL_CIPHER_C
-@@ -1325,8 +1325,8 @@
+@@ -1537,8 +1537,8 @@
   *          library/ssl_tls.c
   *
   * This module provides debugging functions.
@@ -122,7 +140,7 @@ Index: polarssl-1.3.7/include/polarssl/config.h
  
  /**
   * \def POLARSSL_DES_C
-@@ -1381,8 +1381,8 @@
+@@ -1593,8 +1593,8 @@
   *      ECDHE-ECDSA, ECDHE-RSA, DHE-PSK
   *
   * Requires: POLARSSL_ECP_C
@@ -132,7 +150,7 @@ Index: polarssl-1.3.7/include/polarssl/config.h
  
  /**
   * \def POLARSSL_ECDSA_C
-@@ -1396,8 +1396,8 @@
+@@ -1608,8 +1608,8 @@
   *      ECDHE-ECDSA
   *
   * Requires: POLARSSL_ECP_C, POLARSSL_ASN1_WRITE_C, POLARSSL_ASN1_PARSE_C
@@ -142,7 +160,7 @@ Index: polarssl-1.3.7/include/polarssl/config.h
  
  /**
   * \def POLARSSL_ECP_C
-@@ -1409,8 +1409,8 @@
+@@ -1621,8 +1621,8 @@
   *          library/ecdsa.c
   *
   * Requires: POLARSSL_BIGNUM_C and at least one POLARSSL_ECP_DP_XXX_ENABLED
@@ -152,17 +170,17 @@ Index: polarssl-1.3.7/include/polarssl/config.h
  
  /**
   * \def POLARSSL_ENTROPY_C
-@@ -1449,8 +1449,8 @@
+@@ -1698,8 +1698,8 @@
+  * Requires: POLARSSL_MD_C
   *
-  * This module enables the AES-GCM and CAMELLIA-GCM ciphersuites, if other
-  * requisites are enabled as well.
+  * Uncomment to enable the HMAC_DRBG random number geerator.
 - */
- #define POLARSSL_GCM_C
+ #define POLARSSL_HMAC_DRBG_C
 + */
  
  /**
-  * \def POLARSSL_HAVEGE_C
-@@ -1607,8 +1607,8 @@
+  * \def POLARSSL_MD_C
+@@ -1825,8 +1825,8 @@
   * Requires: POLARSSL_HAVE_ASM
   *
   * This modules adds support for the VIA PadLock on x86.
@@ -172,7 +190,7 @@ Index: polarssl-1.3.7/include/polarssl/config.h
  
  /**
   * \def POLARSSL_PBKDF2_C
-@@ -1768,8 +1768,8 @@
+@@ -1991,8 +1991,8 @@
   * Module:  library/ripemd160.c
   * Caller:  library/md.c
   *
@@ -182,7 +200,7 @@ Index: polarssl-1.3.7/include/polarssl/config.h
  
  /**
   * \def POLARSSL_RSA_C
-@@ -1848,8 +1848,8 @@
+@@ -2071,8 +2071,8 @@
   * Caller:
   *
   * Requires: POLARSSL_SSL_CACHE_C
@@ -192,7 +210,7 @@ Index: polarssl-1.3.7/include/polarssl/config.h
  
  /**
   * \def POLARSSL_SSL_CLI_C
-@@ -1925,8 +1925,8 @@
+@@ -2148,8 +2148,8 @@
   * Caller:  library/havege.c
   *
   * This module is used by the HAVEGE random number generator.
@@ -202,7 +220,17 @@ Index: polarssl-1.3.7/include/polarssl/config.h
  
  /**
   * \def POLARSSL_VERSION_C
-@@ -2046,8 +2046,8 @@
+@@ -2159,8 +2159,8 @@
+  * Module:  library/version.c
+  *
+  * This module provides run-time version information.
+- */
+ #define POLARSSL_VERSION_C
++ */
+ 
+ /**
+  * \def POLARSSL_X509_USE_C
+@@ -2269,8 +2269,8 @@
   *
   * Module:  library/xtea.c
   * Caller:
@@ -210,5 +238,5 @@ Index: polarssl-1.3.7/include/polarssl/config.h
  #define POLARSSL_XTEA_C
 + */
  
- /* \} name SECTION: PolarSSL modules */
+ /* \} name SECTION: mbed TLS modules */