mirror of
https://git.openwrt.org/openwrt/openwrt.git
synced 2024-10-20 06:28:12 +02:00
f3870546a5
Changelog: https://github.com/Mbed-TLS/mbedtls/releases/tag/v2.28.1 This release of Mbed TLS provides bug fixes and minor enhancements. This release includes fixes for security issues. The build problem was reported upstream: https://github.com/Mbed-TLS/mbedtls/issues/6243 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
229 lines
5.9 KiB
Diff
229 lines
5.9 KiB
Diff
--- a/include/mbedtls/config.h
|
|
+++ b/include/mbedtls/config.h
|
|
@@ -670,14 +670,14 @@
|
|
*
|
|
* Enable Output Feedback mode (OFB) for symmetric ciphers.
|
|
*/
|
|
-#define MBEDTLS_CIPHER_MODE_OFB
|
|
+//#define MBEDTLS_CIPHER_MODE_OFB
|
|
|
|
/**
|
|
* \def MBEDTLS_CIPHER_MODE_XTS
|
|
*
|
|
* Enable Xor-encrypt-xor with ciphertext stealing mode (XTS) for AES.
|
|
*/
|
|
-#define MBEDTLS_CIPHER_MODE_XTS
|
|
+//#define MBEDTLS_CIPHER_MODE_XTS
|
|
|
|
/**
|
|
* \def MBEDTLS_CIPHER_NULL_CIPHER
|
|
@@ -795,20 +795,20 @@
|
|
* Comment macros to disable the curve and functions for it
|
|
*/
|
|
/* Short Weierstrass curves (supporting ECP, ECDH, ECDSA) */
|
|
-#define MBEDTLS_ECP_DP_SECP192R1_ENABLED
|
|
-#define MBEDTLS_ECP_DP_SECP224R1_ENABLED
|
|
+//#define MBEDTLS_ECP_DP_SECP192R1_ENABLED
|
|
+//#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_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
|
|
-#define MBEDTLS_ECP_DP_BP512R1_ENABLED
|
|
+//#define MBEDTLS_ECP_DP_BP256R1_ENABLED
|
|
+//#define MBEDTLS_ECP_DP_BP384R1_ENABLED
|
|
+//#define MBEDTLS_ECP_DP_BP512R1_ENABLED
|
|
/* Montgomery curves (supporting ECP) */
|
|
#define MBEDTLS_ECP_DP_CURVE25519_ENABLED
|
|
-#define MBEDTLS_ECP_DP_CURVE448_ENABLED
|
|
+//#define MBEDTLS_ECP_DP_CURVE448_ENABLED
|
|
|
|
/**
|
|
* \def MBEDTLS_ECP_NIST_OPTIM
|
|
@@ -961,7 +961,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
|
|
@@ -981,7 +981,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
|
|
@@ -1006,7 +1006,7 @@
|
|
* MBEDTLS_TLS_RSA_PSK_WITH_3DES_EDE_CBC_SHA
|
|
* MBEDTLS_TLS_RSA_PSK_WITH_RC4_128_SHA
|
|
*/
|
|
-#define MBEDTLS_KEY_EXCHANGE_RSA_PSK_ENABLED
|
|
+//#define MBEDTLS_KEY_EXCHANGE_RSA_PSK_ENABLED
|
|
|
|
/**
|
|
* \def MBEDTLS_KEY_EXCHANGE_RSA_ENABLED
|
|
@@ -1140,7 +1140,7 @@
|
|
* MBEDTLS_TLS_ECDH_ECDSA_WITH_CAMELLIA_128_GCM_SHA256
|
|
* MBEDTLS_TLS_ECDH_ECDSA_WITH_CAMELLIA_256_GCM_SHA384
|
|
*/
|
|
-#define MBEDTLS_KEY_EXCHANGE_ECDH_ECDSA_ENABLED
|
|
+//#define MBEDTLS_KEY_EXCHANGE_ECDH_ECDSA_ENABLED
|
|
|
|
/**
|
|
* \def MBEDTLS_KEY_EXCHANGE_ECDH_RSA_ENABLED
|
|
@@ -1164,7 +1164,7 @@
|
|
* MBEDTLS_TLS_ECDH_RSA_WITH_CAMELLIA_128_GCM_SHA256
|
|
* MBEDTLS_TLS_ECDH_RSA_WITH_CAMELLIA_256_GCM_SHA384
|
|
*/
|
|
-#define MBEDTLS_KEY_EXCHANGE_ECDH_RSA_ENABLED
|
|
+//#define MBEDTLS_KEY_EXCHANGE_ECDH_RSA_ENABLED
|
|
|
|
/**
|
|
* \def MBEDTLS_KEY_EXCHANGE_ECJPAKE_ENABLED
|
|
@@ -1268,7 +1268,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_ENTROPY_FORCE_SHA256
|
|
+#define MBEDTLS_ENTROPY_FORCE_SHA256
|
|
|
|
/**
|
|
* \def MBEDTLS_ENTROPY_NV_SEED
|
|
@@ -1483,14 +1483,14 @@
|
|
* Uncomment this macro to disable the use of CRT in RSA.
|
|
*
|
|
*/
|
|
-//#define MBEDTLS_RSA_NO_CRT
|
|
+#define MBEDTLS_RSA_NO_CRT
|
|
|
|
/**
|
|
* \def MBEDTLS_SELF_TEST
|
|
*
|
|
* Enable the checkup functions (*_self_test).
|
|
*/
|
|
-#define MBEDTLS_SELF_TEST
|
|
+//#define MBEDTLS_SELF_TEST
|
|
|
|
/**
|
|
* \def MBEDTLS_SHA256_SMALLER
|
|
@@ -1761,7 +1761,7 @@
|
|
* configuration of this extension).
|
|
*
|
|
*/
|
|
-#define MBEDTLS_SSL_RENEGOTIATION
|
|
+//#define MBEDTLS_SSL_RENEGOTIATION
|
|
|
|
/**
|
|
* \def MBEDTLS_SSL_SRV_SUPPORT_SSLV2_CLIENT_HELLO
|
|
@@ -2022,7 +2022,7 @@
|
|
*
|
|
* Comment this macro to disable support for truncated HMAC in SSL
|
|
*/
|
|
-#define MBEDTLS_SSL_TRUNCATED_HMAC
|
|
+//#define MBEDTLS_SSL_TRUNCATED_HMAC
|
|
|
|
/**
|
|
* \def MBEDTLS_SSL_TRUNCATED_HMAC_COMPAT
|
|
@@ -2201,7 +2201,7 @@
|
|
*
|
|
* Comment this to disable run-time checking and save ROM space
|
|
*/
|
|
-#define MBEDTLS_VERSION_FEATURES
|
|
+//#define MBEDTLS_VERSION_FEATURES
|
|
|
|
/**
|
|
* \def MBEDTLS_X509_ALLOW_EXTENSIONS_NON_V3
|
|
@@ -2550,7 +2550,7 @@
|
|
* MBEDTLS_TLS_PSK_WITH_CAMELLIA_128_GCM_SHA256
|
|
* MBEDTLS_TLS_PSK_WITH_CAMELLIA_128_CBC_SHA256
|
|
*/
|
|
-#define MBEDTLS_CAMELLIA_C
|
|
+//#define MBEDTLS_CAMELLIA_C
|
|
|
|
/**
|
|
* \def MBEDTLS_ARIA_C
|
|
@@ -2616,7 +2616,7 @@
|
|
* This module enables the AES-CCM ciphersuites, if other requisites are
|
|
* enabled as well.
|
|
*/
|
|
-#define MBEDTLS_CCM_C
|
|
+//#define MBEDTLS_CCM_C
|
|
|
|
/**
|
|
* \def MBEDTLS_CERTS_C
|
|
@@ -2628,7 +2628,7 @@
|
|
*
|
|
* This module is used for testing (ssl_client/server).
|
|
*/
|
|
-#define MBEDTLS_CERTS_C
|
|
+//#define MBEDTLS_CERTS_C
|
|
|
|
/**
|
|
* \def MBEDTLS_CHACHA20_C
|
|
@@ -2741,7 +2741,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
|
|
@@ -2906,7 +2906,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
|
|
@@ -3219,7 +3219,7 @@
|
|
*
|
|
* This module enables abstraction of common (libc) functions.
|
|
*/
|
|
-#define MBEDTLS_PLATFORM_C
|
|
+//#define MBEDTLS_PLATFORM_C
|
|
|
|
/**
|
|
* \def MBEDTLS_POLY1305_C
|
|
@@ -3295,7 +3295,7 @@
|
|
* Caller: library/md.c
|
|
*
|
|
*/
|
|
-#define MBEDTLS_RIPEMD160_C
|
|
+//#define MBEDTLS_RIPEMD160_C
|
|
|
|
/**
|
|
* \def MBEDTLS_RSA_C
|
|
@@ -3506,7 +3506,7 @@
|
|
*
|
|
* This module provides run-time version information.
|
|
*/
|
|
-#define MBEDTLS_VERSION_C
|
|
+//#define MBEDTLS_VERSION_C
|
|
|
|
/**
|
|
* \def MBEDTLS_X509_USE_C
|
|
@@ -3616,7 +3616,7 @@
|
|
* Module: library/xtea.c
|
|
* Caller:
|
|
*/
|
|
-#define MBEDTLS_XTEA_C
|
|
+//#define MBEDTLS_XTEA_C
|
|
|
|
/** \} name SECTION: mbed TLS modules */
|
|
|