michaelh/zephyr
1
0
Fork 0
Code Releases Activity

mbedtls: rename MBEDTLS_ENTROPY_ENABLED as MBEDTLS_ENTROPY_C

Browse source 
ENABLED suffix does not really makes much sense for a kconfig
so it should be removed. Also other MBEDTLS symbols were recently
updated accordingly.
Moreover having it named exactly the same way as in Mbed TLS
symplifies the understanding of what this kconfig is doing.

Signed-off-by: Valerio Setti <vsetti@baylibre.com>
This commit is contained in:
Valerio Setti 2024-07-30 17:21:20 +02:00 • committed by Anas Nashif
commit e3e13fb40b
5 changed files with 11 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
drivers/bluetooth/hci/Kconfig
View file

@ -85,7 +85,7 @@ config BT_SILABS_HCI
select ENTROPY_GENERATOR select ENTROPY_GENERATOR
select MBEDTLS select MBEDTLS
select MBEDTLS_PSA_CRYPTO_C select MBEDTLS_PSA_CRYPTO_C
select MBEDTLS_ENTROPY_ENABLED select MBEDTLS_ENTROPY_C
select MBEDTLS_ZEPHYR_ENTROPY select MBEDTLS_ZEPHYR_ENTROPY
help help
Use Silicon Labs binary Bluetooth library to connect to the Use Silicon Labs binary Bluetooth library to connect to the

10
modules/mbedtls/Kconfig.tls-generic
View file

@ -371,10 +371,14 @@ config MBEDTLS_HAVE_ASM
of asymmetric cryptography, however this might have an impact on the of asymmetric cryptography, however this might have an impact on the
code size. code size.
config MBEDTLS_ENTROPY_ENABLED config MBEDTLS_ENTROPY_C
bool "MbedTLS generic entropy pool" bool "Mbed TLS entropy accumulator"
depends on MBEDTLS_SHA256 || MBEDTLS_SHA384 || MBEDTLS_SHA512 depends on MBEDTLS_SHA256 || MBEDTLS_SHA384 || MBEDTLS_SHA512
default y if MBEDTLS_ZEPHYR_ENTROPY default y if MBEDTLS_ZEPHYR_ENTROPY
help
This module gathers entropy data from enabled entropy sources. It's
mostly used in conjunction with CTR_DRBG or HMAC_DRBG to create
a deterministic random number generator.
config MBEDTLS_OPENTHREAD_OPTIMIZATIONS_ENABLED config MBEDTLS_OPENTHREAD_OPTIMIZATIONS_ENABLED
bool "MbedTLS optimizations for OpenThread" bool "MbedTLS optimizations for OpenThread"
@ -461,7 +465,7 @@ config MBEDTLS_PSA_CRYPTO_EXTERNAL_RNG
config MBEDTLS_PSA_CRYPTO_LEGACY_RNG config MBEDTLS_PSA_CRYPTO_LEGACY_RNG
bool "Use legacy modules to generate random data" bool "Use legacy modules to generate random data"
select MBEDTLS_ENTROPY_ENABLED select MBEDTLS_ENTROPY_C
select MBEDTLS_HMAC_DRBG_ENABLED if !MBEDTLS_CTR_DRBG_ENABLED select MBEDTLS_HMAC_DRBG_ENABLED if !MBEDTLS_CTR_DRBG_ENABLED
help help
Use legacy MbedTLS modules (ENTROPY + CTR_DRBG/HMAC_DRBG) as random Use legacy MbedTLS modules (ENTROPY + CTR_DRBG/HMAC_DRBG) as random

2
modules/mbedtls/configs/config-tls-generic.h
View file

@ -320,7 +320,7 @@
#define MBEDTLS_GENPRIME #define MBEDTLS_GENPRIME
#endif #endif
#if defined(CONFIG_MBEDTLS_ENTROPY_ENABLED) #if defined(CONFIG_MBEDTLS_ENTROPY_C)
#define MBEDTLS_ENTROPY_C #define MBEDTLS_ENTROPY_C
#endif #endif

2
samples/tfm_integration/psa_crypto/prj.conf
View file

@ -34,7 +34,7 @@ CONFIG_PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_BASIC=y
CONFIG_PSA_WANT_ECC_SECP_R1_256=y CONFIG_PSA_WANT_ECC_SECP_R1_256=y
CONFIG_PSA_WANT_ALG_ECDSA=y CONFIG_PSA_WANT_ALG_ECDSA=y
CONFIG_PSA_WANT_KEY_TYPE_RSA_PUBLIC_KEY=y CONFIG_PSA_WANT_KEY_TYPE_RSA_PUBLIC_KEY=y
CONFIG_MBEDTLS_ENTROPY_ENABLED=y CONFIG_MBEDTLS_ENTROPY_C=y
CONFIG_MBEDTLS_ECP_C=y CONFIG_MBEDTLS_ECP_C=y
CONFIG_MBEDTLS_ECP_DP_SECP256R1_ENABLED=y CONFIG_MBEDTLS_ECP_DP_SECP256R1_ENABLED=y
CONFIG_MBEDTLS_ECDSA_C=y CONFIG_MBEDTLS_ECDSA_C=y

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

@ -182,7 +182,7 @@ config OPENTHREAD_MBEDTLS
select MBEDTLS_CIPHER_AES_ENABLED select MBEDTLS_CIPHER_AES_ENABLED
select MBEDTLS_CIPHER_CCM_ENABLED select MBEDTLS_CIPHER_CCM_ENABLED
select MBEDTLS_SHA256 select MBEDTLS_SHA256
select MBEDTLS_ENTROPY_ENABLED select MBEDTLS_ENTROPY_C
select MBEDTLS_CMAC select MBEDTLS_CMAC
select MBEDTLS_CIPHER select MBEDTLS_CIPHER
select MBEDTLS_MD select MBEDTLS_MD