commit a2fc30478c9729fbc7330eebdb816a20f5e559bc
author Summer Qin <summer.qin@arm.com> Wed Jun 14 11:06:20 2023 +0800
committer David Hu <david.hu@arm.com> Wed Jun 28 09:58:06 2023 +0200
tree 503a4779e1232161c9c374192cfa55ebf64a7e3a
parent 379ceb069b1e3205e3419a0611f8fb4a69482532

Crypto: Refine SHA384 and SHA512 test config

SHA384 and SHA512 test is related with CC312_LEGACY_DRIVER_API_ENABLED.
While the original CC312_LEGACY_DRIVER_API_ENABLED setting is in platform cmake
which is after tf-m-test cmake, so CC312_LEGACY_DRIVER_API_ENABLED is not worked
as expected. Do this refinement to solve this issue.

Signed-off-by: Summer Qin <summer.qin@arm.com>
Change-Id: I74d4145fd3e75a34c36bbd2119ddac666541d621

test/config/default_test_config.cmake

diff --git a/test/config/default_test_config.cmake b/test/config/default_test_config.cmake
index cc4ffcf..452cca6 100644
--- a/test/config/default_test_config.cmake
+++ b/test/config/default_test_config.cmake
@@ -48,8 +48,13 @@
 set(TFM_CRYPTO_TEST_ALG_OFB                     ON       CACHE BOOL      "Test OFB cryptography mode")
 set(TFM_CRYPTO_TEST_ALG_GCM                     ON       CACHE BOOL      "Test GCM cryptography mode")
 set(TFM_CRYPTO_TEST_ALG_SHA_224                 ON       CACHE BOOL      "Test SHA-224 cryptography algorithm")
-set(TFM_CRYPTO_TEST_ALG_SHA_384                 ON       CACHE BOOL      "Test SHA-384 cryptography algorithm")
-set(TFM_CRYPTO_TEST_ALG_SHA_512                 ON       CACHE BOOL      "Test SHA-512 cryptography algorithm")
+if (NOT ${CC312_LEGACY_DRIVER_API_ENABLED})
+    set(TFM_CRYPTO_TEST_ALG_SHA_384             OFF      CACHE BOOL      "Test SHA-384 cryptography algorithm")
+    set(TFM_CRYPTO_TEST_ALG_SHA_512             OFF      CACHE BOOL      "Test SHA-512 cryptography algorithm")
+else()
+    set(TFM_CRYPTO_TEST_ALG_SHA_384             ON       CACHE BOOL      "Test SHA-384 cryptography algorithm")
+    set(TFM_CRYPTO_TEST_ALG_SHA_512             ON       CACHE BOOL      "Test SHA-512 cryptography algorithm")
+endif()
 set(TFM_CRYPTO_TEST_HKDF                        ON       CACHE BOOL      "Test the HKDF key derivation algorithm")
 set(TFM_CRYPTO_TEST_ECDH                        ON       CACHE BOOL      "Test the ECDH key agreement algorithm")
 set(TFM_CRYPTO_TEST_CHACHA20                    OFF      CACHE BOOL      "Test the ChaCha20 stream cipher")

test/config/profile/profile_large_test.cmake

diff --git a/test/config/profile/profile_large_test.cmake b/test/config/profile/profile_large_test.cmake
index f9117d1..afb1dcc 100644
--- a/test/config/profile/profile_large_test.cmake
+++ b/test/config/profile/profile_large_test.cmake
@@ -15,7 +15,11 @@
 set(TFM_CRYPTO_TEST_ALG_GCM                     ON      CACHE BOOL      "Test GCM cryptography mode")
 set(TFM_CRYPTO_TEST_ALG_SHA_224                 OFF     CACHE BOOL      "Test SHA-224 cryptography algorithm")
 set(TFM_CRYPTO_TEST_ALG_SHA_384                 OFF     CACHE BOOL      "Test SHA-384 cryptography algorithm")
-set(TFM_CRYPTO_TEST_ALG_SHA_512                 ON      CACHE BOOL      "Test SHA-512 cryptography algorithm")
+if (NOT ${CC312_LEGACY_DRIVER_API_ENABLED})
+    set(TFM_CRYPTO_TEST_ALG_SHA_512             OFF     CACHE BOOL      "Test SHA-512 cryptography algorithm")
+else()
+    set(TFM_CRYPTO_TEST_ALG_SHA_512             ON      CACHE BOOL      "Test SHA-512 cryptography algorithm")
+endif()
 set(TFM_CRYPTO_TEST_HKDF                        ON      CACHE BOOL      "Test the HKDF key derivation algorithm")
 set(TFM_CRYPTO_TEST_ECDH                        ON      CACHE BOOL      "Test the ECDH key agreement algorithm")
 set(TFM_CRYPTO_TEST_CHACHA20                    OFF     CACHE BOOL      "Test the ChaCha20 stream cipher")

