Crypto: Set features with config header file
Signed-off-by: Xinyu Zhang <xinyu.zhang@arm.com>
Change-Id: Ib72c618d5df3a36b6ce79f87c7e0215d4ff1335b
diff --git a/test/secure_fw/suites/crypto/CMakeLists.txt b/test/secure_fw/suites/crypto/CMakeLists.txt
index 7818620..cf253fe 100644
--- a/test/secure_fw/suites/crypto/CMakeLists.txt
+++ b/test/secure_fw/suites/crypto/CMakeLists.txt
@@ -29,6 +29,7 @@
target_link_libraries(tfm_test_suite_crypto_ns
PRIVATE
+ tfm_config
tfm_test_framework_ns
)
@@ -51,7 +52,6 @@
$<$<AND:$<BOOL:${TFM_CRYPTO_TEST_ALG_SHA_512}>,$<BOOL:${CC312_LEGACY_DRIVER_API_ENABLED}>>:TFM_CRYPTO_TEST_ALG_SHA_512>
$<$<BOOL:${TFM_CRYPTO_TEST_HKDF}>:TFM_CRYPTO_TEST_HKDF>
$<$<BOOL:${TFM_CRYPTO_TEST_ECDH}>:TFM_CRYPTO_TEST_ECDH>
- $<$<NOT:$<BOOL:${CRYPTO_ASYM_ENCRYPT_MODULE_DISABLED}>>:TFM_CRYPTO_TEST_ASYM_ENCRYPT>
$<$<BOOL:${TFM_CRYPTO_TEST_CHACHA20}>:TFM_CRYPTO_TEST_CHACHA20>
$<$<BOOL:${TFM_CRYPTO_TEST_ALG_CHACHA20_POLY1305}>:TFM_CRYPTO_TEST_ALG_CHACHA20_POLY1305>
$<$<BOOL:${TFM_CRYPTO_TEST_ALG_RSASSA_PSS_VERIFICATION}>:TFM_CRYPTO_TEST_ALG_RSASSA_PSS_VERIFICATION>
@@ -78,6 +78,7 @@
target_link_libraries(tfm_test_suite_crypto_s
PRIVATE
+ tfm_config
tfm_test_framework_s
tfm_app_rot_partition_secure_client_2
platform_s
@@ -101,7 +102,6 @@
$<$<AND:$<BOOL:${TFM_CRYPTO_TEST_ALG_SHA_512}>,$<BOOL:${CC312_LEGACY_DRIVER_API_ENABLED}>>:TFM_CRYPTO_TEST_ALG_SHA_512>
$<$<BOOL:${TFM_CRYPTO_TEST_HKDF}>:TFM_CRYPTO_TEST_HKDF>
$<$<BOOL:${TFM_CRYPTO_TEST_ECDH}>:TFM_CRYPTO_TEST_ECDH>
- $<$<NOT:$<BOOL:${CRYPTO_ASYM_ENCRYPT_MODULE_DISABLED}>>:TFM_CRYPTO_TEST_ASYM_ENCRYPT>
$<$<BOOL:${TFM_CRYPTO_TEST_CHACHA20}>:TFM_CRYPTO_TEST_CHACHA20>
$<$<BOOL:${TFM_CRYPTO_TEST_ALG_CHACHA20_POLY1305}>:TFM_CRYPTO_TEST_ALG_CHACHA20_POLY1305>
$<$<BOOL:${TFM_CRYPTO_TEST_ALG_RSASSA_PSS_VERIFICATION}>:TFM_CRYPTO_TEST_ALG_RSASSA_PSS_VERIFICATION>
diff --git a/test/secure_fw/suites/crypto/non_secure/crypto_ns_interface_testsuite.c b/test/secure_fw/suites/crypto/non_secure/crypto_ns_interface_testsuite.c
index 02ad628..f61dd92 100644
--- a/test/secure_fw/suites/crypto/non_secure/crypto_ns_interface_testsuite.c
+++ b/test/secure_fw/suites/crypto/non_secure/crypto_ns_interface_testsuite.c
@@ -5,6 +5,7 @@
*
*/
+#include "config_crypto.h"
#include "test_framework_helpers.h"
#include "tfm_api.h"
#include "../crypto_tests_common.h"
@@ -70,11 +71,11 @@
#ifdef TFM_CRYPTO_TEST_ALG_ECB
static void tfm_crypto_test_1041(struct test_result_t *ret);
#endif /* TFM_CRYPTO_TEST_ALG_ECB */
-#ifdef TFM_CRYPTO_TEST_ASYM_ENCRYPT
+#if (!CRYPTO_ASYM_ENCRYPT_MODULE_DISABLED)
static void tfm_crypto_test_1042(struct test_result_t *ret);
static void tfm_crypto_test_1043(struct test_result_t *ret);
static void tfm_crypto_test_1044(struct test_result_t *ret);
-#endif /* TFM_CRYPTO_TEST_ASYM_ENCRYPT */
+#endif /* !CRYPTO_ASYM_ENCRYPT_MODULE_DISABLED */
#ifdef TFM_CRYPTO_TEST_ALG_CBC
static void tfm_crypto_test_1045(struct test_result_t *ret);
static void tfm_crypto_test_1046(struct test_result_t *ret);
@@ -181,14 +182,14 @@
{&tfm_crypto_test_1041, "TFM_NS_CRYPTO_TEST_1041",
"Non Secure Symmetric encryption (AES-128-ECB) interface"},
#endif /* TFM_CRYPTO_TEST_ALG_ECB */
-#ifdef TFM_CRYPTO_TEST_ASYM_ENCRYPT
+#if (!CRYPTO_ASYM_ENCRYPT_MODULE_DISABLED)
{&tfm_crypto_test_1042, "TFM_NS_CRYPTO_TEST_1042",
"Non Secure Asymmetric encryption interface (RSA-OAEP)"},
{&tfm_crypto_test_1043, "TFM_NS_CRYPTO_TEST_1043",
"Non Secure Asymmetric encryption interface (RSA-PKCS1V15)"},
{&tfm_crypto_test_1044, "TFM_NS_CRYPTO_TEST_1044",
"Non Secure Sign and verify message interface (ECDSA-SECP256R1-SHA256)"},
-#endif /* TFM_CRYPTO_TEST_ASYM_ENCRYPT */
+#endif /* !CRYPTO_ASYM_ENCRYPT_MODULE_DISABLED */
#ifdef TFM_CRYPTO_TEST_ALG_CBC
{&tfm_crypto_test_1045, "TFM_NS_CRYPTO_TEST_1045",
"Non Secure Symmetric encryption (AES-128-CBC-PKCS7) interface"},
@@ -427,7 +428,7 @@
}
#endif /* TFM_CRYPTO_TEST_ALG_ECB */
-#ifdef TFM_CRYPTO_TEST_ASYM_ENCRYPT
+#if (!CRYPTO_ASYM_ENCRYPT_MODULE_DISABLED)
static void tfm_crypto_test_1042(struct test_result_t *ret)
{
psa_asymmetric_encryption_test(PSA_ALG_RSA_OAEP(PSA_ALG_SHA_256), ret);
@@ -443,7 +444,7 @@
psa_sign_verify_message_test(
PSA_ALG_DETERMINISTIC_ECDSA(PSA_ALG_SHA_256), ret);
}
-#endif /* TFM_CRYPTO_TEST_ASYM_ENCRYPT */
+#endif /* !CRYPTO_ASYM_ENCRYPT_MODULE_DISABLED */
#ifdef TFM_CRYPTO_TEST_ALG_CBC
static void tfm_crypto_test_1045(struct test_result_t *ret)
diff --git a/test/secure_fw/suites/crypto/secure/crypto_sec_interface_testsuite.c b/test/secure_fw/suites/crypto/secure/crypto_sec_interface_testsuite.c
index b9df3e2..cec1c83 100644
--- a/test/secure_fw/suites/crypto/secure/crypto_sec_interface_testsuite.c
+++ b/test/secure_fw/suites/crypto/secure/crypto_sec_interface_testsuite.c
@@ -5,6 +5,7 @@
*
*/
+#include "config_crypto.h"
#include "test_framework_helpers.h"
#include "tfm_secure_client_2_api.h"
#include "tfm_api.h"
@@ -72,11 +73,11 @@
#ifdef TFM_CRYPTO_TEST_ALG_ECB
static void tfm_crypto_test_1042(struct test_result_t *ret);
#endif /* TFM_CRYPTO_TEST_ALG_ECB */
-#ifdef TFM_CRYPTO_TEST_ASYM_ENCRYPT
+#if (!CRYPTO_ASYM_ENCRYPT_MODULE_DISABLED)
static void tfm_crypto_test_1043(struct test_result_t *ret);
static void tfm_crypto_test_1044(struct test_result_t *ret);
static void tfm_crypto_test_1045(struct test_result_t *ret);
-#endif /* TFM_CRYPTO_TEST_ASYM_ENCRYPT */
+#endif /* !CRYPTO_ASYM_ENCRYPT_MODULE_DISABLED */
#ifdef TFM_CRYPTO_TEST_ALG_CBC
static void tfm_crypto_test_1046(struct test_result_t *ret);
static void tfm_crypto_test_1047(struct test_result_t *ret);
@@ -187,14 +188,14 @@
{&tfm_crypto_test_1042, "TFM_S_CRYPTO_TEST_1042",
"Secure Symmetric encryption (AES-128-ECB) interface"},
#endif /* TFM_CRYPTO_TEST_ALG_ECB */
-#ifdef TFM_CRYPTO_TEST_ASYM_ENCRYPT
+#if (!CRYPTO_ASYM_ENCRYPT_MODULE_DISABLED)
{&tfm_crypto_test_1043, "TFM_S_CRYPTO_TEST_1043",
"Secure Asymmetric encryption interface (RSA-OAEP)"},
{&tfm_crypto_test_1044, "TFM_S_CRYPTO_TEST_1044",
"Secure Asymmetric encryption interface (RSA-PKCS1V15)"},
{&tfm_crypto_test_1045, "TFM_S_CRYPTO_TEST_1045",
"Secure Sign and verify message interface (ECDSA-SECP256R1-SHA256)"},
-#endif /* TFM_CRYPTO_TEST_ASYM_ENCRYPT */
+#endif /* !CRYPTO_ASYM_ENCRYPT_MODULE_DISABLED */
#ifdef TFM_CRYPTO_TEST_ALG_CBC
{&tfm_crypto_test_1046, "TFM_S_CRYPTO_TEST_1046",
"Secure Symmetric encryption (AES-128-CBC-PKCS7) interface"},
@@ -481,7 +482,7 @@
}
#endif /* TFM_CRYPTO_TEST_ALG_ECB */
-#ifdef TFM_CRYPTO_TEST_ASYM_ENCRYPT
+#if (!CRYPTO_ASYM_ENCRYPT_MODULE_DISABLED)
static void tfm_crypto_test_1043(struct test_result_t *ret)
{
psa_asymmetric_encryption_test(PSA_ALG_RSA_OAEP(PSA_ALG_SHA_256), ret);
@@ -497,7 +498,7 @@
psa_sign_verify_message_test(
PSA_ALG_DETERMINISTIC_ECDSA(PSA_ALG_SHA_256), ret);
}
-#endif /* TFM_CRYPTO_TEST_ASYM_ENCRYPT */
+#endif /* !CRYPTO_ASYM_ENCRYPT_MODULE_DISABLED */
#ifdef TFM_CRYPTO_TEST_ALG_CBC
static void tfm_crypto_test_1046(struct test_result_t *ret)