commit 884b4620449e5b8ac3406ba9abdfacb77de00461
author Gilles Peskine <Gilles.Peskine@arm.com> Thu Jul 20 20:11:51 2023 +0200
committer Gilles Peskine <Gilles.Peskine@arm.com> Fri Jul 21 17:50:49 2023 +0200
tree fa0798ff5f8ac20af5de025bd2444e7a4d713d5d
parent 7eea4a7a80af4ecc7c85f07928f66e2aa464a818

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 <Gilles.Peskine@arm.com>

tests/scripts/all.sh

diff --git a/tests/scripts/all.sh b/tests/scripts/all.sh
index fcc6745..5e384b6 100755
--- a/tests/scripts/all.sh
+++ b/tests/scripts/all.sh
@@ -1440,6 +1440,7 @@
 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 @@
     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 @@
     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

tests/scripts/depends.py

diff --git a/tests/scripts/depends.py b/tests/scripts/depends.py
index 5486a86..e925641 100755
--- a/tests/scripts/depends.py
+++ b/tests/scripts/depends.py
@@ -161,6 +161,7 @@
     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)