From cd21d4eb8fe0bbad753210172dd3133160dcc03a Mon Sep 17 00:00:00 2001 From: Valerio Setti Date: Thu, 28 Dec 2023 16:00:55 +0100 Subject: [PATCH] all.sh: keep legacy cipher modes enabled in test_full_block_cipher_legacy_dispatch() Signed-off-by: Valerio Setti --- tests/scripts/all.sh | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/tests/scripts/all.sh b/tests/scripts/all.sh index 4a3f721466..4377095376 100755 --- a/tests/scripts/all.sh +++ b/tests/scripts/all.sh @@ -3840,9 +3840,8 @@ common_block_cipher_dispatch() { # Disable cipher's modes and AEADs that, when not accelerated, cause # legacy key types to be re-enabled in "config_adjust_legacy_from_psa.h". - # Keep this also in the reference component in order to avoid re-enabling - # (in "config_adjust_legacy_from_psa.h") legacy cipher modes that were - # disabled in that component. + # Keep this also in the reference component in order to skip the same tests + # that were skipped in the accelerated one. scripts/config.py -f "$CRYPTO_CONFIG_H" unset PSA_WANT_ALG_CTR scripts/config.py -f "$CRYPTO_CONFIG_H" unset PSA_WANT_ALG_CFB scripts/config.py -f "$CRYPTO_CONFIG_H" unset PSA_WANT_ALG_OFB @@ -3901,11 +3900,6 @@ component_test_full_block_cipher_legacy_dispatch () { common_block_cipher_dispatch 0 - # Disable cipher modes other than ECB as in the accelerated component. ECB - # does not have a configuration symbol and it's automatically enabled as - # long as underlying key types are. - scripts/config.py unset-all MBEDTLS_CIPHER_MODE - make msg "test: full + legacy dispatch in block_cipher"