Crypto: If CC3XX_RUNTIME_ENABLED, do not test SHA-224 and RSA algorithms
As RSA is not yet supported into CC3XX and there is no fallback into
Mbed TLS SW usually, and SHA-224 is normally kept disabled
Signed-off-by: Antonio de Angelis <antonio.deangelis@arm.com>
Change-Id: Ibd7d2d4c1ea8b9f6a6e771c137140caf096de8d2
diff --git a/tests_reg/test/secure_fw/suites/crypto/non_secure/crypto_ns_interface_testsuite.c b/tests_reg/test/secure_fw/suites/crypto/non_secure/crypto_ns_interface_testsuite.c
index 941b320..3b7df98 100644
--- a/tests_reg/test/secure_fw/suites/crypto/non_secure/crypto_ns_interface_testsuite.c
+++ b/tests_reg/test/secure_fw/suites/crypto/non_secure/crypto_ns_interface_testsuite.c
@@ -29,7 +29,7 @@
#ifdef TFM_CRYPTO_TEST_UNSUPPORTED_ALG
static void tfm_crypto_test_1010(struct test_result_t *ret);
#endif /* TFM_CRYPTO_TEST_UNSUPPORTED_ALG */
-#ifdef TFM_CRYPTO_TEST_ALG_SHA_224
+#if defined(TFM_CRYPTO_TEST_ALG_SHA_224) && !defined(CC3XX_RUNTIME_ENABLED)
static void tfm_crypto_test_1011(struct test_result_t *ret);
#endif
static void tfm_crypto_test_1012(struct test_result_t *ret);
@@ -49,7 +49,7 @@
#ifdef TFM_CRYPTO_TEST_ALG_SHA_512
static void tfm_crypto_test_1022(struct test_result_t *ret);
#endif /* TFM_CRYPTO_TEST_ALG_SHA_512 */
-#ifdef TFM_CRYPTO_TEST_ALG_SHA_224
+#if defined(TFM_CRYPTO_TEST_ALG_SHA_224) && !defined(CC3XX_RUNTIME_ENABLED)
static void tfm_crypto_test_1024(struct test_result_t *ret);
#endif
#ifdef TFM_CRYPTO_TEST_ALG_CCM
@@ -106,7 +106,7 @@
static void tfm_crypto_test_1049(struct test_result_t *ret);
static void tfm_crypto_test_1052(struct test_result_t *ret);
#endif /* TFM_CRYPTO_TEST_ALG_CHACHA20_POLY1305 */
-#ifdef TFM_CRYPTO_TEST_ALG_RSASSA_PSS_VERIFICATION
+#if defined(TFM_CRYPTO_TEST_ALG_RSASSA_PSS_VERIFICATION) && !defined(CC3XX_RUNTIME_ENABLED)
static void tfm_crypto_test_1050(struct test_result_t *ret);
#endif /* TFM_CRYPTO_TEST_ALG_RSASSA_PSS_VERIFICATION */
#if defined(TFM_CRYPTO_TEST_SINGLE_PART_FUNCS)
@@ -147,7 +147,7 @@
{&tfm_crypto_test_1010, "TFM_NS_CRYPTO_TEST_1010",
"Non Secure Unsupported Hash (SHA-1) interface"},
#endif /* TFM_CRYPTO_TEST_UNSUPPORTED_ALG */
-#ifdef TFM_CRYPTO_TEST_ALG_SHA_224
+#if defined(TFM_CRYPTO_TEST_ALG_SHA_224) && !defined(CC3XX_RUNTIME_ENABLED)
{&tfm_crypto_test_1011, "TFM_NS_CRYPTO_TEST_1011",
"Non Secure Hash (SHA-224) interface"},
#endif
@@ -175,7 +175,7 @@
{&tfm_crypto_test_1022, "TFM_NS_CRYPTO_TEST_1022",
"Non Secure HMAC (SHA-512) interface"},
#endif /* TFM_CRYPTO_TEST_ALG_SHA_512 */
-#ifdef TFM_CRYPTO_TEST_ALG_SHA_224
+#if defined(TFM_CRYPTO_TEST_ALG_SHA_224) && !defined(CC3XX_RUNTIME_ENABLED)
{&tfm_crypto_test_1024, "TFM_NS_CRYPTO_TEST_1024",
"Non Secure HMAC with long key (SHA-224) interface"},
#endif
@@ -253,7 +253,7 @@
{&tfm_crypto_test_1049, "TFM_NS_CRYPTO_TEST_1049",
"Non Secure AEAD (CHACHA20-POLY1305) interface"},
#endif /* TFM_CRYPTO_TEST_ALG_CHACHA20_POLY1305 */
-#ifdef TFM_CRYPTO_TEST_ALG_RSASSA_PSS_VERIFICATION
+#if defined(TFM_CRYPTO_TEST_ALG_RSASSA_PSS_VERIFICATION) && !defined(CC3XX_RUNTIME_ENABLED)
{&tfm_crypto_test_1050, "TFM_NS_CRYPTO_TEST_1050",
"Non Secure RSASSA-PSS signature verification (RSASSA-PSS-SHA256)"},
#endif /* TFM_CRYPTO_TEST_ALG_RSASSA_PSS_VERIFICATION */
@@ -355,7 +355,7 @@
}
#endif /* TFM_CRYPTO_TEST_UNSUPPORTED_ALG */
-#ifdef TFM_CRYPTO_TEST_ALG_SHA_224
+#if defined(TFM_CRYPTO_TEST_ALG_SHA_224) && !defined(CC3XX_RUNTIME_ENABLED)
static void tfm_crypto_test_1011(struct test_result_t *ret)
{
psa_hash_test(PSA_ALG_SHA_224, ret);
@@ -411,7 +411,7 @@
}
#endif /* TFM_CRYPTO_TEST_ALG_SHA_512 */
-#ifdef TFM_CRYPTO_TEST_ALG_SHA_224
+#if defined(TFM_CRYPTO_TEST_ALG_SHA_224) && !defined(CC3XX_RUNTIME_ENABLED)
static void tfm_crypto_test_1024(struct test_result_t *ret)
{
psa_mac_test(PSA_ALG_HMAC(PSA_ALG_SHA_224),
@@ -664,7 +664,7 @@
}
#endif /* TFM_CRYPTO_TEST_ALG_CHACHA20_POLY1305 */
-#ifdef TFM_CRYPTO_TEST_ALG_RSASSA_PSS_VERIFICATION
+#if defined(TFM_CRYPTO_TEST_ALG_RSASSA_PSS_VERIFICATION) && !defined(CC3XX_RUNTIME_ENABLED)
static void tfm_crypto_test_1050(struct test_result_t *ret)
{
psa_verify_rsassa_pss_test(ret);
diff --git a/tests_reg/test/secure_fw/suites/crypto/secure/crypto_sec_interface_testsuite.c b/tests_reg/test/secure_fw/suites/crypto/secure/crypto_sec_interface_testsuite.c
index 5d81ac6..cf4b936 100644
--- a/tests_reg/test/secure_fw/suites/crypto/secure/crypto_sec_interface_testsuite.c
+++ b/tests_reg/test/secure_fw/suites/crypto/secure/crypto_sec_interface_testsuite.c
@@ -30,7 +30,7 @@
#ifdef TFM_CRYPTO_TEST_UNSUPPORTED_ALG
static void tfm_crypto_test_1010(struct test_result_t *ret);
#endif /* TFM_CRYPTO_TEST_UNSUPPORTED_ALG */
-#ifdef TFM_CRYPTO_TEST_ALG_SHA_224
+#if defined(TFM_CRYPTO_TEST_ALG_SHA_224) && !defined(CC3XX_RUNTIME_ENABLED)
static void tfm_crypto_test_1011(struct test_result_t *ret);
#endif
static void tfm_crypto_test_1012(struct test_result_t *ret);
@@ -50,7 +50,7 @@
#ifdef TFM_CRYPTO_TEST_ALG_SHA_512
static void tfm_crypto_test_1022(struct test_result_t *ret);
#endif /* TFM_CRYPTO_TEST_ALG_SHA_512 */
-#ifdef TFM_CRYPTO_TEST_ALG_SHA_224
+#if defined(TFM_CRYPTO_TEST_ALG_SHA_224) && !defined(CC3XX_RUNTIME_ENABLED)
static void tfm_crypto_test_1024(struct test_result_t *ret);
#endif
#ifdef TFM_CRYPTO_TEST_ALG_CCM
@@ -108,7 +108,7 @@
static void tfm_crypto_test_1050(struct test_result_t *ret);
static void tfm_crypto_test_1052(struct test_result_t *ret);
#endif /* TFM_CRYPTO_TEST_ALG_CHACHA20_POLY1305 */
-#ifdef TFM_CRYPTO_TEST_ALG_RSASSA_PSS_VERIFICATION
+#if defined(TFM_CRYPTO_TEST_ALG_RSASSA_PSS_VERIFICATION) && !defined(CC3XX_RUNTIME_ENABLED)
static void tfm_crypto_test_1053(struct test_result_t *ret);
#endif /* TFM_CRYPTO_TEST_ALG_RSASSA_PSS_VERIFICATION */
#if defined(TFM_CRYPTO_TEST_SINGLE_PART_FUNCS)
@@ -146,7 +146,7 @@
{&tfm_crypto_test_1010, "TFM_S_CRYPTO_TEST_1010",
"Secure Unsupported Hash (SHA-1) interface"},
#endif /* TFM_CRYPTO_TEST_UNSUPPORTED_ALG */
-#ifdef TFM_CRYPTO_TEST_ALG_SHA_224
+#if defined(TFM_CRYPTO_TEST_ALG_SHA_224) && !defined(CC3XX_RUNTIME_ENABLED)
{&tfm_crypto_test_1011, "TFM_S_CRYPTO_TEST_1011",
"Secure Hash (SHA-224) interface"},
#endif
@@ -174,7 +174,7 @@
{&tfm_crypto_test_1022, "TFM_S_CRYPTO_TEST_1022",
"Secure HMAC (SHA-512) interface"},
#endif /* TFM_CRYPTO_TEST_ALG_SHA_512 */
-#ifdef TFM_CRYPTO_TEST_ALG_SHA_224
+#if defined(TFM_CRYPTO_TEST_ALG_SHA_224) && !defined(CC3XX_RUNTIME_ENABLED)
{&tfm_crypto_test_1024, "TFM_S_CRYPTO_TEST_1024",
"Secure HMAC with long key (SHA-224) interface"},
#endif
@@ -262,7 +262,7 @@
{&tfm_crypto_test_1052, "TFM_S_CRYPTO_TEST_1052",
"Secure RFC7539 verification on Chacha20-Poly1305"},
#endif /* TFM_CRYPTO_TEST_ALG_CHACHA20_POLY1305 */
-#ifdef TFM_CRYPTO_TEST_ALG_RSASSA_PSS_VERIFICATION
+#if defined(TFM_CRYPTO_TEST_ALG_RSASSA_PSS_VERIFICATION) && !defined(CC3XX_RUNTIME_ENABLED)
{&tfm_crypto_test_1053, "TFM_S_CRYPTO_TEST_1053",
"Secure RSASSA-PSS signature verification (RSASSA-PSS-SHA256)"},
#endif /* TFM_CRYPTO_TEST_ALG_RSASSA_PSS_VERIFICATION */
@@ -352,7 +352,7 @@
}
#endif /* TFM_CRYPTO_TEST_UNSUPPORTED_ALG */
-#ifdef TFM_CRYPTO_TEST_ALG_SHA_224
+#if defined(TFM_CRYPTO_TEST_ALG_SHA_224) && !defined(CC3XX_RUNTIME_ENABLED)
static void tfm_crypto_test_1011(struct test_result_t *ret)
{
psa_hash_test(PSA_ALG_SHA_224, ret);
@@ -408,7 +408,7 @@
}
#endif /* TFM_CRYPTO_TEST_ALG_SHA_512 */
-#ifdef TFM_CRYPTO_TEST_ALG_SHA_224
+#if defined(TFM_CRYPTO_TEST_ALG_SHA_224) && !defined(CC3XX_RUNTIME_ENABLED)
static void tfm_crypto_test_1024(struct test_result_t *ret)
{
psa_mac_test(PSA_ALG_HMAC(PSA_ALG_SHA_224),
@@ -702,7 +702,7 @@
}
#endif /* TFM_CRYPTO_TEST_ALG_CHACHA20_POLY1305 */
-#ifdef TFM_CRYPTO_TEST_ALG_RSASSA_PSS_VERIFICATION
+#if defined(TFM_CRYPTO_TEST_ALG_RSASSA_PSS_VERIFICATION) && !defined(CC3XX_RUNTIME_ENABLED)
static void tfm_crypto_test_1053(struct test_result_t *ret)
{
psa_verify_rsassa_pss_test(ret);