test/secure_fw/suites/crypto/CMakeLists.txt

diff --git a/test/secure_fw/suites/crypto/CMakeLists.txt b/test/secure_fw/suites/crypto/CMakeLists.txt
index e9e55c1..02217ff 100644
--- a/test/secure_fw/suites/crypto/CMakeLists.txt
+++ b/test/secure_fw/suites/crypto/CMakeLists.txt
@@ -49,8 +49,8 @@
             $<$<BOOL:${TFM_CRYPTO_TEST_ALG_OFB}>:TFM_CRYPTO_TEST_ALG_OFB>
             $<$<BOOL:${TFM_CRYPTO_TEST_ALG_GCM}>:TFM_CRYPTO_TEST_ALG_GCM>
             $<$<BOOL:${TFM_CRYPTO_TEST_ALG_SHA_224}>:TFM_CRYPTO_TEST_ALG_SHA_224>
-            $<$<AND:$<BOOL:${TFM_CRYPTO_TEST_ALG_SHA_384}>,$<BOOL:${CC312_LEGACY_DRIVER_API_ENABLED}>>:TFM_CRYPTO_TEST_ALG_SHA_384>
-            $<$<AND:$<BOOL:${TFM_CRYPTO_TEST_ALG_SHA_512}>,$<BOOL:${CC312_LEGACY_DRIVER_API_ENABLED}>>:TFM_CRYPTO_TEST_ALG_SHA_512>
+            $<$<BOOL:${TFM_CRYPTO_TEST_ALG_SHA_384}>:TFM_CRYPTO_TEST_ALG_SHA_384>
+            $<$<BOOL:${TFM_CRYPTO_TEST_ALG_SHA_512}>:TFM_CRYPTO_TEST_ALG_SHA_512>
             $<$<BOOL:${TFM_CRYPTO_TEST_HKDF}>:TFM_CRYPTO_TEST_HKDF>
             $<$<BOOL:${TFM_CRYPTO_TEST_ECDH}>:TFM_CRYPTO_TEST_ECDH>
             $<$<BOOL:${TFM_CRYPTO_TEST_CHACHA20}>:TFM_CRYPTO_TEST_CHACHA20>
@@ -101,8 +101,8 @@
             $<$<BOOL:${TFM_CRYPTO_TEST_ALG_OFB}>:TFM_CRYPTO_TEST_ALG_OFB>
             $<$<BOOL:${TFM_CRYPTO_TEST_ALG_GCM}>:TFM_CRYPTO_TEST_ALG_GCM>
             $<$<BOOL:${TFM_CRYPTO_TEST_ALG_SHA_224}>:TFM_CRYPTO_TEST_ALG_SHA_224>
-            $<$<AND:$<BOOL:${TFM_CRYPTO_TEST_ALG_SHA_384}>,$<BOOL:${CC312_LEGACY_DRIVER_API_ENABLED}>>:TFM_CRYPTO_TEST_ALG_SHA_384>
-            $<$<AND:$<BOOL:${TFM_CRYPTO_TEST_ALG_SHA_512}>,$<BOOL:${CC312_LEGACY_DRIVER_API_ENABLED}>>:TFM_CRYPTO_TEST_ALG_SHA_512>
+            $<$<BOOL:${TFM_CRYPTO_TEST_ALG_SHA_384}>:TFM_CRYPTO_TEST_ALG_SHA_384>
+            $<$<BOOL:${TFM_CRYPTO_TEST_ALG_SHA_512}>:TFM_CRYPTO_TEST_ALG_SHA_512>
             $<$<BOOL:${TFM_CRYPTO_TEST_HKDF}>:TFM_CRYPTO_TEST_HKDF>
             $<$<BOOL:${TFM_CRYPTO_TEST_ECDH}>:TFM_CRYPTO_TEST_ECDH>
             $<$<BOOL:${TFM_CRYPTO_TEST_CHACHA20}>:TFM_CRYPTO_TEST_CHACHA20>