From 275f8dd5c7f4235d9b6b805708e29cacc7015723 Mon Sep 17 00:00:00 2001 From: Ronald Cron Date: Fri, 5 Sep 2025 11:31:46 +0200 Subject: [PATCH 1/2] Remove MBEDTLS_PLATFORM_GET_ENTROPY_ALT Signed-off-by: Ronald Cron --- .../include/test/fake_external_rng_for_test.h | 4 ++-- tests/src/fake_external_rng_for_test.c | 20 +++---------------- 2 files changed, 5 insertions(+), 19 deletions(-) diff --git a/tests/include/test/fake_external_rng_for_test.h b/tests/include/test/fake_external_rng_for_test.h index 9ab128273..4c5177ce0 100644 --- a/tests/include/test/fake_external_rng_for_test.h +++ b/tests/include/test/fake_external_rng_for_test.h @@ -37,7 +37,7 @@ void mbedtls_test_enable_insecure_external_rng(void); void mbedtls_test_disable_insecure_external_rng(void); #endif /* MBEDTLS_PSA_CRYPTO_EXTERNAL_RNG */ -#if defined(MBEDTLS_PLATFORM_GET_ENTROPY_ALT) || defined(MBEDTLS_PSA_DRIVER_GET_ENTROPY) +#if defined(MBEDTLS_PSA_DRIVER_GET_ENTROPY) #include @@ -73,6 +73,6 @@ void mbedtls_test_platform_get_entropy_set_entropy_content(size_t val); /* Return the number of times mbedtls_platform_get_entropy() was called. */ size_t mbedtls_test_platform_get_entropy_get_call_count(void); -#endif /* MBEDTLS_PLATFORM_GET_ENTROPY_ALT || MBEDTLS_PSA_DRIVER_GET_ENTROPY */ +#endif /* MBEDTLS_PSA_DRIVER_GET_ENTROPY */ #endif /* FAKE_EXTERNAL_RNG_FOR_TEST_H */ diff --git a/tests/src/fake_external_rng_for_test.c b/tests/src/fake_external_rng_for_test.c index aedd6d3e6..72624e1a6 100644 --- a/tests/src/fake_external_rng_for_test.c +++ b/tests/src/fake_external_rng_for_test.c @@ -55,7 +55,7 @@ psa_status_t mbedtls_psa_external_get_random( #endif /* MBEDTLS_PSA_CRYPTO_EXTERNAL_RNG */ -#if defined(MBEDTLS_PLATFORM_GET_ENTROPY_ALT) || defined(MBEDTLS_PSA_DRIVER_GET_ENTROPY) +#if defined(MBEDTLS_PSA_DRIVER_GET_ENTROPY) #include @@ -130,7 +130,7 @@ static int fake_get_entropy(unsigned char *output, size_t output_size, return 0; } -#endif /* MBEDTLS_PLATFORM_GET_ENTROPY_ALT || MBEDTLS_PSA_DRIVER_GET_ENTROPY */ +#endif /* MBEDTLS_PSA_DRIVER_GET_ENTROPY */ #if defined(MBEDTLS_PSA_DRIVER_GET_ENTROPY) int mbedtls_platform_get_entropy(psa_driver_get_entropy_flags_t flags, @@ -145,18 +145,4 @@ int mbedtls_platform_get_entropy(psa_driver_get_entropy_flags_t flags, int ret = fake_get_entropy(output, output_size, estimate_bits); return ret; } -#elif defined(MBEDTLS_PLATFORM_GET_ENTROPY_ALT) -int mbedtls_platform_get_entropy(unsigned char *output, size_t output_size, - size_t *output_len, size_t *entropy_content) -{ - int ret = fake_get_entropy(output, output_size, entropy_content); - if (ret == 0) { - if (platform_get_entropy_forced_output_len == SIZE_MAX) { - *output_len = output_size; - } else { - *output_len = platform_get_entropy_forced_output_len; - } - } - return ret; -} -#endif /* MBEDTLS_PLATFORM_GET_ENTROPY_ALT */ +#endif /* MBEDTLS_PSA_DRIVER_GET_ENTROPY */ From bb7434e7677e3f63979c4f8040093a45162a4254 Mon Sep 17 00:00:00 2001 From: Ronald Cron Date: Tue, 9 Sep 2025 14:15:30 +0200 Subject: [PATCH 2/2] Adapt psasim client config Adapt psasim client config to stricter compile-time checks for the MBEDTLS_ENTROPY_NV_SEED option. Signed-off-by: Ronald Cron --- scripts/all-helpers.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/all-helpers.sh b/scripts/all-helpers.sh index 28d5395dd..c1421f0d2 100644 --- a/scripts/all-helpers.sh +++ b/scripts/all-helpers.sh @@ -139,6 +139,8 @@ helper_psasim_config() { scripts/config.py full scripts/config.py unset MBEDTLS_PSA_CRYPTO_C scripts/config.py unset MBEDTLS_PSA_CRYPTO_STORAGE_C + scripts/config.py unset MBEDTLS_ENTROPY_NV_SEED + scripts/config.py unset MBEDTLS_PLATFORM_NV_SEED_ALT if in_mbedtls_repo && in_3_6_branch; then # Dynamic secure element support is a deprecated feature and it is not # available when CRYPTO_C and PSA_CRYPTO_STORAGE_C are disabled.