ARMmbed/mbedtls
1
0
Fork 0
mirror of https://github.com/ARMmbed/mbedtls.git synced 2025-10-18 17:43:06 +08:00
Code Issues Releases Wiki Activity

Prepare for the removal of MBEDTLS_PLATFORM_GET_ENTROPY_ALT

Browse Source 
We cannot remove it completely yet.
It must remain in config.py so that it is not
included in the full configuration.
A temporary exception is required for it in
analyze_outcomes.py.

Signed-off-by: Ronald Cron <ronald.cron@arm.com>
This commit is contained in:
Ronald Cron
2025-09-03 09:57:29 +02:00
parent 3b30643143
commit eb16a9d9ea
6 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
programs/test/selftest.c
View File

@@ -210,7 +210,7 @@ static int run_test_snprintf(void)
* back. * back.
*/ */
#if defined(MBEDTLS_SELF_TEST) && defined(MBEDTLS_ENTROPY_C) #if defined(MBEDTLS_SELF_TEST) && defined(MBEDTLS_ENTROPY_C)
#if defined(MBEDTLS_ENTROPY_NV_SEED) && !defined(MBEDTLS_PLATFORM_GET_ENTROPY_ALT) #if defined(MBEDTLS_ENTROPY_NV_SEED) && !defined(MBEDTLS_PSA_DRIVER_GET_ENTROPY)
static void dummy_entropy(unsigned char *output, size_t output_size) static void dummy_entropy(unsigned char *output, size_t output_size)
{ {
srand(1); srand(1);
@@ -239,7 +239,7 @@ static void create_entropy_seed_file(void)
static int mbedtls_entropy_self_test_wrapper(int verbose) static int mbedtls_entropy_self_test_wrapper(int verbose)
{ {
#if defined(MBEDTLS_ENTROPY_NV_SEED) && !defined(MBEDTLS_PLATFORM_GET_ENTROPY_ALT) #if defined(MBEDTLS_ENTROPY_NV_SEED) && !defined(MBEDTLS_PSA_DRIVER_GET_ENTROPY)
create_entropy_seed_file(); create_entropy_seed_file();
#endif #endif
return mbedtls_entropy_self_test(verbose); return mbedtls_entropy_self_test(verbose);

4
scripts/config.py
View File

@@ -180,8 +180,10 @@ def baremetal_adapter(name, value, active):
"""Config adapter for "baremetal".""" """Config adapter for "baremetal"."""
if not is_boolean_setting(name, value): if not is_boolean_setting(name, value):
return active return active
if name == 'MBEDTLS_PLATFORM_GET_ENTROPY_ALT': if name == 'MBEDTLS_PSA_BUILTIN_GET_ENTROPY':
# No OS-provided entropy source # No OS-provided entropy source
return False
if name == 'MBEDTLS_PSA_DRIVER_GET_ENTROPY':
return True return True
return include_in_full(name) and keep_in_baremetal(name) return include_in_full(name) and keep_in_baremetal(name)

3
scripts/footprint.sh
View File

@@ -64,7 +64,8 @@ doit()
scripts/config.py unset MBEDTLS_NET_C || true scripts/config.py unset MBEDTLS_NET_C || true
scripts/config.py unset MBEDTLS_TIMING_C || true scripts/config.py unset MBEDTLS_TIMING_C || true
scripts/config.py unset MBEDTLS_FS_IO || true scripts/config.py unset MBEDTLS_FS_IO || true
scripts/config.py --force set MBEDTLS_PLATFORM_GET_ENTROPY_ALT || true scripts/config.py unset MBEDTLS_PSA_BUILTIN_GET_ENTROPY || true
scripts/config.py --force set MBEDTLS_PSA_DRIVER_GET_ENTROPY || true
} >/dev/null 2>&1 } >/dev/null 2>&1
make clean >/dev/null make clean >/dev/null

2
tests/scripts/analyze_outcomes.py
View File

@@ -128,6 +128,8 @@ class CoverageTask(outcome_analysis.CoverageTask):
# PSA entropy drivers. # PSA entropy drivers.
# https://github.com/Mbed-TLS/mbedtls/issues/8150 # https://github.com/Mbed-TLS/mbedtls/issues/8150
'Config: MBEDTLS_NO_DEFAULT_ENTROPY_SOURCES', 'Config: MBEDTLS_NO_DEFAULT_ENTROPY_SOURCES',
# Obsolete config option that we are about to remove
'Config: MBEDTLS_PLATFORM_GET_ENTROPY_ALT',
# Untested aspect of the platform interface. # Untested aspect of the platform interface.
# https://github.com/Mbed-TLS/mbedtls/issues/9589 # https://github.com/Mbed-TLS/mbedtls/issues/9589
'Config: MBEDTLS_PLATFORM_NO_STD_FUNCTIONS', 'Config: MBEDTLS_PLATFORM_NO_STD_FUNCTIONS',

12
tests/scripts/components-configuration-platform.sh
View File

@@ -20,17 +20,18 @@ component_build_no_std_function () {
make make
} }
component_test_platform_get_entropy_alt() component_test_psa_driver_get_entropy()
{ {
msg "build: default config + MBEDTLS_PLATFORM_GET_ENTROPY_ALT" msg "build: default - MBEDTLS_PSA_BUILTIN_GET_ENTROPY + MBEDTLS_PSA_DRIVER_GET_ENTROPY"
# Use hardware polling as the only source for entropy # Use hardware polling as the only source for entropy
scripts/config.py set MBEDTLS_PLATFORM_GET_ENTROPY_ALT scripts/config.py unset MBEDTLS_PSA_BUILTIN_GET_ENTROPY
scripts/config.py unset MBEDTLS_ENTROPY_NV_SEED scripts/config.py unset MBEDTLS_ENTROPY_NV_SEED
scripts/config.py set MBEDTLS_PSA_DRIVER_GET_ENTROPY
make make
# Run all the tests # Run all the tests
msg "test: default config + MBEDTLS_PLATFORM_GET_ENTROPY_ALT" msg "test: default - MBEDTLS_PSA_BUILTIN_GET_ENTROPY + MBEDTLS_PSA_DRIVER_GET_ENTROPY"
make test make test
} }
@@ -40,7 +41,8 @@ component_build_no_sockets () {
msg "build: full config except net_sockets.c, make, gcc -std=c99 -pedantic" # ~ 30s msg "build: full config except net_sockets.c, make, gcc -std=c99 -pedantic" # ~ 30s
scripts/config.py full scripts/config.py full
scripts/config.py unset MBEDTLS_NET_C # getaddrinfo() undeclared, etc. scripts/config.py unset MBEDTLS_NET_C # getaddrinfo() undeclared, etc.
scripts/config.py set MBEDTLS_PLATFORM_GET_ENTROPY_ALT # prevent syscall() on GNU/Linux scripts/config.py unset MBEDTLS_PSA_BUILTIN_GET_ENTROPY # prevent syscall() on GNU/Linux
scripts/config.py set MBEDTLS_PSA_DRIVER_GET_ENTROPY
make CC=gcc CFLAGS='-Werror -Wall -Wextra -O1 -std=c99 -pedantic' lib make CC=gcc CFLAGS='-Werror -Wall -Wextra -O1 -std=c99 -pedantic' lib
} }

