michaelh/zephyr
1
0
Fork 0
Code Releases Activity

mbedtls: fix entropy module enablement

Browse source 
- Do not set CONFIG_MBEDTLS_ZEPHYR_ENTROPY in
  tests/crypto/mbedtls because this can cause test failure on
  real devices in which test thread do not have access to
  drivers.
- make MBEDTLS_PSA_CRYPTO_RND_SOURCE depending on
  MBEDTLS_PSA_CRYPTO_C because it only makes sense when the
  latter is defined

Signed-off-by: Valerio Setti <vsetti@baylibre.com>
This commit is contained in:
Valerio Setti 2024-05-14 16:15:45 +02:00 • committed by Alberto Escolar
commit dfae5ba7de
2 changed files with 1 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -462,6 +462,7 @@ config MBEDTLS_SSL_EXTENDED_MASTER_SECRET
choice MBEDTLS_PSA_CRYPTO_RND_SOURCE choice MBEDTLS_PSA_CRYPTO_RND_SOURCE
prompt "Select random source for built-in PSA crypto" prompt "Select random source for built-in PSA crypto"
depends on MBEDTLS_PSA_CRYPTO_C
default MBEDTLS_PSA_CRYPTO_LEGACY_RNG default MBEDTLS_PSA_CRYPTO_LEGACY_RNG
config MBEDTLS_PSA_CRYPTO_EXTERNAL_RNG config MBEDTLS_PSA_CRYPTO_EXTERNAL_RNG
@ -483,7 +484,6 @@ endchoice
config MBEDTLS_PSA_CRYPTO_C config MBEDTLS_PSA_CRYPTO_C
bool "Platform Security Architecture cryptography API" bool "Platform Security Architecture cryptography API"
depends on MBEDTLS_PSA_CRYPTO_EXTERNAL_RNG || MBEDTLS_PSA_CRYPTO_LEGACY_RNG
default y if UOSCORE || UEDHOC default y if UOSCORE || UEDHOC
config MBEDTLS_USE_PSA_CRYPTO config MBEDTLS_USE_PSA_CRYPTO

1
tests/crypto/mbedtls/prj.conf
View file

@ -8,5 +8,4 @@ CONFIG_MINIMAL_LIBC=y
CONFIG_MINIMAL_LIBC_NON_REENTRANT_FUNCTIONS=y CONFIG_MINIMAL_LIBC_NON_REENTRANT_FUNCTIONS=y
CONFIG_MINIMAL_LIBC_RAND=y CONFIG_MINIMAL_LIBC_RAND=y
CONFIG_ENTROPY_GENERATOR=y CONFIG_ENTROPY_GENERATOR=y
CONFIG_MBEDTLS_ZEPHYR_ENTROPY=y
CONFIG_TEST_RANDOM_GENERATOR=y CONFIG_TEST_RANDOM_GENERATOR=y