Crypto: Gate the Authenticator test with SINGLE_PART_FUNCS
Signed-off-by: Antonio de Angelis <antonio.deangelis@arm.com>
Change-Id: I4968e7d974ea68eed8212a368c0ed9d8d490565c
diff --git a/tests_reg/test/secure_fw/suites/crypto/crypto_tests_common.c b/tests_reg/test/secure_fw/suites/crypto/crypto_tests_common.c
index 2a70873..e86f30a 100644
--- a/tests_reg/test/secure_fw/suites/crypto/crypto_tests_common.c
+++ b/tests_reg/test/secure_fw/suites/crypto/crypto_tests_common.c
@@ -3300,6 +3300,7 @@
}
#endif /* TFM_CRYPTO_TEST_ALG_RSASSA_PSS_VERIFICATION */
+#if defined(TFM_CRYPTO_TEST_SINGLE_PART_FUNCS)
#if defined(TFM_CRYPTO_TEST_ALG_GCM) || defined(TFM_CRYPTO_TEST_ALG_CCM)
static const uint8_t cipher_tag_auth_test[][2][16] = {
{
@@ -3502,3 +3503,4 @@
return ret;
}
#endif /* TFM_CRYPTO_TEST_ALG_GCM || TFM_CRYPTO_TEST_ALG_CCM */
+#endif /* TFM_CRYPTO_TEST_SINGLE_PART_FUNCS */
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 36cbfea..1ea9657 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
@@ -108,9 +108,11 @@
#ifdef TFM_CRYPTO_TEST_ALG_RSASSA_PSS_VERIFICATION
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)
#if defined(TFM_CRYPTO_TEST_ALG_GCM) || defined(TFM_CRYPTO_TEST_ALG_CCM)
static void tfm_crypto_test_1054(struct test_result_t *ret);
#endif /* TFM_CRYPTO_TEST_ALG_GCM || TFM_CRYPTO_TEST_ALG_CCM */
+#endif /* TFM_CRYPTO_TEST_SINGLE_PART_FUNCS */
static struct test_t crypto_tests[] = {
{&tfm_crypto_test_1001, "TFM_NS_CRYPTO_TEST_1001",
@@ -257,10 +259,12 @@
{&tfm_crypto_test_1052, "TFM_NS_CRYPTO_TEST_1052",
"Non Secure RFC7539 verification on Chacha20-Poly1305"},
#endif /* TFM_CRYPTO_TEST_ALG_CHACHA20_POLY1305 */
+#if defined(TFM_CRYPTO_TEST_SINGLE_PART_FUNCS)
#if defined(TFM_CRYPTO_TEST_ALG_GCM) || defined(TFM_CRYPTO_TEST_ALG_CCM)
{&tfm_crypto_test_1054, "TFM_NS_CRYPTO_TEST_1054",
"Non Secure authenticator based on AEAD"},
#endif /* TFM_CRYPTO_TEST_ALG_GCM || TFM_CRYPTO_TEST_ALG_CCM */
+#endif /* TFM_CRYPTO_TEST_SINGLE_PART_FUNCS */
};
void register_testsuite_ns_crypto_interface(struct test_suite_t *p_test_suite)
@@ -567,6 +571,7 @@
}
#endif /* TFM_CRYPTO_TEST_ALG_RSASSA_PSS_VERIFICATION */
+#if defined(TFM_CRYPTO_TEST_SINGLE_PART_FUNCS)
#if defined(TFM_CRYPTO_TEST_ALG_GCM) || defined(TFM_CRYPTO_TEST_ALG_CCM)
static void tfm_crypto_test_1054(struct test_result_t *ret)
{
@@ -577,3 +582,4 @@
}
}
#endif /* TFM_CRYPTO_TEST_ALG_GCM || TFM_CRYPTO_TEST_ALG_CCM */
+#endif /* TFM_CRYPTO_TEST_SINGLE_PART_FUNCS */
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 16c92fc..b7c42c7 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
@@ -110,9 +110,11 @@
#ifdef TFM_CRYPTO_TEST_ALG_RSASSA_PSS_VERIFICATION
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)
#if defined(TFM_CRYPTO_TEST_ALG_GCM) || defined(TFM_CRYPTO_TEST_ALG_CCM)
static void tfm_crypto_test_1055(struct test_result_t *ret);
#endif /* TFM_CRYPTO_TEST_ALG_GCM || TFM_CRYPTO_TEST_ALG_CCM */
+#endif /* TFM_CRYPTO_TEST_SINGLE_PART_FUNCS */
static struct test_t crypto_tests[] = {
{&tfm_crypto_test_1001, "TFM_S_CRYPTO_TEST_1001",
@@ -261,10 +263,12 @@
{&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 */
+#if defined(TFM_CRYPTO_TEST_SINGLE_PART_FUNCS)
#if defined(TFM_CRYPTO_TEST_ALG_GCM) || defined(TFM_CRYPTO_TEST_ALG_CCM)
{&tfm_crypto_test_1055, "TFM_S_CRYPTO_TEST_1055",
"Secure authenticator based on AEAD"},
#endif /* TFM_CRYPTO_TEST_ALG_GCM || TFM_CRYPTO_TEST_ALG_CCM */
+#endif /* TFM_CRYPTO_TEST_SINGLE_PART_FUNCS */
};
void register_testsuite_s_crypto_interface(struct test_suite_t *p_test_suite)
@@ -611,6 +615,7 @@
}
#endif /* TFM_CRYPTO_TEST_ALG_RSASSA_PSS_VERIFICATION */
+#if defined(TFM_CRYPTO_TEST_SINGLE_PART_FUNCS)
#if defined(TFM_CRYPTO_TEST_ALG_GCM) || defined(TFM_CRYPTO_TEST_ALG_CCM)
static void tfm_crypto_test_1055(struct test_result_t *ret)
{
@@ -621,3 +626,4 @@
}
}
#endif /* TFM_CRYPTO_TEST_ALG_GCM || TFM_CRYPTO_TEST_ALG_CCM */
+#endif /* TFM_CRYPTO_TEST_SINGLE_PART_FUNCS */