From de6f92735eddad478191930a9826f10fb1e68022 Mon Sep 17 00:00:00 2001 From: Valerio Setti Date: Mon, 10 Mar 2025 17:40:06 +0100 Subject: [PATCH] test: all-helpers: configure MBEDTLS_PSA_CRYPTO_SE_C only in 3.6 branch Signed-off-by: Valerio Setti --- scripts/all-helpers.sh | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/scripts/all-helpers.sh b/scripts/all-helpers.sh index 205c83fcc..f63143e30 100644 --- a/scripts/all-helpers.sh +++ b/scripts/all-helpers.sh @@ -67,15 +67,15 @@ helper_libtestdriver1_adjust_config() { scripts/config.py "$base_config" fi - # Enable PSA-based config (necessary to use drivers) - # MBEDTLS_PSA_CRYPTO_CONFIG is a legacy setting which should only be set on 3.6 LTS branches. if in_mbedtls_repo && in_3_6_branch; then + # Enable PSA-based config (necessary to use drivers) + # MBEDTLS_PSA_CRYPTO_CONFIG is a legacy setting which should only be set on 3.6 LTS branches. scripts/config.py set MBEDTLS_PSA_CRYPTO_CONFIG - fi - # Dynamic secure element support is a deprecated feature and needs to be disabled here. - # This is done to have the same form of psa_key_attributes_s for libdriver and library. - scripts/config.py unset MBEDTLS_PSA_CRYPTO_SE_C + # Dynamic secure element support is a deprecated feature and needs to be disabled here. + # This is done to have the same form of psa_key_attributes_s for libdriver and library. + scripts/config.py unset MBEDTLS_PSA_CRYPTO_SE_C + fi # If threading is enabled on the normal build, then we need to enable it in the drivers as well, # otherwise we will end up running multithreaded tests without mutexes to protect them. @@ -139,9 +139,11 @@ helper_psasim_config() { scripts/config.py full scripts/config.py unset MBEDTLS_PSA_CRYPTO_C scripts/config.py unset MBEDTLS_PSA_CRYPTO_STORAGE_C - # Dynamic secure element support is a deprecated feature and it is not - # available when CRYPTO_C and PSA_CRYPTO_STORAGE_C are disabled. - scripts/config.py unset MBEDTLS_PSA_CRYPTO_SE_C + 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. + scripts/config.py unset MBEDTLS_PSA_CRYPTO_SE_C + fi # Disable potentially problematic features scripts/config.py unset MBEDTLS_X509_RSASSA_PSS_SUPPORT scripts/config.py unset MBEDTLS_KEY_EXCHANGE_ECDHE_RSA_ENABLED @@ -151,8 +153,10 @@ helper_psasim_config() { else scripts/config.py crypto_full scripts/config.py unset MBEDTLS_PSA_CRYPTO_BUILTIN_KEYS - # We need to match the client with MBEDTLS_PSA_CRYPTO_SE_C - scripts/config.py unset MBEDTLS_PSA_CRYPTO_SE_C + if in_mbedtls_repo && in_3_6_branch; then + # We need to match the client with MBEDTLS_PSA_CRYPTO_SE_C + scripts/config.py unset MBEDTLS_PSA_CRYPTO_SE_C + fi # Also ensure MBEDTLS_PSA_CRYPTO_KEY_ID_ENCODES_OWNER not set (to match client) scripts/config.py unset MBEDTLS_PSA_CRYPTO_KEY_ID_ENCODES_OWNER fi