From 981d7d67e1961c6b56bdfa3b0114e7502a4e3401 Mon Sep 17 00:00:00 2001 From: Minos Galanakis Date: Thu, 10 Oct 2024 02:16:12 +0100 Subject: [PATCH] test-suites: Replaced `NIST_KW_C` with `SSL_ALL_ALERT_MESSAGES` `MBEDTLS_NIST_KW_C` resides in tf-psa-crypto. This commit updates the tests using it to use `SSL_ALL_ALERT_MESSAGES` instead. Signed-off-by: Minos Galanakis --- tests/scripts/components-build-system.sh | 8 ++++---- tests/scripts/components-configuration.sh | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/tests/scripts/components-build-system.sh b/tests/scripts/components-build-system.sh index 8c921aac58..887bb8e909 100644 --- a/tests/scripts/components-build-system.sh +++ b/tests/scripts/components-build-system.sh @@ -190,11 +190,11 @@ component_build_cmake_custom_config_file () { msg "build: cmake with -DMBEDTLS_CONFIG_FILE + -DMBEDTLS_USER_CONFIG_FILE" # In the user config, disable one feature (for simplicity, pick a feature # that nothing else depends on). - echo '#undef MBEDTLS_NIST_KW_C' >user_config.h + echo '#undef MBEDTLS_SSL_ALL_ALERT_MESSAGES' >user_config.h cmake -DGEN_FILES=OFF -DMBEDTLS_CONFIG_FILE=full_config.h -DMBEDTLS_USER_CONFIG_FILE=user_config.h "$MBEDTLS_ROOT_DIR" make - not programs/test/query_compile_time_config MBEDTLS_NIST_KW_C + not programs/test/query_compile_time_config MBEDTLS_SSL_ALL_ALERT_MESSAGES rm -f user_config.h full_config.h full_crypto_config.h @@ -222,11 +222,11 @@ component_build_cmake_custom_config_file () { msg "build: cmake (in-tree) with -DMBEDTLS_CONFIG_FILE + -DMBEDTLS_USER_CONFIG_FILE" # In the user config, disable one feature (for simplicity, pick a feature # that nothing else depends on). - echo '#undef MBEDTLS_NIST_KW_C' >user_config.h + echo '#undef MBEDTLS_SSL_ALL_ALERT_MESSAGES' >user_config.h cmake -DGEN_FILES=OFF -DMBEDTLS_CONFIG_FILE=full_config.h -DMBEDTLS_PSA_CRYPTO_CONFIG_FILE=full_crypto_config.h -DMBEDTLS_USER_CONFIG_FILE=user_config.h . make - not programs/test/query_compile_time_config MBEDTLS_NIST_KW_C + not programs/test/query_compile_time_config MBEDTLS_SSL_ALL_ALERT_MESSAGES rm -f user_config.h full_config.h } diff --git a/tests/scripts/components-configuration.sh b/tests/scripts/components-configuration.sh index 4b7162ac3d..2210b09609 100644 --- a/tests/scripts/components-configuration.sh +++ b/tests/scripts/components-configuration.sh @@ -292,15 +292,15 @@ component_build_mbedtls_config_file () { echo '#error "MBEDTLS_CONFIG_FILE is not working"' >"$CONFIG_H" make CFLAGS="-I '$PWD' -DMBEDTLS_CONFIG_FILE='\"full_config.h\"'" # Make sure this feature is enabled. We'll disable it in the next phase. - programs/test/query_compile_time_config MBEDTLS_NIST_KW_C + programs/test/query_compile_time_config MBEDTLS_SSL_ALL_ALERT_MESSAGES make clean msg "build: make with MBEDTLS_CONFIG_FILE + MBEDTLS_USER_CONFIG_FILE" # In the user config, disable one feature (for simplicity, pick a feature # that nothing else depends on). - echo '#undef MBEDTLS_NIST_KW_C' >user_config.h + echo '#undef MBEDTLS_SSL_ALL_ALERT_MESSAGES' >user_config.h make CFLAGS="-I '$PWD' -DMBEDTLS_CONFIG_FILE='\"full_config.h\"' -DMBEDTLS_USER_CONFIG_FILE='\"user_config.h\"'" - not programs/test/query_compile_time_config MBEDTLS_NIST_KW_C + not programs/test/query_compile_time_config MBEDTLS_SSL_ALL_ALERT_MESSAGES rm -f user_config.h full_config.h }