3
tests/scripts/components-configuration.sh
View File

@@ -284,7 +284,8 @@ component_test_no_platform () {
# Use the test alternative implementation of mbedtls_platform_get_entropy() # Use the test alternative implementation of mbedtls_platform_get_entropy()
# which is provided in "framework/tests/src/fake_external_rng_for_test.c" # which is provided in "framework/tests/src/fake_external_rng_for_test.c"
# since the default one is excluded in this scenario. # since the default one is excluded in this scenario.
scripts/config.py set MBEDTLS_PLATFORM_GET_ENTROPY_ALT scripts/config.py unset MBEDTLS_PSA_BUILTIN_GET_ENTROPY
scripts/config.py set MBEDTLS_PSA_DRIVER_GET_ENTROPY
# Note, _DEFAULT_SOURCE needs to be defined for platforms using glibc version >2.19, # Note, _DEFAULT_SOURCE needs to be defined for platforms using glibc version >2.19,
# to re-enable platform integration features otherwise disabled in C99 builds # to re-enable platform integration features otherwise disabled in C99 builds
make CC=gcc CFLAGS='-Werror -Wall -Wextra -std=c99 -pedantic -Os -D_DEFAULT_SOURCE' lib programs make CC=gcc CFLAGS='-Werror -Wall -Wextra -std=c99 -pedantic -Os -D_DEFAULT_SOURCE' lib programs