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_key.c

diff --git a/secure_fw/services/crypto/crypto_key.c b/secure_fw/services/crypto/crypto_key.c
index 91c272b..00cf946 100644
--- a/secure_fw/services/crypto/crypto_key.c
+++ b/secure_fw/services/crypto/crypto_key.c
@@ -28,7 +28,7 @@
     uint8_t in_use;          /*!< Flag to indicate if this in use */
 };
 
-#if (TFM_CRYPTO_KEY_MODULE_DISABLED == 0)
+#ifndef TFM_CRYPTO_KEY_MODULE_DISABLED
 static struct tfm_crypto_handle_owner_s
                                  handle_owner[TFM_CRYPTO_MAX_KEY_HANDLES] = {0};
 #endif
@@ -44,7 +44,7 @@
  *
  * \return Return values as described in \ref psa_status_t
  */
-#if (TFM_CRYPTO_KEY_MODULE_DISABLED == 0)
+#ifndef TFM_CRYPTO_KEY_MODULE_DISABLED
 static psa_status_t tfm_crypto_open_huk(psa_key_lifetime_t lifetime,
                                         psa_key_handle_t *key_handle)
 {
@@ -109,7 +109,7 @@
 psa_status_t tfm_crypto_check_handle_owner(psa_key_handle_t handle,
                                            uint32_t *index)
 {
-#if (TFM_CRYPTO_KEY_MODULE_DISABLED != 0)
+#ifdef TFM_CRYPTO_KEY_MODULE_DISABLED
     return PSA_ERROR_NOT_SUPPORTED;
 #else
     int32_t partition_id = 0;
@@ -143,7 +143,7 @@
                                      psa_outvec out_vec[],
                                      size_t out_len)
 {
-#if (TFM_CRYPTO_KEY_MODULE_DISABLED != 0)
+#ifdef TFM_CRYPTO_KEY_MODULE_DISABLED
     return PSA_ERROR_NOT_SUPPORTED;
 #else
     if ((in_len != 1) || (out_len != 1)) {
@@ -194,7 +194,7 @@
                                  psa_outvec out_vec[],
                                  size_t out_len)
 {
-#if (TFM_CRYPTO_KEY_MODULE_DISABLED != 0)
+#ifdef TFM_CRYPTO_KEY_MODULE_DISABLED
     return PSA_ERROR_NOT_SUPPORTED;
 #else
     if ((in_len != 2) || (out_len != 1)) {
@@ -228,7 +228,7 @@
                                   psa_outvec out_vec[],
                                   size_t out_len)
 {
-#if (TFM_CRYPTO_KEY_MODULE_DISABLED != 0)
+#ifdef TFM_CRYPTO_KEY_MODULE_DISABLED
     return PSA_ERROR_NOT_SUPPORTED;
 #else
     (void)out_vec;
@@ -267,7 +267,7 @@
                                    psa_outvec out_vec[],
                                    size_t out_len)
 {
-#if (TFM_CRYPTO_KEY_MODULE_DISABLED != 0)
+#ifdef TFM_CRYPTO_KEY_MODULE_DISABLED
     return PSA_ERROR_NOT_SUPPORTED;
 #else
     (void)out_vec;
@@ -300,7 +300,7 @@
                                     psa_outvec out_vec[],
                                     size_t out_len)
 {
-#if (TFM_CRYPTO_KEY_MODULE_DISABLED != 0)
+#ifdef TFM_CRYPTO_KEY_MODULE_DISABLED
     return PSA_ERROR_NOT_SUPPORTED;
 #else
     (void)out_vec;
@@ -339,7 +339,7 @@
                                             psa_outvec out_vec[],
                                             size_t out_len)
 {
-#if (TFM_CRYPTO_KEY_MODULE_DISABLED != 0)
+#ifdef TFM_CRYPTO_KEY_MODULE_DISABLED
     return PSA_ERROR_NOT_SUPPORTED;
 #else
     if ((in_len != 1) || (out_len != 2)) {
@@ -366,7 +366,7 @@
                                    psa_outvec out_vec[],
                                    size_t out_len)
 {
-#if (TFM_CRYPTO_KEY_MODULE_DISABLED != 0)
+#ifdef TFM_CRYPTO_KEY_MODULE_DISABLED
     return PSA_ERROR_NOT_SUPPORTED;
 #else
     if ((in_len != 1) || (out_len != 1)) {
@@ -391,7 +391,7 @@
                                           psa_outvec out_vec[],
                                           size_t out_len)
 {
-#if (TFM_CRYPTO_KEY_MODULE_DISABLED != 0)
+#ifdef TFM_CRYPTO_KEY_MODULE_DISABLED
     return PSA_ERROR_NOT_SUPPORTED;
 #else
     if ((in_len != 1) || (out_len != 1)) {
@@ -416,7 +416,7 @@
                                  psa_outvec out_vec[],
                                  size_t out_len)
 {
-#if (TFM_CRYPTO_KEY_MODULE_DISABLED != 0)
+#ifdef TFM_CRYPTO_KEY_MODULE_DISABLED
     return PSA_ERROR_NOT_SUPPORTED;
 #else
     (void)out_vec;
@@ -445,7 +445,7 @@
                                        psa_outvec out_vec[],
                                        size_t out_len)
 {
-#if (TFM_CRYPTO_KEY_MODULE_DISABLED != 0)
+#ifdef TFM_CRYPTO_KEY_MODULE_DISABLED
     return PSA_ERROR_NOT_SUPPORTED;
 #else
     (void)out_vec;
@@ -477,7 +477,7 @@
                                        psa_outvec out_vec[],
                                        size_t out_len)
 {
-#if (TFM_CRYPTO_KEY_MODULE_DISABLED != 0)
+#ifdef TFM_CRYPTO_KEY_MODULE_DISABLED
     return PSA_ERROR_NOT_SUPPORTED;
 #else
     if ((in_len != 1) || (out_len != 1)) {
@@ -502,7 +502,7 @@
                                          psa_outvec out_vec[],
                                          size_t out_len)
 {
-#if (TFM_CRYPTO_KEY_MODULE_DISABLED != 0)
+#ifdef TFM_CRYPTO_KEY_MODULE_DISABLED
     return PSA_ERROR_NOT_SUPPORTED;
 #else
     if ((in_len != 1) || (out_len != 1)) {