From 46952048726871bce3c9038bb6cbaa0b042fa850 Mon Sep 17 00:00:00 2001 From: Ben Taylor Date: Thu, 13 Feb 2025 15:09:54 +0000 Subject: [PATCH 1/2] remove mbedtls_nist_kw_self_test from selftests Signed-off-by: Ben Taylor --- programs/test/selftest.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/programs/test/selftest.c b/programs/test/selftest.c index 546716f12d..4794cefd24 100644 --- a/programs/test/selftest.c +++ b/programs/test/selftest.c @@ -309,9 +309,6 @@ const selftest_t selftests[] = #if defined(MBEDTLS_CCM_C) && defined(MBEDTLS_AES_C) { "ccm", mbedtls_ccm_self_test }, #endif -#if defined(MBEDTLS_NIST_KW_C) && defined(MBEDTLS_AES_C) - { "nist_kw", mbedtls_nist_kw_self_test }, -#endif #if defined(MBEDTLS_CMAC_C) { "cmac", mbedtls_cmac_self_test }, #endif From 1948c943857968f27128f97006a49e840eaae943 Mon Sep 17 00:00:00 2001 From: Ben Taylor Date: Tue, 4 Mar 2025 09:11:11 +0000 Subject: [PATCH 2/2] added dependencies to test scripts Signed-off-by: Ben Taylor --- tests/scripts/components-configuration-crypto.sh | 3 +++ tests/scripts/depends.py | 1 + 2 files changed, 4 insertions(+) diff --git a/tests/scripts/components-configuration-crypto.sh b/tests/scripts/components-configuration-crypto.sh index cb66e371cb..bf537a9ccd 100644 --- a/tests/scripts/components-configuration-crypto.sh +++ b/tests/scripts/components-configuration-crypto.sh @@ -382,6 +382,9 @@ component_test_full_no_ccm_star_no_tag () { scripts/config.py -f "$CRYPTO_CONFIG_H" unset PSA_WANT_ALG_CFB scripts/config.py -f "$CRYPTO_CONFIG_H" unset PSA_WANT_ALG_OFB scripts/config.py -f "$CRYPTO_CONFIG_H" unset PSA_WANT_ALG_ECB_NO_PADDING + # NOTE unsettting PSA_WANT_ALG_ECB_NO_PADDING without unsetting NIST_KW_C will + # mean PSA_WANT_ALG_ECB_NO_PADDING is re-enabled, so disabling it also. + scripts/config.py -f "$CRYPTO_CONFIG_H" unset MBEDTLS_NIST_KW_C scripts/config.py -f "$CRYPTO_CONFIG_H" unset PSA_WANT_ALG_CBC_NO_PADDING scripts/config.py -f "$CRYPTO_CONFIG_H" unset PSA_WANT_ALG_CBC_PKCS7 diff --git a/tests/scripts/depends.py b/tests/scripts/depends.py index 816d2debae..5e025ba79b 100755 --- a/tests/scripts/depends.py +++ b/tests/scripts/depends.py @@ -350,6 +350,7 @@ REVERSE_DEPENDENCIES = { 'PSA_WANT_ALG_SHA3_256', 'PSA_WANT_ALG_SHA3_384', 'PSA_WANT_ALG_SHA3_512'], + 'PSA_WANT_ALG_ECB_NO_PADDING' : ['MBEDTLS_NIST_KW_C'], } # If an option is tested in an exclusive test, alter the following defines.