From 884b4620449e5b8ac3406ba9abdfacb77de00461 Mon Sep 17 00:00:00 2001 From: Gilles Peskine Date: Thu, 20 Jul 2023 20:11:51 +0200 Subject: [PATCH] When subtracting classic symbols from full, turn off PSA_CRYPTO_CONFIG Otherwise unwanted algorithms creep back from the default-on PSA_WANT symbols. Signed-off-by: Gilles Peskine --- tests/scripts/all.sh | 3 +++ tests/scripts/depends.py | 1 + 2 files changed, 4 insertions(+) diff --git a/tests/scripts/all.sh b/tests/scripts/all.sh index fcc6745253..5e384b6858 100755 --- a/tests/scripts/all.sh +++ b/tests/scripts/all.sh @@ -1440,6 +1440,7 @@ component_test_sw_inet_pton () { component_test_crypto_full_md_light_only () { msg "build: crypto_full with only the light subset of MD" scripts/config.py crypto_full + scripts/config.py unset MBEDTLS_PSA_CRYPTO_CONFIG # Disable MD scripts/config.py unset MBEDTLS_MD_C # Disable direct dependencies of MD_C @@ -1479,6 +1480,7 @@ component_test_full_no_cipher () { scripts/config.py unset MBEDTLS_SSL_TICKET_C # Indirect dependencies scripts/config.py unset MBEDTLS_SSL_CLI_C + scripts/config.py unset MBEDTLS_PSA_CRYPTO_CONFIG scripts/config.py unset MBEDTLS_PSA_CRYPTO_SE_C scripts/config.py unset MBEDTLS_PSA_CRYPTO_STORAGE_C scripts/config.py unset MBEDTLS_SSL_DTLS_ANTI_REPLAY @@ -1508,6 +1510,7 @@ component_test_crypto_full_no_cipher () { scripts/config.py unset MBEDTLS_PKCS5_C scripts/config.py unset MBEDTLS_PSA_CRYPTO_C # Indirect dependencies + scripts/config.py unset MBEDTLS_PSA_CRYPTO_CONFIG scripts/config.py unset MBEDTLS_PSA_CRYPTO_SE_C scripts/config.py unset MBEDTLS_PSA_CRYPTO_STORAGE_C scripts/config.py unset MBEDTLS_USE_PSA_CRYPTO diff --git a/tests/scripts/depends.py b/tests/scripts/depends.py index 5486a8652e..e925641519 100755 --- a/tests/scripts/depends.py +++ b/tests/scripts/depends.py @@ -161,6 +161,7 @@ derived.""" log_command(['config.py', 'full']) conf.adapt(config.full_adapter) set_config_option_value(conf, 'MBEDTLS_TEST_HOOKS', colors, False) + set_config_option_value(conf, 'MBEDTLS_PSA_CRYPTO_CONFIG', colors, False) if options.unset_use_psa: set_config_option_value(conf, 'MBEDTLS_USE_PSA_CRYPTO', colors, False)