Crypto: Change module configs from disable to enable
These crypto modules are usaually not disabled and
disbled configs are mostly not set or defined. To make
it easier configured and remind developers they are
enabled, especially for further Kconfig menu choices,
the enabled configs are more suitable.
Signed-off-by: Jianliang Shen <jianliang.shen@arm.com>
Change-Id: I27bc9972172b4154da193a461a70d85b844d8318
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 f61dd92..be2f5d8 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
@@ -71,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 */
-#if (!CRYPTO_ASYM_ENCRYPT_MODULE_DISABLED)
+#if CRYPTO_ASYM_ENCRYPT_MODULE_ENABLED
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 /* !CRYPTO_ASYM_ENCRYPT_MODULE_DISABLED */
+#endif /* CRYPTO_ASYM_ENCRYPT_MODULE_ENABLED */
#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);
@@ -182,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 */
-#if (!CRYPTO_ASYM_ENCRYPT_MODULE_DISABLED)
+#if CRYPTO_ASYM_ENCRYPT_MODULE_ENABLED
{&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 /* !CRYPTO_ASYM_ENCRYPT_MODULE_DISABLED */
+#endif /* CRYPTO_ASYM_ENCRYPT_MODULE_ENABLED */
#ifdef TFM_CRYPTO_TEST_ALG_CBC
{&tfm_crypto_test_1045, "TFM_NS_CRYPTO_TEST_1045",
"Non Secure Symmetric encryption (AES-128-CBC-PKCS7) interface"},
@@ -428,7 +428,7 @@
}
#endif /* TFM_CRYPTO_TEST_ALG_ECB */
-#if (!CRYPTO_ASYM_ENCRYPT_MODULE_DISABLED)
+#if CRYPTO_ASYM_ENCRYPT_MODULE_ENABLED
static void tfm_crypto_test_1042(struct test_result_t *ret)
{
psa_asymmetric_encryption_test(PSA_ALG_RSA_OAEP(PSA_ALG_SHA_256), ret);
@@ -444,7 +444,7 @@
psa_sign_verify_message_test(
PSA_ALG_DETERMINISTIC_ECDSA(PSA_ALG_SHA_256), ret);
}
-#endif /* !CRYPTO_ASYM_ENCRYPT_MODULE_DISABLED */
+#endif /* CRYPTO_ASYM_ENCRYPT_MODULE_ENABLED */
#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 cec1c83..bdbd682 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
@@ -73,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 */
-#if (!CRYPTO_ASYM_ENCRYPT_MODULE_DISABLED)
+#if CRYPTO_ASYM_ENCRYPT_MODULE_ENABLED
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 /* !CRYPTO_ASYM_ENCRYPT_MODULE_DISABLED */
+#endif /* CRYPTO_ASYM_ENCRYPT_MODULE_ENABLED */
#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);
@@ -188,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 */
-#if (!CRYPTO_ASYM_ENCRYPT_MODULE_DISABLED)
+#if CRYPTO_ASYM_ENCRYPT_MODULE_ENABLED
{&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 /* !CRYPTO_ASYM_ENCRYPT_MODULE_DISABLED */
+#endif /* CRYPTO_ASYM_ENCRYPT_MODULE_ENABLED */
#ifdef TFM_CRYPTO_TEST_ALG_CBC
{&tfm_crypto_test_1046, "TFM_S_CRYPTO_TEST_1046",
"Secure Symmetric encryption (AES-128-CBC-PKCS7) interface"},
@@ -482,7 +482,7 @@
}
#endif /* TFM_CRYPTO_TEST_ALG_ECB */
-#if (!CRYPTO_ASYM_ENCRYPT_MODULE_DISABLED)
+#if CRYPTO_ASYM_ENCRYPT_MODULE_ENABLED
static void tfm_crypto_test_1043(struct test_result_t *ret)
{
psa_asymmetric_encryption_test(PSA_ALG_RSA_OAEP(PSA_ALG_SHA_256), ret);
@@ -498,7 +498,7 @@
psa_sign_verify_message_test(
PSA_ALG_DETERMINISTIC_ECDSA(PSA_ALG_SHA_256), ret);
}
-#endif /* !CRYPTO_ASYM_ENCRYPT_MODULE_DISABLED */
+#endif /* CRYPTO_ASYM_ENCRYPT_MODULE_ENABLED */
#ifdef TFM_CRYPTO_TEST_ALG_CBC
static void tfm_crypto_test_1046(struct test_result_t *ret)