This fixes CVE-2015-5291 and some other smaller security issues.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
SVN-Revision: 47200
include $(TOPDIR)/rules.mk
PKG_NAME:=mbedtls
include $(TOPDIR)/rules.mk
PKG_NAME:=mbedtls
PKG_RELEASE:=1
PKG_USE_MIPS16:=0
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-gpl.tgz
PKG_SOURCE_URL:=https://tls.mbed.org/download/
PKG_RELEASE:=1
PKG_USE_MIPS16:=0
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-gpl.tgz
PKG_SOURCE_URL:=https://tls.mbed.org/download/
-PKG_MD5SUM:=6b8246a19a7a77737856e729cc8a0952
+PKG_MD5SUM:=38b7baae95d6b0826605a1edfffeebe4
PKG_BUILD_PARALLEL:=1
PKG_LICENSE:=GPL-2.0+
PKG_BUILD_PARALLEL:=1
PKG_LICENSE:=GPL-2.0+
--- a/include/mbedtls/config.h
+++ b/include/mbedtls/config.h
--- a/include/mbedtls/config.h
+++ b/include/mbedtls/config.h
*
* Uncomment to get errors on using deprecated functions.
*/
*
* Uncomment to get errors on using deprecated functions.
*/
/* \} name SECTION: System support */
/* \} name SECTION: System support */
*
* Enable Cipher Feedback mode (CFB) for symmetric ciphers.
*/
*
* Enable Cipher Feedback mode (CFB) for symmetric ciphers.
*/
/**
* \def MBEDTLS_CIPHER_MODE_CTR
/**
* \def MBEDTLS_CIPHER_MODE_CTR
*
* Comment macros to disable the curve and functions for it
*/
*
* Comment macros to disable the curve and functions for it
*/
#define MBEDTLS_ECP_DP_SECP256K1_ENABLED
#define MBEDTLS_ECP_DP_BP256R1_ENABLED
#define MBEDTLS_ECP_DP_BP384R1_ENABLED
#define MBEDTLS_ECP_DP_SECP256K1_ENABLED
#define MBEDTLS_ECP_DP_BP256R1_ENABLED
#define MBEDTLS_ECP_DP_BP384R1_ENABLED
*
* Comment this macro to disable NIST curves optimisation.
*/
*
* Comment this macro to disable NIST curves optimisation.
*/
/**
* \def MBEDTLS_ECDSA_DETERMINISTIC
/**
* \def MBEDTLS_ECDSA_DETERMINISTIC
-@@ -443,7 +443,7 @@
- * Enable deterministic ECDSA (RFC 6979).
- * Standard ECDSA is "fragile" in the sense that lack of entropy when signing
- * may result in a compromise of the long-term signing key. This is avoided by
-- * the deterministic variant.
-+ DH * the deterministic variant.
- *
- * Requires: MBEDTLS_HMAC_DRBG_C
- *
-@@ -495,7 +495,7 @@
* MBEDTLS_TLS_DHE_PSK_WITH_3DES_EDE_CBC_SHA
* MBEDTLS_TLS_DHE_PSK_WITH_RC4_128_SHA
*/
* MBEDTLS_TLS_DHE_PSK_WITH_3DES_EDE_CBC_SHA
* MBEDTLS_TLS_DHE_PSK_WITH_RC4_128_SHA
*/
/**
* \def MBEDTLS_KEY_EXCHANGE_ECDHE_PSK_ENABLED
/**
* \def MBEDTLS_KEY_EXCHANGE_ECDHE_PSK_ENABLED
* MBEDTLS_TLS_RSA_PSK_WITH_3DES_EDE_CBC_SHA
* MBEDTLS_TLS_RSA_PSK_WITH_RC4_128_SHA
*/
* MBEDTLS_TLS_RSA_PSK_WITH_3DES_EDE_CBC_SHA
* MBEDTLS_TLS_RSA_PSK_WITH_RC4_128_SHA
*/
/**
* \def MBEDTLS_KEY_EXCHANGE_RSA_ENABLED
/**
* \def MBEDTLS_KEY_EXCHANGE_RSA_ENABLED
* MBEDTLS_TLS_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA
* MBEDTLS_TLS_DHE_RSA_WITH_3DES_EDE_CBC_SHA
*/
* MBEDTLS_TLS_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA
* MBEDTLS_TLS_DHE_RSA_WITH_3DES_EDE_CBC_SHA
*/
/**
* \def MBEDTLS_KEY_EXCHANGE_ECDHE_RSA_ENABLED
/**
* \def MBEDTLS_KEY_EXCHANGE_ECDHE_RSA_ENABLED
* MBEDTLS_TLS_ECDH_ECDSA_WITH_CAMELLIA_128_GCM_SHA256
* MBEDTLS_TLS_ECDH_ECDSA_WITH_CAMELLIA_256_GCM_SHA384
*/
* MBEDTLS_TLS_ECDH_ECDSA_WITH_CAMELLIA_128_GCM_SHA256
* MBEDTLS_TLS_ECDH_ECDSA_WITH_CAMELLIA_256_GCM_SHA384
*/
/**
* \def MBEDTLS_KEY_EXCHANGE_ECDH_RSA_ENABLED
/**
* \def MBEDTLS_KEY_EXCHANGE_ECDH_RSA_ENABLED
* MBEDTLS_TLS_ECDH_RSA_WITH_CAMELLIA_128_GCM_SHA256
* MBEDTLS_TLS_ECDH_RSA_WITH_CAMELLIA_256_GCM_SHA384
*/
* MBEDTLS_TLS_ECDH_RSA_WITH_CAMELLIA_128_GCM_SHA256
* MBEDTLS_TLS_ECDH_RSA_WITH_CAMELLIA_256_GCM_SHA384
*/
/**
* \def MBEDTLS_PK_PARSE_EC_EXTENDED
/**
* \def MBEDTLS_PK_PARSE_EC_EXTENDED
*
* Comment this macro to disable support for external private RSA keys.
*/
*
* Comment this macro to disable support for external private RSA keys.
*/
/**
* \def MBEDTLS_PKCS1_V15
/**
* \def MBEDTLS_PKCS1_V15
* Uncomment this macro to disable the use of CRT in RSA.
*
*/
* Uncomment this macro to disable the use of CRT in RSA.
*
*/
/**
* \def MBEDTLS_SHA256_SMALLER
/**
* \def MBEDTLS_SHA256_SMALLER
*
* Uncomment to enable the smaller implementation of SHA256.
*/
*
* Uncomment to enable the smaller implementation of SHA256.
*/
/**
* \def MBEDTLS_SSL_AEAD_RANDOM_IV
/**
* \def MBEDTLS_SSL_AEAD_RANDOM_IV
*
* Comment this macro to disable support for SSL 3.0
*/
*
* Comment this macro to disable support for SSL 3.0
*/
/**
* \def MBEDTLS_SSL_PROTO_TLS1
/**
* \def MBEDTLS_SSL_PROTO_TLS1
*
* Comment this macro to disable support for truncated HMAC in SSL
*/
*
* Comment this macro to disable support for truncated HMAC in SSL
*/
/**
* \def MBEDTLS_THREADING_ALT
/**
* \def MBEDTLS_THREADING_ALT
* MBEDTLS_TLS_RSA_PSK_WITH_RC4_128_SHA
* MBEDTLS_TLS_PSK_WITH_RC4_128_SHA
*/
* MBEDTLS_TLS_RSA_PSK_WITH_RC4_128_SHA
* MBEDTLS_TLS_PSK_WITH_RC4_128_SHA
*/
/**
* \def MBEDTLS_ASN1_PARSE_C
/**
* \def MBEDTLS_ASN1_PARSE_C
*
* Module: library/blowfish.c
*/
*
* Module: library/blowfish.c
*/
/**
* \def MBEDTLS_CAMELLIA_C
/**
* \def MBEDTLS_CAMELLIA_C
* MBEDTLS_TLS_PSK_WITH_CAMELLIA_128_GCM_SHA256
* MBEDTLS_TLS_PSK_WITH_CAMELLIA_128_CBC_SHA256
*/
* MBEDTLS_TLS_PSK_WITH_CAMELLIA_128_GCM_SHA256
* MBEDTLS_TLS_PSK_WITH_CAMELLIA_128_CBC_SHA256
*/
* This module enables the AES-CCM ciphersuites, if other requisites are
* enabled as well.
*/
* This module enables the AES-CCM ciphersuites, if other requisites are
* enabled as well.
*/
/**
* \def MBEDTLS_CERTS_C
/**
* \def MBEDTLS_CERTS_C
*
* This module is used for testing (ssl_client/server).
*/
*
* This module is used for testing (ssl_client/server).
*/
/**
* \def MBEDTLS_CIPHER_C
/**
* \def MBEDTLS_CIPHER_C
*
* This module provides debugging functions.
*/
*
* This module provides debugging functions.
*/
* This module is used by the following key exchanges:
* DHE-RSA, DHE-PSK
*/
* This module is used by the following key exchanges:
* DHE-RSA, DHE-PSK
*/
/**
* \def MBEDTLS_ECDH_C
/**
* \def MBEDTLS_ECDH_C
* Caller: library/mbedtls_md.c
*
*/
* Caller: library/mbedtls_md.c
*
*/
* Module: library/xtea.c
* Caller:
*/
* Module: library/xtea.c
* Caller:
*/