 2e75914bee
			
		
	
	2e75914bee
	
	
	
		
			
			This fixes some minor security problems. Old size: 162262 bin/packages/mips_24kc/base/libmbedtls_2.7.0-1_mips_24kc.ipk New size: 163162 bin/packages/mips_24kc/base/libmbedtls_2.8.0-1_mips_24kc.ipk Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
		
			
				
	
	
		
			261 lines
		
	
	
		
			6.1 KiB
		
	
	
	
		
			Diff
		
	
	
	
	
	
			
		
		
	
	
			261 lines
		
	
	
		
			6.1 KiB
		
	
	
	
		
			Diff
		
	
	
	
	
	
| --- a/include/mbedtls/config.h
 | |
| +++ b/include/mbedtls/config.h
 | |
| @@ -566,17 +566,17 @@
 | |
|   *
 | |
|   * 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_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
 | |
|  #define MBEDTLS_ECP_DP_CURVE25519_ENABLED
 | |
|  
 | |
|  /**
 | |
| @@ -601,8 +601,8 @@
 | |
|   * Requires: MBEDTLS_HMAC_DRBG_C
 | |
|   *
 | |
|   * Comment this macro to disable deterministic ECDSA.
 | |
| - */
 | |
|  #define MBEDTLS_ECDSA_DETERMINISTIC
 | |
| + */
 | |
|  
 | |
|  /**
 | |
|   * \def MBEDTLS_KEY_EXCHANGE_PSK_ENABLED
 | |
| @@ -655,7 +655,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
 | |
| @@ -674,8 +674,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
 | |
| @@ -700,7 +700,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
 | |
| @@ -834,7 +834,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
 | |
| @@ -858,7 +858,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
 | |
| @@ -962,7 +962,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
 | |
| @@ -1057,14 +1057,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
 | |
| @@ -1080,7 +1080,7 @@
 | |
|   *
 | |
|   * Uncomment to enable the smaller implementation of SHA256.
 | |
|   */
 | |
| -//#define MBEDTLS_SHA256_SMALLER
 | |
| +#define MBEDTLS_SHA256_SMALLER
 | |
|  
 | |
|  /**
 | |
|   * \def MBEDTLS_SSL_ALL_ALERT_MESSAGES
 | |
| @@ -1207,7 +1207,7 @@
 | |
|   *          configuration of this extension).
 | |
|   *
 | |
|   */
 | |
| -#define MBEDTLS_SSL_RENEGOTIATION
 | |
| +//#define MBEDTLS_SSL_RENEGOTIATION
 | |
|  
 | |
|  /**
 | |
|   * \def MBEDTLS_SSL_SRV_SUPPORT_SSLV2_CLIENT_HELLO
 | |
| @@ -1381,8 +1381,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_SSL_EXPORT_KEYS
 | |
| @@ -1412,7 +1412,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
 | |
| @@ -1470,8 +1470,8 @@
 | |
|   * Requires: MBEDTLS_VERSION_C
 | |
|   *
 | |
|   * Comment this to disable run-time checking and save ROM space
 | |
| - */
 | |
|  #define MBEDTLS_VERSION_FEATURES
 | |
| + */
 | |
|  
 | |
|  /**
 | |
|   * \def MBEDTLS_X509_ALLOW_EXTENSIONS_NON_V3
 | |
| @@ -1801,7 +1801,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
 | |
| @@ -1815,7 +1815,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
 | |
| @@ -1827,7 +1827,7 @@
 | |
|   *
 | |
|   * This module is used for testing (ssl_client/server).
 | |
|   */
 | |
| -#define MBEDTLS_CERTS_C
 | |
| +//#define MBEDTLS_CERTS_C
 | |
|  
 | |
|  /**
 | |
|   * \def MBEDTLS_CIPHER_C
 | |
| @@ -1880,7 +1880,7 @@
 | |
|   *
 | |
|   * This module provides debugging functions.
 | |
|   */
 | |
| -#define MBEDTLS_DEBUG_C
 | |
| +//#define MBEDTLS_DEBUG_C
 | |
|  
 | |
|  /**
 | |
|   * \def MBEDTLS_DES_C
 | |
| @@ -1909,7 +1909,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
 | |
| @@ -2070,8 +2070,8 @@
 | |
|   * Requires: MBEDTLS_MD_C
 | |
|   *
 | |
|   * Uncomment to enable the HMAC_DRBG random number geerator.
 | |
| - */
 | |
|  #define MBEDTLS_HMAC_DRBG_C
 | |
| + */
 | |
|  
 | |
|  /**
 | |
|   * \def MBEDTLS_MD_C
 | |
| @@ -2365,7 +2365,7 @@
 | |
|   * Caller:  library/md.c
 | |
|   *
 | |
|   */
 | |
| -#define MBEDTLS_RIPEMD160_C
 | |
| +//#define MBEDTLS_RIPEMD160_C
 | |
|  
 | |
|  /**
 | |
|   * \def MBEDTLS_RSA_C
 | |
| @@ -2449,8 +2449,8 @@
 | |
|   * Caller:
 | |
|   *
 | |
|   * Requires: MBEDTLS_SSL_CACHE_C
 | |
| - */
 | |
|  #define MBEDTLS_SSL_CACHE_C
 | |
| + */
 | |
|  
 | |
|  /**
 | |
|   * \def MBEDTLS_SSL_COOKIE_C
 | |
| @@ -2471,8 +2471,8 @@
 | |
|   * Caller:
 | |
|   *
 | |
|   * Requires: MBEDTLS_CIPHER_C
 | |
| - */
 | |
|  #define MBEDTLS_SSL_TICKET_C
 | |
| + */
 | |
|  
 | |
|  /**
 | |
|   * \def MBEDTLS_SSL_CLI_C
 | |
| @@ -2571,8 +2571,8 @@
 | |
|   * Module:  library/version.c
 | |
|   *
 | |
|   * This module provides run-time version information.
 | |
| - */
 | |
|  #define MBEDTLS_VERSION_C
 | |
| + */
 | |
|  
 | |
|  /**
 | |
|   * \def MBEDTLS_X509_USE_C
 | |
| @@ -2682,7 +2682,7 @@
 | |
|   * Module:  library/xtea.c
 | |
|   * Caller:
 | |
|   */
 | |
| -#define MBEDTLS_XTEA_C
 | |
| +//#define MBEDTLS_XTEA_C
 | |
|  
 | |
|  /* \} name SECTION: mbed TLS modules */
 | |
|  
 |