commit 96f802ea9d56e9ec3167862b77ac55293ec10c25
author Kevin Peng <kevin.peng@arm.com> Thu Dec 26 16:10:25 2019 +0800
committer Kevin Peng <kevin.peng@arm.com> Fri Dec 27 08:56:35 2019 +0000
tree 67af23c988cc5da43f41287a6c5ee4574d7c02ca
parent 8d11bd119f7f79eb29333be31a80a9a0c64f2fc2

Crypto: Refine how crypto modules are selected

Crypto modules can be only enable/disable by setting the
CRYPTO_XXX_MODULE_DISABLED to 0/1.
This patch refines how the modules are selected. With this patch,
the crypto modules can be enabled/disabled by setting the
CRYPTO_XXX_MODULE_DISABLED to 0/1, OFF/ON or FALSE/TRUE, not
limited to 0/1 anymore.

Change-Id: I4f5ea82805760883639950cd6031cbf658cb0bfc
Signed-off-by: Kevin Peng <kevin.peng@arm.com>

secure_fw/services/crypto/crypto_cipher.c

diff --git a/secure_fw/services/crypto/crypto_cipher.c b/secure_fw/services/crypto/crypto_cipher.c
index eb0c3a5..160069e 100644
--- a/secure_fw/services/crypto/crypto_cipher.c
+++ b/secure_fw/services/crypto/crypto_cipher.c
@@ -29,7 +29,7 @@
                                            psa_outvec out_vec[],
                                            size_t out_len)
 {
-#if (TFM_CRYPTO_CIPHER_MODULE_DISABLED != 0)
+#ifdef TFM_CRYPTO_CIPHER_MODULE_DISABLED
     return PSA_ERROR_NOT_SUPPORTED;
 #else
     psa_status_t status = PSA_SUCCESS;
@@ -79,7 +79,7 @@
                                       psa_outvec out_vec[],
                                       size_t out_len)
 {
-#if (TFM_CRYPTO_CIPHER_MODULE_DISABLED != 0)
+#ifdef TFM_CRYPTO_CIPHER_MODULE_DISABLED
     return PSA_ERROR_NOT_SUPPORTED;
 #else
     psa_status_t status = PSA_SUCCESS;
@@ -126,7 +126,7 @@
                                              psa_outvec out_vec[],
                                              size_t out_len)
 {
-#if (TFM_CRYPTO_CIPHER_MODULE_DISABLED != 0)
+#ifdef TFM_CRYPTO_CIPHER_MODULE_DISABLED
     return PSA_ERROR_NOT_SUPPORTED;
 #else
     psa_status_t status = PSA_SUCCESS;
@@ -177,7 +177,7 @@
                                              psa_outvec out_vec[],
                                              size_t out_len)
 {
-#if (TFM_CRYPTO_CIPHER_MODULE_DISABLED != 0)
+#ifdef TFM_CRYPTO_CIPHER_MODULE_DISABLED
     return PSA_ERROR_NOT_SUPPORTED;
 #else
     psa_status_t status = PSA_SUCCESS;
@@ -228,7 +228,7 @@
                                       psa_outvec out_vec[],
                                       size_t out_len)
 {
-#if (TFM_CRYPTO_CIPHER_MODULE_DISABLED != 0)
+#ifdef TFM_CRYPTO_CIPHER_MODULE_DISABLED
     return PSA_ERROR_NOT_SUPPORTED;
 #else
     psa_status_t status = PSA_SUCCESS;
@@ -281,7 +281,7 @@
                                       psa_outvec out_vec[],
                                       size_t out_len)
 {
-#if (TFM_CRYPTO_CIPHER_MODULE_DISABLED != 0)
+#ifdef TFM_CRYPTO_CIPHER_MODULE_DISABLED
     return PSA_ERROR_NOT_SUPPORTED;
 #else
     psa_status_t status = PSA_SUCCESS;
@@ -333,7 +333,7 @@
                                      psa_outvec out_vec[],
                                      size_t out_len)
 {
-#if (TFM_CRYPTO_CIPHER_MODULE_DISABLED != 0)
+#ifdef TFM_CRYPTO_CIPHER_MODULE_DISABLED
     return PSA_ERROR_NOT_SUPPORTED;
 #else
     psa_status_t status = PSA_SUCCESS;