43d397d7d6
This fixes CVE-2015-5291 and some other smaller security issues. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> SVN-Revision: 47200
226 lines
5.4 KiB
Diff
226 lines
5.4 KiB
Diff
--- a/include/mbedtls/config.h
|
|
+++ b/include/mbedtls/config.h
|
|
@@ -184,7 +184,7 @@
|
|
*
|
|
* Uncomment to get errors on using deprecated functions.
|
|
*/
|
|
-//#define MBEDTLS_DEPRECATED_REMOVED
|
|
+#define MBEDTLS_DEPRECATED_REMOVED
|
|
|
|
/* \} name SECTION: System support */
|
|
|
|
@@ -323,7 +323,7 @@
|
|
*
|
|
* Enable Cipher Feedback mode (CFB) for symmetric ciphers.
|
|
*/
|
|
-#define MBEDTLS_CIPHER_MODE_CFB
|
|
+//#define MBEDTLS_CIPHER_MODE_CFB
|
|
|
|
/**
|
|
* \def MBEDTLS_CIPHER_MODE_CTR
|
|
@@ -416,13 +416,13 @@
|
|
*
|
|
* Comment macros to disable the curve and functions for it
|
|
*/
|
|
-#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_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
|
|
@@ -438,7 +438,7 @@
|
|
*
|
|
* Comment this macro to disable NIST curves optimisation.
|
|
*/
|
|
-#define MBEDTLS_ECP_NIST_OPTIM
|
|
+//#define MBEDTLS_ECP_NIST_OPTIM
|
|
|
|
/**
|
|
* \def MBEDTLS_ECDSA_DETERMINISTIC
|
|
@@ -498,7 +498,7 @@
|
|
* MBEDTLS_TLS_DHE_PSK_WITH_3DES_EDE_CBC_SHA
|
|
* MBEDTLS_TLS_DHE_PSK_WITH_RC4_128_SHA
|
|
*/
|
|
-#define MBEDTLS_KEY_EXCHANGE_DHE_PSK_ENABLED
|
|
+//#define MBEDTLS_KEY_EXCHANGE_DHE_PSK_ENABLED
|
|
|
|
/**
|
|
* \def MBEDTLS_KEY_EXCHANGE_ECDHE_PSK_ENABLED
|
|
@@ -543,7 +543,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
|
|
@@ -597,7 +597,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
|
|
@@ -670,7 +670,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
|
|
@@ -694,7 +694,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_PK_PARSE_EC_EXTENDED
|
|
@@ -813,7 +813,7 @@
|
|
*
|
|
* Comment this macro to disable support for external private RSA keys.
|
|
*/
|
|
-#define MBEDTLS_PK_RSA_ALT_SUPPORT
|
|
+//#define MBEDTLS_PK_RSA_ALT_SUPPORT
|
|
|
|
/**
|
|
* \def MBEDTLS_PKCS1_V15
|
|
@@ -845,14 +845,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
|
|
@@ -868,7 +868,7 @@
|
|
*
|
|
* Uncomment to enable the smaller implementation of SHA256.
|
|
*/
|
|
-//#define MBEDTLS_SHA256_SMALLER
|
|
+#define MBEDTLS_SHA256_SMALLER
|
|
|
|
/**
|
|
* \def MBEDTLS_SSL_AEAD_RANDOM_IV
|
|
@@ -1041,7 +1041,7 @@
|
|
*
|
|
* Comment this macro to disable support for SSL 3.0
|
|
*/
|
|
-#define MBEDTLS_SSL_PROTO_SSL3
|
|
+//#define MBEDTLS_SSL_PROTO_SSL3
|
|
|
|
/**
|
|
* \def MBEDTLS_SSL_PROTO_TLS1
|
|
@@ -1195,7 +1195,7 @@
|
|
*
|
|
* Comment this macro to disable support for truncated HMAC in SSL
|
|
*/
|
|
-#define MBEDTLS_SSL_TRUNCATED_HMAC
|
|
+//#define MBEDTLS_SSL_TRUNCATED_HMAC
|
|
|
|
/**
|
|
* \def MBEDTLS_THREADING_ALT
|
|
@@ -1431,7 +1431,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_ASN1_PARSE_C
|
|
@@ -1496,7 +1496,7 @@
|
|
*
|
|
* Module: library/blowfish.c
|
|
*/
|
|
-#define MBEDTLS_BLOWFISH_C
|
|
+//#define MBEDTLS_BLOWFISH_C
|
|
|
|
/**
|
|
* \def MBEDTLS_CAMELLIA_C
|
|
@@ -1551,7 +1551,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_CCM_C
|
|
@@ -1565,7 +1565,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
|
|
@@ -1577,7 +1577,7 @@
|
|
*
|
|
* This module is used for testing (ssl_client/server).
|
|
*/
|
|
-#define MBEDTLS_CERTS_C
|
|
+//#define MBEDTLS_CERTS_C
|
|
|
|
/**
|
|
* \def MBEDTLS_CIPHER_C
|
|
@@ -1617,7 +1617,7 @@
|
|
*
|
|
* This module provides debugging functions.
|
|
*/
|
|
-#define MBEDTLS_DEBUG_C
|
|
+//#define MBEDTLS_DEBUG_C
|
|
|
|
/**
|
|
* \def MBEDTLS_DES_C
|
|
@@ -1657,7 +1657,7 @@
|
|
* This module is used by the following key exchanges:
|
|
* DHE-RSA, DHE-PSK
|
|
*/
|
|
-#define MBEDTLS_DHM_C
|
|
+//#define MBEDTLS_DHM_C
|
|
|
|
/**
|
|
* \def MBEDTLS_ECDH_C
|
|
@@ -2047,7 +2047,7 @@
|
|
* Caller: library/mbedtls_md.c
|
|
*
|
|
*/
|
|
-#define MBEDTLS_RIPEMD160_C
|
|
+//#define MBEDTLS_RIPEMD160_C
|
|
|
|
/**
|
|
* \def MBEDTLS_RSA_C
|
|
@@ -2345,7 +2345,7 @@
|
|
* Module: library/xtea.c
|
|
* Caller:
|
|
*/
|
|
-#define MBEDTLS_XTEA_C
|
|
+//#define MBEDTLS_XTEA_C
|
|
|
|
/* \} name SECTION: mbed TLS modules */
|
|
|