michaelh/zephyr
1
0
Fork 0
Code Releases Activity

modules: mbedtls: Add Kconfig entry for MBEDTLS_MD and MBEDTLS_CIPHER

Browse source 
Due to new checks in mbedTLS config sanitizer, TLS option can no longer
be left enabled, when TLS is not used. OpenThread needs MBEDTLS_MD_C
and MBEDTLS_CIPHER_C even without TLS being used, so we need an option
to enable them manually.

Signed-off-by: Robert Lubos <robert.lubos@nordicsemi.no>
This commit is contained in:
Robert Lubos 2020-05-28 15:37:00 +02:00 • committed by Carles Cufí
commit bc5b05f223
2 changed files with 16 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

15
modules/Kconfig.tls-generic
View file

@ -11,17 +11,23 @@ menu "Supported TLS version"
config MBEDTLS_TLS_VERSION_1_0 config MBEDTLS_TLS_VERSION_1_0
bool "Enable support for TLS 1.0" bool "Enable support for TLS 1.0"
select MBEDTLS_CIPHER
select MBEDTLS_MAC_MD5_ENABLED select MBEDTLS_MAC_MD5_ENABLED
select MBEDTLS_MAC_SHA1_ENABLED select MBEDTLS_MAC_SHA1_ENABLED
select MBEDTLS_MD
config MBEDTLS_TLS_VERSION_1_1 config MBEDTLS_TLS_VERSION_1_1
bool "Enable support for TLS 1.1 (DTLS 1.0)" bool "Enable support for TLS 1.1 (DTLS 1.0)"
select MBEDTLS_CIPHER
select MBEDTLS_MAC_MD5_ENABLED select MBEDTLS_MAC_MD5_ENABLED
select MBEDTLS_MAC_SHA1_ENABLED select MBEDTLS_MAC_SHA1_ENABLED
select MBEDTLS_MD
config MBEDTLS_TLS_VERSION_1_2 config MBEDTLS_TLS_VERSION_1_2
bool "Enable support for TLS 1.2 (DTLS 1.2)" bool "Enable support for TLS 1.2 (DTLS 1.2)"
default y default y if !NET_L2_OPENTHREAD
select MBEDTLS_CIPHER
select MBEDTLS_MD
config MBEDTLS_DTLS config MBEDTLS_DTLS
bool "Enable support for DTLS" bool "Enable support for DTLS"
@ -280,9 +286,16 @@ config MBEDTLS_CTR_DRBG_ENABLED
config MBEDTLS_HMAC_DRBG_ENABLED config MBEDTLS_HMAC_DRBG_ENABLED
bool "Enable the HMAC_DRBG random generator" bool "Enable the HMAC_DRBG random generator"
select MBEDTLS_MD
comment "Other configurations" comment "Other configurations"
config MBEDTLS_CIPHER
bool "Enable the generic cipher layer."
config MBEDTLS_MD
bool "Enable the generic message digest layer."
config MBEDTLS_GENPRIME_ENABLED config MBEDTLS_GENPRIME_ENABLED
bool "Enable the prime-number generation code." bool "Enable the prime-number generation code."

2
subsys/net/l2/openthread/Kconfig
View file

@ -21,6 +21,8 @@ menuconfig NET_L2_OPENTHREAD
select MBEDTLS_MAC_SHA256_ENABLED select MBEDTLS_MAC_SHA256_ENABLED
select MBEDTLS_ENTROPY_ENABLED select MBEDTLS_ENTROPY_ENABLED
select MBEDTLS_MAC_CMAC_ENABLED select MBEDTLS_MAC_CMAC_ENABLED
select MBEDTLS_CIPHER
select MBEDTLS_MD
if NET_L2_OPENTHREAD if NET_L2_OPENTHREAD