From f561ed8b3a08b5f1e9521b4eb707521918b21802 Mon Sep 17 00:00:00 2001 From: Pengyu Lv Date: Tue, 14 Nov 2023 17:33:32 +0800 Subject: [PATCH 1/2] all.sh: enable compat.sh testing in psa_crypto_config_[accel/reference]_cipher_aead Signed-off-by: Pengyu Lv --- tests/scripts/all.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tests/scripts/all.sh b/tests/scripts/all.sh index cba98c551..a4f909dd6 100755 --- a/tests/scripts/all.sh +++ b/tests/scripts/all.sh @@ -3761,6 +3761,9 @@ component_test_psa_crypto_config_accel_cipher_aead () { msg "ssl-opt: crypto config with accelerated cipher and AEAD" tests/ssl-opt.sh + + msg "compat.sh: crypto config with accelerated cipher and AEAD" + tests/compat.sh -V NO -p mbedTLS } component_test_psa_crypto_config_reference_cipher_aead () { @@ -3774,6 +3777,9 @@ component_test_psa_crypto_config_reference_cipher_aead () { msg "ssl-opt: crypto config with non-accelerated cipher and AEAD" tests/ssl-opt.sh + + msg "compat.sh: crypto config with non-accelerated cipher and AEAD" + tests/compat.sh -V NO -p mbedTLS } component_test_aead_chachapoly_disabled() { From 7afd9a466310bac6b3effa19fcab5535f3acd614 Mon Sep 17 00:00:00 2001 From: Pengyu Lv Date: Thu, 16 Nov 2023 17:55:25 +0800 Subject: [PATCH 2/2] Change the test messages We are now testing driver-only cipher+aead with full config. Signed-off-by: Pengyu Lv --- tests/scripts/all.sh | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/tests/scripts/all.sh b/tests/scripts/all.sh index a4f909dd6..8df3df83c 100755 --- a/tests/scripts/all.sh +++ b/tests/scripts/all.sh @@ -3702,7 +3702,7 @@ common_psa_crypto_config_accel_cipher_aead() { # are meant to be used together in analyze_outcomes.py script in order to test # driver's coverage for ciphers and AEADs. component_test_psa_crypto_config_accel_cipher_aead () { - msg "build: crypto config with accelerated cipher and AEAD" + msg "build: full config with accelerated cipher and AEAD" loc_accel_list="ALG_ECB_NO_PADDING ALG_CBC_NO_PADDING ALG_CBC_PKCS7 ALG_CTR ALG_CFB \ ALG_OFB ALG_XTS ALG_STREAM_CIPHER \ @@ -3756,29 +3756,29 @@ component_test_psa_crypto_config_accel_cipher_aead () { # Run the tests # ------------- - msg "test: crypto config with accelerated cipher and AEAD" + msg "test: full config with accelerated cipher and AEAD" make test - msg "ssl-opt: crypto config with accelerated cipher and AEAD" + msg "ssl-opt: full config with accelerated cipher and AEAD" tests/ssl-opt.sh - msg "compat.sh: crypto config with accelerated cipher and AEAD" + msg "compat.sh: full config with accelerated cipher and AEAD" tests/compat.sh -V NO -p mbedTLS } component_test_psa_crypto_config_reference_cipher_aead () { - msg "build: crypto config with non-accelerated cipher and AEAD" + msg "build: full config with non-accelerated cipher and AEAD" common_psa_crypto_config_accel_cipher_aead make - msg "test: crypto config with non-accelerated cipher and AEAD" + msg "test: full config with non-accelerated cipher and AEAD" make test - msg "ssl-opt: crypto config with non-accelerated cipher and AEAD" + msg "ssl-opt: full config with non-accelerated cipher and AEAD" tests/ssl-opt.sh - msg "compat.sh: crypto config with non-accelerated cipher and AEAD" + msg "compat.sh: full config with non-accelerated cipher and AEAD" tests/compat.sh -V NO -p mbedTLS }