X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;ds=sidebyside;f=package%2Flibs%2Fmbedtls%2Fpatches%2F200-config.patch;h=8a98941c2a6aa7d113ddd0686177f8e4ef810d06;hb=f2c8f6dc3249b506b915741d12905402dfffe162;hp=8a3531f858abf21e916dd89faf912bf5e364be22;hpb=99ea26883bfc011a50902ec567fdb8d9f8b2f1ae;p=openwrt%2Fopenwrt.git diff --git a/package/libs/mbedtls/patches/200-config.patch b/package/libs/mbedtls/patches/200-config.patch index 8a3531f858..8a98941c2a 100644 --- a/package/libs/mbedtls/patches/200-config.patch +++ b/package/libs/mbedtls/patches/200-config.patch @@ -1,24 +1,6 @@ --- a/include/mbedtls/config.h +++ b/include/mbedtls/config.h -@@ -191,7 +191,7 @@ - * - * Uncomment to get errors on using deprecated functions. - */ --//#define MBEDTLS_DEPRECATED_REMOVED -+#define MBEDTLS_DEPRECATED_REMOVED - - /* \} name SECTION: System support */ - -@@ -347,7 +347,7 @@ - * - * Enable Cipher Feedback mode (CFB) for symmetric ciphers. - */ --#define MBEDTLS_CIPHER_MODE_CFB -+//#define MBEDTLS_CIPHER_MODE_CFB - - /** - * \def MBEDTLS_CIPHER_MODE_CTR -@@ -441,13 +441,13 @@ +@@ -599,19 +599,19 @@ * * Comment macros to disable the curve and functions for it */ @@ -28,24 +10,55 @@ +//#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 +@@ -635,8 +635,8 @@ + * Requires: MBEDTLS_HMAC_DRBG_C + * + * Comment this macro to disable deterministic ECDSA. +- */ + #define MBEDTLS_ECDSA_DETERMINISTIC ++ */ + + /** + * \def MBEDTLS_KEY_EXCHANGE_PSK_ENABLED +@@ -689,7 +689,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 @@ +@@ -708,8 +708,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 +@@ -734,7 +734,7 @@ * MBEDTLS_TLS_RSA_PSK_WITH_3DES_EDE_CBC_SHA * MBEDTLS_TLS_RSA_PSK_WITH_RC4_128_SHA */ @@ -54,16 +67,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 @@ +@@ -868,7 +868,7 @@ * MBEDTLS_TLS_ECDH_ECDSA_WITH_CAMELLIA_128_GCM_SHA256 * MBEDTLS_TLS_ECDH_ECDSA_WITH_CAMELLIA_256_GCM_SHA384 */ @@ -72,7 +76,7 @@ /** * \def MBEDTLS_KEY_EXCHANGE_ECDH_RSA_ENABLED -@@ -719,7 +719,7 @@ +@@ -892,7 +892,7 @@ * MBEDTLS_TLS_ECDH_RSA_WITH_CAMELLIA_128_GCM_SHA256 * MBEDTLS_TLS_ECDH_RSA_WITH_CAMELLIA_256_GCM_SHA384 */ @@ -81,16 +85,16 @@ /** * \def MBEDTLS_KEY_EXCHANGE_ECJPAKE_ENABLED -@@ -885,7 +885,7 @@ - * - * Comment this macro to disable support for external private RSA keys. +@@ -996,7 +996,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 +@@ -1091,14 +1091,14 @@ * Uncomment this macro to disable the use of CRT in RSA. * */ @@ -107,7 +111,7 @@ /** * \def MBEDTLS_SHA256_SMALLER -@@ -940,7 +940,7 @@ +@@ -1114,7 +1114,7 @@ * * Uncomment to enable the smaller implementation of SHA256. */ @@ -116,34 +120,45 @@ /** * \def MBEDTLS_SSL_ALL_ALERT_MESSAGES -@@ -1265,7 +1265,7 @@ +@@ -1241,7 +1241,7 @@ + * configuration of this extension). * - * Comment this macro to disable support for truncated HMAC in SSL */ --#define MBEDTLS_SSL_TRUNCATED_HMAC -+//#define MBEDTLS_SSL_TRUNCATED_HMAC +-#define MBEDTLS_SSL_RENEGOTIATION ++//#define MBEDTLS_SSL_RENEGOTIATION /** - * \def MBEDTLS_THREADING_ALT -@@ -1501,7 +1501,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_SSL_SRV_SUPPORT_SSLV2_CLIENT_HELLO +@@ -1415,8 +1415,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_ASN1_PARSE_C -@@ -1566,7 +1566,7 @@ + * \def MBEDTLS_SSL_EXPORT_KEYS +@@ -1446,7 +1446,7 @@ * - * Module: library/blowfish.c + * Comment this macro to disable support for truncated HMAC in SSL */ --#define MBEDTLS_BLOWFISH_C -+//#define MBEDTLS_BLOWFISH_C +-#define MBEDTLS_SSL_TRUNCATED_HMAC ++//#define MBEDTLS_SSL_TRUNCATED_HMAC + + /** + * \def MBEDTLS_SSL_TRUNCATED_HMAC_COMPAT +@@ -1504,8 +1504,8 @@ + * Requires: MBEDTLS_VERSION_C + * + * Comment this to disable run-time checking and save ROM space +- */ + #define MBEDTLS_VERSION_FEATURES ++ */ /** - * \def MBEDTLS_CAMELLIA_C -@@ -1621,7 +1621,7 @@ + * \def MBEDTLS_X509_ALLOW_EXTENSIONS_NON_V3 +@@ -1835,7 +1835,7 @@ * MBEDTLS_TLS_PSK_WITH_CAMELLIA_128_GCM_SHA256 * MBEDTLS_TLS_PSK_WITH_CAMELLIA_128_CBC_SHA256 */ @@ -152,7 +167,7 @@ /** * \def MBEDTLS_CCM_C -@@ -1635,7 +1635,7 @@ +@@ -1849,7 +1849,7 @@ * This module enables the AES-CCM ciphersuites, if other requisites are * enabled as well. */ @@ -161,7 +176,7 @@ /** * \def MBEDTLS_CERTS_C -@@ -1647,7 +1647,7 @@ +@@ -1861,7 +1861,7 @@ * * This module is used for testing (ssl_client/server). */ @@ -170,7 +185,7 @@ /** * \def MBEDTLS_CIPHER_C -@@ -1700,7 +1700,7 @@ +@@ -1914,7 +1914,7 @@ * * This module provides debugging functions. */ @@ -179,17 +194,27 @@ /** * \def MBEDTLS_DES_C -@@ -1740,7 +1740,7 @@ - * This module is used by the following key exchanges: - * DHE-RSA, DHE-PSK +@@ -1943,7 +1943,7 @@ + * \warning DES is considered a weak cipher and its use constitutes a + * security risk. We recommend considering stronger ciphers instead. */ --#define MBEDTLS_DHM_C -+//#define MBEDTLS_DHM_C +-#define MBEDTLS_DES_C ++//#define MBEDTLS_DES_C /** - * \def MBEDTLS_ECDH_C -@@ -2158,7 +2158,7 @@ - * Caller: library/mbedtls_md.c + * \def MBEDTLS_DHM_C +@@ -2104,8 +2104,8 @@ + * Requires: MBEDTLS_MD_C + * + * Uncomment to enable the HMAC_DRBG random number geerator. +- */ + #define MBEDTLS_HMAC_DRBG_C ++ */ + + /** + * \def MBEDTLS_MD_C +@@ -2399,7 +2399,7 @@ + * Caller: library/md.c * */ -#define MBEDTLS_RIPEMD160_C @@ -197,7 +222,27 @@ /** * \def MBEDTLS_RSA_C -@@ -2468,7 +2468,7 @@ +@@ -2505,8 +2505,8 @@ + * Caller: + * + * Requires: MBEDTLS_CIPHER_C +- */ + #define MBEDTLS_SSL_TICKET_C ++ */ + + /** + * \def MBEDTLS_SSL_CLI_C +@@ -2605,8 +2605,8 @@ + * Module: library/version.c + * + * This module provides run-time version information. +- */ + #define MBEDTLS_VERSION_C ++ */ + + /** + * \def MBEDTLS_X509_USE_C +@@ -2716,7 +2716,7 @@ * Module: library/xtea.c * Caller: */