From efdb8261b9649e116113f57a9e77750a89608653 Mon Sep 17 00:00:00 2001 From: Valerio Setti Date: Thu, 14 Dec 2023 09:36:54 +0100 Subject: [PATCH] all.sh: keep CIPHER_C enabled in test_full_block_cipher_psa_dispatch() Signed-off-by: Valerio Setti --- tests/scripts/all.sh | 24 ------------------------ 1 file changed, 24 deletions(-) diff --git a/tests/scripts/all.sh b/tests/scripts/all.sh index 3f8ada36a2..464113c243 100755 --- a/tests/scripts/all.sh +++ b/tests/scripts/all.sh @@ -3836,27 +3836,6 @@ component_test_full_block_cipher_psa_dispatch () { # Start from the full config helper_libtestdriver1_adjust_config "full" - # Disable CIPHER_C because we want legacy GCM_C/CCM_C to use BLOCK_CIPHER_C. - scripts/config.py unset MBEDTLS_CIPHER_C - - # Disable unauthenticated ciphers which are not accelerated in this - # test component because their builtin support depends on CIPHER_C. - scripts/config.py -f $CRYPTO_CONFIG_H unset PSA_WANT_ALG_CCM_STAR_NO_TAG - scripts/config.py -f $CRYPTO_CONFIG_H unset PSA_WANT_ALG_CMAC - 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 - scripts/config.py -f $CRYPTO_CONFIG_H unset PSA_WANT_ALG_CFB - scripts/config.py -f $CRYPTO_CONFIG_H unset PSA_WANT_ALG_CTR - scripts/config.py -f $CRYPTO_CONFIG_H unset PSA_WANT_ALG_OFB - scripts/config.py -f $CRYPTO_CONFIG_H unset PSA_WANT_ALG_XTS - scripts/config.py -f $CRYPTO_CONFIG_H unset PSA_WANT_ALG_STREAM_CIPHER - - # Disable remaining direct dependencies on CIPHER_C. - scripts/config.py unset MBEDTLS_PKCS5_C - scripts/config.py unset MBEDTLS_PKCS12_C - scripts/config.py unset MBEDTLS_NIST_KW_C - scripts/config.py unset MBEDTLS_CMAC_C - # Build # ----- @@ -3864,9 +3843,6 @@ component_test_full_block_cipher_psa_dispatch () { helper_libtestdriver1_make_main "$loc_accel_list" - # Make sure cipher was not re-enabled by accident (additive config) - not grep mbedtls_cipher library/cipher.o - # Run the tests # -------------