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>
diff --git a/interface/src/tfm_crypto_ipc_api.c b/interface/src/tfm_crypto_ipc_api.c
index 21f7816..3bc7597 100644
--- a/interface/src/tfm_crypto_ipc_api.c
+++ b/interface/src/tfm_crypto_ipc_api.c
@@ -43,7 +43,7 @@
psa_status_t psa_allocate_key(psa_key_handle_t *handle)
{
-#if (TFM_CRYPTO_KEY_MODULE_DISABLED != 0)
+#ifdef TFM_CRYPTO_KEY_MODULE_DISABLED
return PSA_ERROR_NOT_SUPPORTED;
#else
psa_status_t status;
@@ -72,7 +72,7 @@
psa_key_id_t id,
psa_key_handle_t *handle)
{
-#if (TFM_CRYPTO_KEY_MODULE_DISABLED != 0)
+#ifdef TFM_CRYPTO_KEY_MODULE_DISABLED
return PSA_ERROR_NOT_SUPPORTED;
#else
psa_status_t status;
@@ -103,7 +103,7 @@
psa_key_id_t id,
psa_key_handle_t *handle)
{
-#if (TFM_CRYPTO_KEY_MODULE_DISABLED != 0)
+#ifdef TFM_CRYPTO_KEY_MODULE_DISABLED
return PSA_ERROR_NOT_SUPPORTED;
#else
(void)lifetime;
@@ -117,7 +117,7 @@
psa_status_t psa_close_key(psa_key_handle_t handle)
{
-#if (TFM_CRYPTO_KEY_MODULE_DISABLED != 0)
+#ifdef TFM_CRYPTO_KEY_MODULE_DISABLED
return PSA_ERROR_NOT_SUPPORTED;
#else
psa_status_t status;
@@ -145,7 +145,7 @@
const uint8_t *data,
size_t data_length)
{
-#if (TFM_CRYPTO_KEY_MODULE_DISABLED != 0)
+#ifdef TFM_CRYPTO_KEY_MODULE_DISABLED
return PSA_ERROR_NOT_SUPPORTED;
#else
psa_status_t status;
@@ -172,7 +172,7 @@
psa_status_t psa_destroy_key(psa_key_handle_t handle)
{
-#if (TFM_CRYPTO_KEY_MODULE_DISABLED != 0)
+#ifdef TFM_CRYPTO_KEY_MODULE_DISABLED
return PSA_ERROR_NOT_SUPPORTED;
#else
psa_status_t status;
@@ -199,7 +199,7 @@
psa_key_type_t *type,
size_t *bits)
{
-#if (TFM_CRYPTO_KEY_MODULE_DISABLED != 0)
+#ifdef TFM_CRYPTO_KEY_MODULE_DISABLED
return PSA_ERROR_NOT_SUPPORTED;
#else
psa_status_t status;
@@ -231,7 +231,7 @@
size_t data_size,
size_t *data_length)
{
-#if (TFM_CRYPTO_KEY_MODULE_DISABLED != 0)
+#ifdef TFM_CRYPTO_KEY_MODULE_DISABLED
return PSA_ERROR_NOT_SUPPORTED;
#else
psa_status_t status;
@@ -264,7 +264,7 @@
size_t data_size,
size_t *data_length)
{
-#if (TFM_CRYPTO_KEY_MODULE_DISABLED != 0)
+#ifdef TFM_CRYPTO_KEY_MODULE_DISABLED
return PSA_ERROR_NOT_SUPPORTED;
#else
psa_status_t status;
@@ -297,7 +297,7 @@
psa_key_handle_t target_handle,
const psa_key_policy_t *constraint)
{
-#if (TFM_CRYPTO_KEY_MODULE_DISABLED != 0)
+#ifdef TFM_CRYPTO_KEY_MODULE_DISABLED
return PSA_ERROR_NOT_SUPPORTED;
#else
psa_status_t status;
@@ -344,7 +344,7 @@
psa_status_t psa_set_key_policy(psa_key_handle_t handle,
const psa_key_policy_t *policy)
{
-#if (TFM_CRYPTO_KEY_MODULE_DISABLED != 0)
+#ifdef TFM_CRYPTO_KEY_MODULE_DISABLED
return PSA_ERROR_NOT_SUPPORTED;
#else
psa_status_t status;
@@ -372,7 +372,7 @@
psa_status_t psa_get_key_policy(psa_key_handle_t handle,
psa_key_policy_t *policy)
{
-#if (TFM_CRYPTO_KEY_MODULE_DISABLED != 0)
+#ifdef TFM_CRYPTO_KEY_MODULE_DISABLED
return PSA_ERROR_NOT_SUPPORTED;
#else
psa_status_t status;
@@ -402,7 +402,7 @@
psa_status_t psa_get_key_lifetime(psa_key_handle_t handle,
psa_key_lifetime_t *lifetime)
{
-#if (TFM_CRYPTO_KEY_MODULE_DISABLED != 0)
+#ifdef TFM_CRYPTO_KEY_MODULE_DISABLED
return PSA_ERROR_NOT_SUPPORTED;
#else
psa_status_t status;
@@ -434,7 +434,7 @@
size_t iv_size,
size_t *iv_length)
{
-#if (TFM_CRYPTO_CIPHER_MODULE_DISABLED != 0)
+#ifdef TFM_CRYPTO_CIPHER_MODULE_DISABLED
return PSA_ERROR_NOT_SUPPORTED;
#else
psa_status_t status;
@@ -468,7 +468,7 @@
const unsigned char *iv,
size_t iv_length)
{
-#if (TFM_CRYPTO_CIPHER_MODULE_DISABLED != 0)
+#ifdef TFM_CRYPTO_CIPHER_MODULE_DISABLED
return PSA_ERROR_NOT_SUPPORTED;
#else
psa_status_t status;
@@ -500,7 +500,7 @@
psa_key_handle_t handle,
psa_algorithm_t alg)
{
-#if (TFM_CRYPTO_CIPHER_MODULE_DISABLED != 0)
+#ifdef TFM_CRYPTO_CIPHER_MODULE_DISABLED
return PSA_ERROR_NOT_SUPPORTED;
#else
psa_status_t status;
@@ -533,7 +533,7 @@
psa_key_handle_t handle,
psa_algorithm_t alg)
{
-#if (TFM_CRYPTO_CIPHER_MODULE_DISABLED != 0)
+#ifdef TFM_CRYPTO_CIPHER_MODULE_DISABLED
return PSA_ERROR_NOT_SUPPORTED;
#else
psa_status_t status;
@@ -569,7 +569,7 @@
size_t output_size,
size_t *output_length)
{
-#if (TFM_CRYPTO_CIPHER_MODULE_DISABLED != 0)
+#ifdef TFM_CRYPTO_CIPHER_MODULE_DISABLED
return PSA_ERROR_NOT_SUPPORTED;
#else
psa_status_t status;
@@ -602,7 +602,7 @@
psa_status_t psa_cipher_abort(psa_cipher_operation_t *operation)
{
-#if (TFM_CRYPTO_CIPHER_MODULE_DISABLED != 0)
+#ifdef TFM_CRYPTO_CIPHER_MODULE_DISABLED
return PSA_ERROR_NOT_SUPPORTED;
#else
psa_status_t status;
@@ -634,7 +634,7 @@
size_t output_size,
size_t *output_length)
{
-#if (TFM_CRYPTO_CIPHER_MODULE_DISABLED != 0)
+#ifdef TFM_CRYPTO_CIPHER_MODULE_DISABLED
return PSA_ERROR_NOT_SUPPORTED;
#else
psa_status_t status;
@@ -667,7 +667,7 @@
psa_status_t psa_hash_setup(psa_hash_operation_t *operation,
psa_algorithm_t alg)
{
-#if (TFM_CRYPTO_HASH_MODULE_DISABLED != 0)
+#ifdef TFM_CRYPTO_HASH_MODULE_DISABLED
return PSA_ERROR_NOT_SUPPORTED;
#else
psa_status_t status;
@@ -699,7 +699,7 @@
const uint8_t *input,
size_t input_length)
{
-#if (TFM_CRYPTO_HASH_MODULE_DISABLED != 0)
+#ifdef TFM_CRYPTO_HASH_MODULE_DISABLED
return PSA_ERROR_NOT_SUPPORTED;
#else
psa_status_t status;
@@ -732,7 +732,7 @@
size_t hash_size,
size_t *hash_length)
{
-#if (TFM_CRYPTO_HASH_MODULE_DISABLED != 0)
+#ifdef TFM_CRYPTO_HASH_MODULE_DISABLED
return PSA_ERROR_NOT_SUPPORTED;
#else
psa_status_t status;
@@ -766,7 +766,7 @@
const uint8_t *hash,
size_t hash_length)
{
-#if (TFM_CRYPTO_HASH_MODULE_DISABLED != 0)
+#ifdef TFM_CRYPTO_HASH_MODULE_DISABLED
return PSA_ERROR_NOT_SUPPORTED;
#else
psa_status_t status;
@@ -796,7 +796,7 @@
psa_status_t psa_hash_abort(psa_hash_operation_t *operation)
{
-#if (TFM_CRYPTO_HASH_MODULE_DISABLED != 0)
+#ifdef TFM_CRYPTO_HASH_MODULE_DISABLED
return PSA_ERROR_NOT_SUPPORTED;
#else
psa_status_t status;
@@ -826,7 +826,7 @@
psa_status_t psa_hash_clone(const psa_hash_operation_t *source_operation,
psa_hash_operation_t *target_operation)
{
-#if (TFM_CRYPTO_HASH_MODULE_DISABLED != 0)
+#ifdef TFM_CRYPTO_HASH_MODULE_DISABLED
return PSA_ERROR_NOT_SUPPORTED;
#else
psa_status_t status;
@@ -857,7 +857,7 @@
psa_key_handle_t handle,
psa_algorithm_t alg)
{
-#if (TFM_CRYPTO_MAC_MODULE_DISABLED != 0)
+#ifdef TFM_CRYPTO_MAC_MODULE_DISABLED
return PSA_ERROR_NOT_SUPPORTED;
#else
psa_status_t status;
@@ -890,7 +890,7 @@
psa_key_handle_t handle,
psa_algorithm_t alg)
{
-#if (TFM_CRYPTO_MAC_MODULE_DISABLED != 0)
+#ifdef TFM_CRYPTO_MAC_MODULE_DISABLED
return PSA_ERROR_NOT_SUPPORTED;
#else
psa_status_t status;
@@ -923,7 +923,7 @@
const uint8_t *input,
size_t input_length)
{
-#if (TFM_CRYPTO_MAC_MODULE_DISABLED != 0)
+#ifdef TFM_CRYPTO_MAC_MODULE_DISABLED
return PSA_ERROR_NOT_SUPPORTED;
#else
psa_status_t status;
@@ -956,7 +956,7 @@
size_t mac_size,
size_t *mac_length)
{
-#if (TFM_CRYPTO_MAC_MODULE_DISABLED != 0)
+#ifdef TFM_CRYPTO_MAC_MODULE_DISABLED
return PSA_ERROR_NOT_SUPPORTED;
#else
psa_status_t status;
@@ -990,7 +990,7 @@
const uint8_t *mac,
size_t mac_length)
{
-#if (TFM_CRYPTO_MAC_MODULE_DISABLED != 0)
+#ifdef TFM_CRYPTO_MAC_MODULE_DISABLED
return PSA_ERROR_NOT_SUPPORTED;
#else
psa_status_t status;
@@ -1020,7 +1020,7 @@
psa_status_t psa_mac_abort(psa_mac_operation_t *operation)
{
-#if (TFM_CRYPTO_MAC_MODULE_DISABLED != 0)
+#ifdef TFM_CRYPTO_MAC_MODULE_DISABLED
return PSA_ERROR_NOT_SUPPORTED;
#else
psa_status_t status;
@@ -1059,7 +1059,7 @@
size_t ciphertext_size,
size_t *ciphertext_length)
{
-#if (TFM_CRYPTO_AEAD_MODULE_DISABLED != 0)
+#ifdef TFM_CRYPTO_AEAD_MODULE_DISABLED
return PSA_ERROR_NOT_SUPPORTED;
#else
psa_status_t status;
@@ -1124,7 +1124,7 @@
size_t plaintext_size,
size_t *plaintext_length)
{
-#if (TFM_CRYPTO_AEAD_MODULE_DISABLED != 0)
+#ifdef TFM_CRYPTO_AEAD_MODULE_DISABLED
return PSA_ERROR_NOT_SUPPORTED;
#else
psa_status_t status;
@@ -1185,7 +1185,7 @@
size_t signature_size,
size_t *signature_length)
{
-#if (TFM_CRYPTO_ASYMMETRIC_MODULE_DISABLED != 0)
+#ifdef TFM_CRYPTO_ASYMMETRIC_MODULE_DISABLED
return PSA_ERROR_NOT_SUPPORTED;
#else
psa_status_t status;
@@ -1223,7 +1223,7 @@
const uint8_t *signature,
size_t signature_length)
{
-#if (TFM_CRYPTO_ASYMMETRIC_MODULE_DISABLED != 0)
+#ifdef TFM_CRYPTO_ASYMMETRIC_MODULE_DISABLED
return PSA_ERROR_NOT_SUPPORTED;
#else
psa_status_t status;
@@ -1260,7 +1260,7 @@
size_t output_size,
size_t *output_length)
{
-#if (TFM_CRYPTO_ASYMMETRIC_MODULE_DISABLED != 0)
+#ifdef TFM_CRYPTO_ASYMMETRIC_MODULE_DISABLED
return PSA_ERROR_NOT_SUPPORTED;
#else
psa_status_t status;
@@ -1312,7 +1312,7 @@
size_t output_size,
size_t *output_length)
{
-#if (TFM_CRYPTO_ASYMMETRIC_MODULE_DISABLED != 0)
+#ifdef TFM_CRYPTO_ASYMMETRIC_MODULE_DISABLED
return PSA_ERROR_NOT_SUPPORTED;
#else
psa_status_t status;
@@ -1357,7 +1357,7 @@
psa_status_t psa_get_generator_capacity(const psa_crypto_generator_t *generator,
size_t *capacity)
{
-#if (TFM_CRYPTO_GENERATOR_MODULE_DISABLED != 0)
+#ifdef TFM_CRYPTO_GENERATOR_MODULE_DISABLED
return PSA_ERROR_NOT_SUPPORTED;
#else
psa_status_t status;
@@ -1389,7 +1389,7 @@
uint8_t *output,
size_t output_length)
{
-#if (TFM_CRYPTO_GENERATOR_MODULE_DISABLED != 0)
+#ifdef TFM_CRYPTO_GENERATOR_MODULE_DISABLED
return PSA_ERROR_NOT_SUPPORTED;
#else
psa_status_t status;
@@ -1422,7 +1422,7 @@
size_t bits,
psa_crypto_generator_t *generator)
{
-#if (TFM_CRYPTO_GENERATOR_MODULE_DISABLED != 0)
+#ifdef TFM_CRYPTO_GENERATOR_MODULE_DISABLED
return PSA_ERROR_NOT_SUPPORTED;
#else
psa_status_t status;
@@ -1451,7 +1451,7 @@
psa_status_t psa_generator_abort(psa_crypto_generator_t *generator)
{
-#if (TFM_CRYPTO_GENERATOR_MODULE_DISABLED != 0)
+#ifdef TFM_CRYPTO_GENERATOR_MODULE_DISABLED
return PSA_ERROR_NOT_SUPPORTED;
#else
psa_status_t status;
@@ -1488,7 +1488,7 @@
size_t label_length,
size_t capacity)
{
-#if (TFM_CRYPTO_GENERATOR_MODULE_DISABLED != 0)
+#ifdef TFM_CRYPTO_GENERATOR_MODULE_DISABLED
return PSA_ERROR_NOT_SUPPORTED;
#else
psa_status_t status;
@@ -1543,7 +1543,7 @@
size_t peer_key_length,
psa_algorithm_t alg)
{
-#if (TFM_CRYPTO_GENERATOR_MODULE_DISABLED != 0)
+#ifdef TFM_CRYPTO_GENERATOR_MODULE_DISABLED
return PSA_ERROR_NOT_SUPPORTED;
#else
psa_status_t status;
@@ -1577,7 +1577,7 @@
psa_status_t psa_generate_random(uint8_t *output,
size_t output_size)
{
-#if (TFM_CRYPTO_GENERATOR_MODULE_DISABLED != 0)
+#ifdef TFM_CRYPTO_GENERATOR_MODULE_DISABLED
return PSA_ERROR_NOT_SUPPORTED;
#else
psa_status_t status;
@@ -1614,7 +1614,7 @@
const void *extra,
size_t extra_size)
{
-#if (TFM_CRYPTO_GENERATOR_MODULE_DISABLED != 0)
+#ifdef TFM_CRYPTO_GENERATOR_MODULE_DISABLED
return PSA_ERROR_NOT_SUPPORTED;
#else
psa_status_t status;
diff --git a/secure_fw/services/crypto/CMakeLists.txt b/secure_fw/services/crypto/CMakeLists.txt
index f7d7135..1d2d884 100644
--- a/secure_fw/services/crypto/CMakeLists.txt
+++ b/secure_fw/services/crypto/CMakeLists.txt
@@ -54,13 +54,28 @@
endif()
#Add module configuration parameters in case they are provided during CMake configuration step
-list(APPEND TFM_CRYPTO_C_DEFINES_LIST TFM_CRYPTO_KEY_MODULE_DISABLED=${CRYPTO_KEY_MODULE_DISABLED}
- TFM_CRYPTO_AEAD_MODULE_DISABLED=${CRYPTO_AEAD_MODULE_DISABLED}
- TFM_CRYPTO_MAC_MODULE_DISABLED=${CRYPTO_MAC_MODULE_DISABLED}
- TFM_CRYPTO_CIPHER_MODULE_DISABLED=${CRYPTO_CIPHER_MODULE_DISABLED}
- TFM_CRYPTO_HASH_MODULE_DISABLED=${CRYPTO_HASH_MODULE_DISABLED}
- TFM_CRYPTO_GENERATOR_MODULE_DISABLED=${CRYPTO_GENERATOR_MODULE_DISABLED}
- TFM_CRYPTO_ASYMMETRIC_MODULE_DISABLED=${CRYPTO_ASYMMETRIC_MODULE_DISABLED})
+if (CRYPTO_KEY_MODULE_DISABLED)
+ list(APPEND TFM_CRYPTO_C_DEFINES_LIST TFM_CRYPTO_KEY_MODULE_DISABLED)
+endif()
+if (CRYPTO_AEAD_MODULE_DISABLED)
+ list(APPEND TFM_CRYPTO_C_DEFINES_LIST TFM_CRYPTO_AEAD_MODULE_DISABLED)
+endif()
+if (CRYPTO_MAC_MODULE_DISABLED)
+ list(APPEND TFM_CRYPTO_C_DEFINES_LIST TFM_CRYPTO_MAC_MODULE_DISABLED)
+endif()
+if (CRYPTO_CIPHER_MODULE_DISABLED)
+ list(APPEND TFM_CRYPTO_C_DEFINES_LIST TFM_CRYPTO_CIPHER_MODULE_DISABLED)
+endif()
+if (CRYPTO_HASH_MODULE_DISABLED)
+ list(APPEND TFM_CRYPTO_C_DEFINES_LIST TFM_CRYPTO_HASH_MODULE_DISABLED)
+endif()
+if (CRYPTO_GENERATOR_MODULE_DISABLED)
+ list(APPEND TFM_CRYPTO_C_DEFINES_LIST TFM_CRYPTO_GENERATOR_MODULE_DISABLED)
+endif()
+if (CRYPTO_ASYMMETRIC_MODULE_DISABLED)
+ list(APPEND TFM_CRYPTO_C_DEFINES_LIST TFM_CRYPTO_ASYMMETRIC_MODULE_DISABLED)
+endif()
+
if (DEFINED CRYPTO_ENGINE_BUF_SIZE)
list(APPEND TFM_CRYPTO_C_DEFINES_LIST TFM_CRYPTO_ENGINE_BUF_SIZE=${CRYPTO_ENGINE_BUF_SIZE})
endif()
diff --git a/secure_fw/services/crypto/crypto_aead.c b/secure_fw/services/crypto/crypto_aead.c
index 80fc205..be85c92 100644
--- a/secure_fw/services/crypto/crypto_aead.c
+++ b/secure_fw/services/crypto/crypto_aead.c
@@ -29,7 +29,7 @@
psa_outvec out_vec[],
size_t out_len)
{
-#if (TFM_CRYPTO_AEAD_MODULE_DISABLED != 0)
+#ifdef TFM_CRYPTO_AEAD_MODULE_DISABLED
return PSA_ERROR_NOT_SUPPORTED;
#else
psa_status_t status = PSA_SUCCESS;
@@ -81,7 +81,7 @@
psa_outvec out_vec[],
size_t out_len)
{
-#if (TFM_CRYPTO_AEAD_MODULE_DISABLED != 0)
+#ifdef TFM_CRYPTO_AEAD_MODULE_DISABLED
return PSA_ERROR_NOT_SUPPORTED;
#else
psa_status_t status = PSA_SUCCESS;
diff --git a/secure_fw/services/crypto/crypto_asymmetric.c b/secure_fw/services/crypto/crypto_asymmetric.c
index 78932ea..bfca546 100644
--- a/secure_fw/services/crypto/crypto_asymmetric.c
+++ b/secure_fw/services/crypto/crypto_asymmetric.c
@@ -29,7 +29,7 @@
psa_outvec out_vec[],
size_t out_len)
{
-#if (TFM_CRYPTO_ASYMMETRIC_MODULE_DISABLED != 0)
+#ifdef TFM_CRYPTO_ASYMMETRIC_MODULE_DISABLED
return PSA_ERROR_NOT_SUPPORTED;
#else
if ((in_len != 2) || (out_len != 1)) {
@@ -63,7 +63,7 @@
psa_outvec out_vec[],
size_t out_len)
{
-#if (TFM_CRYPTO_ASYMMETRIC_MODULE_DISABLED != 0)
+#ifdef TFM_CRYPTO_ASYMMETRIC_MODULE_DISABLED
return PSA_ERROR_NOT_SUPPORTED;
#else
if ((in_len != 3) || (out_len != 0)) {
@@ -97,7 +97,7 @@
psa_outvec out_vec[],
size_t out_len)
{
-#if (TFM_CRYPTO_ASYMMETRIC_MODULE_DISABLED != 0)
+#ifdef TFM_CRYPTO_ASYMMETRIC_MODULE_DISABLED
return PSA_ERROR_NOT_SUPPORTED;
#else
psa_status_t status;
@@ -153,7 +153,7 @@
psa_outvec out_vec[],
size_t out_len)
{
-#if (TFM_CRYPTO_ASYMMETRIC_MODULE_DISABLED != 0)
+#ifdef TFM_CRYPTO_ASYMMETRIC_MODULE_DISABLED
return PSA_ERROR_NOT_SUPPORTED;
#else
if (!((in_len == 2) || (in_len == 3)) || (out_len != 1)) {
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;
diff --git a/secure_fw/services/crypto/crypto_generator.c b/secure_fw/services/crypto/crypto_generator.c
index 235c788..3284d7d 100644
--- a/secure_fw/services/crypto/crypto_generator.c
+++ b/secure_fw/services/crypto/crypto_generator.c
@@ -46,7 +46,7 @@
*
* \return Return values as described in \ref psa_status_t
*/
-#if (TFM_CRYPTO_GENERATOR_MODULE_DISABLED == 0)
+#ifndef TFM_CRYPTO_GENERATOR_MODULE_DISABLED
static psa_status_t tfm_crypto_huk_derivation(psa_crypto_generator_t *generator,
psa_key_handle_t key_handle,
const uint8_t *salt,
@@ -138,7 +138,7 @@
psa_outvec out_vec[],
size_t out_len)
{
-#if (TFM_CRYPTO_GENERATOR_MODULE_DISABLED != 0)
+#ifdef TFM_CRYPTO_GENERATOR_MODULE_DISABLED
return PSA_ERROR_NOT_SUPPORTED;
#else
psa_status_t status;
@@ -174,7 +174,7 @@
psa_outvec out_vec[],
size_t out_len)
{
-#if (TFM_CRYPTO_GENERATOR_MODULE_DISABLED != 0)
+#ifdef TFM_CRYPTO_GENERATOR_MODULE_DISABLED
return PSA_ERROR_NOT_SUPPORTED;
#else
psa_status_t status;
@@ -209,7 +209,7 @@
psa_outvec out_vec[],
size_t out_len)
{
-#if (TFM_CRYPTO_GENERATOR_MODULE_DISABLED != 0)
+#ifdef TFM_CRYPTO_GENERATOR_MODULE_DISABLED
return PSA_ERROR_NOT_SUPPORTED;
#else
psa_status_t status;
@@ -251,7 +251,7 @@
psa_outvec out_vec[],
size_t out_len)
{
-#if (TFM_CRYPTO_GENERATOR_MODULE_DISABLED != 0)
+#ifdef TFM_CRYPTO_GENERATOR_MODULE_DISABLED
return PSA_ERROR_NOT_SUPPORTED;
#else
psa_status_t status;
@@ -301,7 +301,7 @@
psa_outvec out_vec[],
size_t out_len)
{
-#if (TFM_CRYPTO_GENERATOR_MODULE_DISABLED != 0)
+#ifdef TFM_CRYPTO_GENERATOR_MODULE_DISABLED
return PSA_ERROR_NOT_SUPPORTED;
#else
psa_status_t status;
@@ -380,7 +380,7 @@
psa_outvec out_vec[],
size_t out_len)
{
-#if (TFM_CRYPTO_GENERATOR_MODULE_DISABLED != 0)
+#ifdef TFM_CRYPTO_GENERATOR_MODULE_DISABLED
return PSA_ERROR_NOT_SUPPORTED;
#else
psa_status_t status;
@@ -433,7 +433,7 @@
psa_outvec out_vec[],
size_t out_len)
{
-#if (TFM_CRYPTO_GENERATOR_MODULE_DISABLED != 0)
+#ifdef TFM_CRYPTO_GENERATOR_MODULE_DISABLED
return PSA_ERROR_NOT_SUPPORTED;
#else
if ((in_len != 1) || (out_len != 1)) {
@@ -455,7 +455,7 @@
psa_outvec out_vec[],
size_t out_len)
{
-#if (TFM_CRYPTO_GENERATOR_MODULE_DISABLED != 0)
+#ifdef TFM_CRYPTO_GENERATOR_MODULE_DISABLED
return PSA_ERROR_NOT_SUPPORTED;
#else
if (!((in_len == 2) || (in_len == 3)) || (out_len != 0)) {
diff --git a/secure_fw/services/crypto/crypto_hash.c b/secure_fw/services/crypto/crypto_hash.c
index 42e8a2b..97d7ad2 100644
--- a/secure_fw/services/crypto/crypto_hash.c
+++ b/secure_fw/services/crypto/crypto_hash.c
@@ -29,7 +29,7 @@
psa_outvec out_vec[],
size_t out_len)
{
-#if (TFM_CRYPTO_HASH_MODULE_DISABLED != 0)
+#ifdef TFM_CRYPTO_HASH_MODULE_DISABLED
return PSA_ERROR_NOT_SUPPORTED;
#else
psa_status_t status = PSA_SUCCESS;
@@ -77,7 +77,7 @@
psa_outvec out_vec[],
size_t out_len)
{
-#if (TFM_CRYPTO_HASH_MODULE_DISABLED != 0)
+#ifdef TFM_CRYPTO_HASH_MODULE_DISABLED
return PSA_ERROR_NOT_SUPPORTED;
#else
psa_status_t status = PSA_SUCCESS;
@@ -124,7 +124,7 @@
psa_outvec out_vec[],
size_t out_len)
{
-#if (TFM_CRYPTO_HASH_MODULE_DISABLED != 0)
+#ifdef TFM_CRYPTO_HASH_MODULE_DISABLED
return PSA_ERROR_NOT_SUPPORTED;
#else
psa_status_t status = PSA_SUCCESS;
@@ -176,7 +176,7 @@
psa_outvec out_vec[],
size_t out_len)
{
-#if (TFM_CRYPTO_HASH_MODULE_DISABLED != 0)
+#ifdef TFM_CRYPTO_HASH_MODULE_DISABLED
return PSA_ERROR_NOT_SUPPORTED;
#else
psa_status_t status = PSA_SUCCESS;
@@ -225,7 +225,7 @@
psa_outvec out_vec[],
size_t out_len)
{
-#if (TFM_CRYPTO_HASH_MODULE_DISABLED != 0)
+#ifdef TFM_CRYPTO_HASH_MODULE_DISABLED
return PSA_ERROR_NOT_SUPPORTED;
#else
psa_status_t status = PSA_SUCCESS;
@@ -273,7 +273,7 @@
psa_outvec out_vec[],
size_t out_len)
{
-#if (TFM_CRYPTO_HASH_MODULE_DISABLED != 0)
+#ifdef TFM_CRYPTO_HASH_MODULE_DISABLED
return PSA_ERROR_NOT_SUPPORTED;
#else
psa_status_t status = PSA_SUCCESS;
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)) {
diff --git a/secure_fw/services/crypto/crypto_mac.c b/secure_fw/services/crypto/crypto_mac.c
index 8ad3876..6f85285 100644
--- a/secure_fw/services/crypto/crypto_mac.c
+++ b/secure_fw/services/crypto/crypto_mac.c
@@ -29,7 +29,7 @@
psa_outvec out_vec[],
size_t out_len)
{
-#if (TFM_CRYPTO_MAC_MODULE_DISABLED != 0)
+#ifdef TFM_CRYPTO_MAC_MODULE_DISABLED
return PSA_ERROR_NOT_SUPPORTED;
#else
psa_status_t status = PSA_SUCCESS;
@@ -83,7 +83,7 @@
psa_outvec out_vec[],
size_t out_len)
{
-#if (TFM_CRYPTO_MAC_MODULE_DISABLED != 0)
+#ifdef TFM_CRYPTO_MAC_MODULE_DISABLED
return PSA_ERROR_NOT_SUPPORTED;
#else
psa_status_t status = PSA_SUCCESS;
@@ -137,7 +137,7 @@
psa_outvec out_vec[],
size_t out_len)
{
-#if (TFM_CRYPTO_MAC_MODULE_DISABLED != 0)
+#ifdef TFM_CRYPTO_MAC_MODULE_DISABLED
return PSA_ERROR_NOT_SUPPORTED;
#else
psa_status_t status = PSA_SUCCESS;
@@ -184,7 +184,7 @@
psa_outvec out_vec[],
size_t out_len)
{
-#if (TFM_CRYPTO_MAC_MODULE_DISABLED != 0)
+#ifdef TFM_CRYPTO_MAC_MODULE_DISABLED
return PSA_ERROR_NOT_SUPPORTED;
#else
psa_status_t status = PSA_SUCCESS;
@@ -236,7 +236,7 @@
psa_outvec out_vec[],
size_t out_len)
{
-#if (TFM_CRYPTO_MAC_MODULE_DISABLED != 0)
+#ifdef TFM_CRYPTO_MAC_MODULE_DISABLED
return PSA_ERROR_NOT_SUPPORTED;
#else
psa_status_t status = PSA_SUCCESS;
@@ -285,7 +285,7 @@
psa_outvec out_vec[],
size_t out_len)
{
-#if (TFM_CRYPTO_MAC_MODULE_DISABLED != 0)
+#ifdef TFM_CRYPTO_MAC_MODULE_DISABLED
return PSA_ERROR_NOT_SUPPORTED;
#else
psa_status_t status = PSA_SUCCESS;
diff --git a/secure_fw/services/crypto/tfm_crypto_secure_api.c b/secure_fw/services/crypto/tfm_crypto_secure_api.c
index b50004b..bb5732c 100644
--- a/secure_fw/services/crypto/tfm_crypto_secure_api.c
+++ b/secure_fw/services/crypto/tfm_crypto_secure_api.c
@@ -59,7 +59,7 @@
__attribute__((section("SFN")))
psa_status_t psa_allocate_key(psa_key_handle_t *handle)
{
-#if (TFM_CRYPTO_KEY_MODULE_DISABLED != 0)
+#ifdef TFM_CRYPTO_KEY_MODULE_DISABLED
return PSA_ERROR_NOT_SUPPORTED;
#else
psa_status_t status;
@@ -92,7 +92,7 @@
psa_key_id_t id,
psa_key_handle_t *handle)
{
-#if (TFM_CRYPTO_KEY_MODULE_DISABLED != 0)
+#ifdef TFM_CRYPTO_KEY_MODULE_DISABLED
return PSA_ERROR_NOT_SUPPORTED;
#else
psa_status_t status;
@@ -128,7 +128,7 @@
psa_key_id_t id,
psa_key_handle_t *handle)
{
-#if (TFM_CRYPTO_KEY_MODULE_DISABLED != 0)
+#ifdef TFM_CRYPTO_KEY_MODULE_DISABLED
return PSA_ERROR_NOT_SUPPORTED;
#else
(void)lifetime;
@@ -143,7 +143,7 @@
__attribute__((section("SFN")))
psa_status_t psa_close_key(psa_key_handle_t handle)
{
-#if (TFM_CRYPTO_KEY_MODULE_DISABLED != 0)
+#ifdef TFM_CRYPTO_KEY_MODULE_DISABLED
return PSA_ERROR_NOT_SUPPORTED;
#else
psa_status_t status;
@@ -176,7 +176,7 @@
const uint8_t *data,
size_t data_length)
{
-#if (TFM_CRYPTO_KEY_MODULE_DISABLED != 0)
+#ifdef TFM_CRYPTO_KEY_MODULE_DISABLED
return PSA_ERROR_NOT_SUPPORTED;
#else
psa_status_t status;
@@ -207,7 +207,7 @@
__attribute__((section("SFN")))
psa_status_t psa_destroy_key(psa_key_handle_t handle)
{
-#if (TFM_CRYPTO_KEY_MODULE_DISABLED != 0)
+#ifdef TFM_CRYPTO_KEY_MODULE_DISABLED
return PSA_ERROR_NOT_SUPPORTED;
#else
psa_status_t status;
@@ -238,7 +238,7 @@
psa_key_type_t *type,
size_t *bits)
{
-#if (TFM_CRYPTO_KEY_MODULE_DISABLED != 0)
+#ifdef TFM_CRYPTO_KEY_MODULE_DISABLED
return PSA_ERROR_NOT_SUPPORTED;
#else
psa_status_t status;
@@ -274,7 +274,7 @@
size_t data_size,
size_t *data_length)
{
-#if (TFM_CRYPTO_KEY_MODULE_DISABLED != 0)
+#ifdef TFM_CRYPTO_KEY_MODULE_DISABLED
return PSA_ERROR_NOT_SUPPORTED;
#else
psa_status_t status;
@@ -312,7 +312,7 @@
size_t data_size,
size_t *data_length)
{
-#if (TFM_CRYPTO_KEY_MODULE_DISABLED != 0)
+#ifdef TFM_CRYPTO_KEY_MODULE_DISABLED
return PSA_ERROR_NOT_SUPPORTED;
#else
psa_status_t status;
@@ -350,7 +350,7 @@
psa_key_handle_t target_handle,
const psa_key_policy_t *constraint)
{
-#if (TFM_CRYPTO_KEY_MODULE_DISABLED != 0)
+#ifdef TFM_CRYPTO_KEY_MODULE_DISABLED
return PSA_ERROR_NOT_SUPPORTED;
#else
psa_status_t status;
@@ -404,7 +404,7 @@
psa_status_t psa_set_key_policy(psa_key_handle_t handle,
const psa_key_policy_t *policy)
{
-#if (TFM_CRYPTO_KEY_MODULE_DISABLED != 0)
+#ifdef TFM_CRYPTO_KEY_MODULE_DISABLED
return PSA_ERROR_NOT_SUPPORTED;
#else
psa_status_t status;
@@ -436,7 +436,7 @@
psa_status_t psa_get_key_policy(psa_key_handle_t handle,
psa_key_policy_t *policy)
{
-#if (TFM_CRYPTO_KEY_MODULE_DISABLED != 0)
+#ifdef TFM_CRYPTO_KEY_MODULE_DISABLED
return PSA_ERROR_NOT_SUPPORTED;
#else
psa_status_t status;
@@ -470,7 +470,7 @@
psa_status_t psa_get_key_lifetime(psa_key_handle_t handle,
psa_key_lifetime_t *lifetime)
{
-#if (TFM_CRYPTO_KEY_MODULE_DISABLED != 0)
+#ifdef TFM_CRYPTO_KEY_MODULE_DISABLED
return PSA_ERROR_NOT_SUPPORTED;
#else
psa_status_t status;
@@ -506,7 +506,7 @@
size_t iv_size,
size_t *iv_length)
{
-#if (TFM_CRYPTO_CIPHER_MODULE_DISABLED != 0)
+#ifdef TFM_CRYPTO_CIPHER_MODULE_DISABLED
return PSA_ERROR_NOT_SUPPORTED;
#else
psa_status_t status;
@@ -545,7 +545,7 @@
const unsigned char *iv,
size_t iv_length)
{
-#if (TFM_CRYPTO_CIPHER_MODULE_DISABLED != 0)
+#ifdef TFM_CRYPTO_CIPHER_MODULE_DISABLED
return PSA_ERROR_NOT_SUPPORTED;
#else
psa_status_t status;
@@ -581,7 +581,7 @@
psa_key_handle_t handle,
psa_algorithm_t alg)
{
-#if (TFM_CRYPTO_CIPHER_MODULE_DISABLED != 0)
+#ifdef TFM_CRYPTO_CIPHER_MODULE_DISABLED
return PSA_ERROR_NOT_SUPPORTED;
#else
psa_status_t status;
@@ -618,7 +618,7 @@
psa_key_handle_t handle,
psa_algorithm_t alg)
{
-#if (TFM_CRYPTO_CIPHER_MODULE_DISABLED != 0)
+#ifdef TFM_CRYPTO_CIPHER_MODULE_DISABLED
return PSA_ERROR_NOT_SUPPORTED;
#else
psa_status_t status;
@@ -658,7 +658,7 @@
size_t output_size,
size_t *output_length)
{
-#if (TFM_CRYPTO_CIPHER_MODULE_DISABLED != 0)
+#ifdef TFM_CRYPTO_CIPHER_MODULE_DISABLED
return PSA_ERROR_NOT_SUPPORTED;
#else
psa_status_t status;
@@ -696,7 +696,7 @@
__attribute__((section("SFN")))
psa_status_t psa_cipher_abort(psa_cipher_operation_t *operation)
{
-#if (TFM_CRYPTO_CIPHER_MODULE_DISABLED != 0)
+#ifdef TFM_CRYPTO_CIPHER_MODULE_DISABLED
return PSA_ERROR_NOT_SUPPORTED;
#else
psa_status_t status;
@@ -732,7 +732,7 @@
size_t output_size,
size_t *output_length)
{
-#if (TFM_CRYPTO_CIPHER_MODULE_DISABLED != 0)
+#ifdef TFM_CRYPTO_CIPHER_MODULE_DISABLED
return PSA_ERROR_NOT_SUPPORTED;
#else
psa_status_t status;
@@ -770,7 +770,7 @@
psa_status_t psa_hash_setup(psa_hash_operation_t *operation,
psa_algorithm_t alg)
{
-#if (TFM_CRYPTO_HASH_MODULE_DISABLED != 0)
+#ifdef TFM_CRYPTO_HASH_MODULE_DISABLED
return PSA_ERROR_NOT_SUPPORTED;
#else
psa_status_t status;
@@ -807,7 +807,7 @@
const uint8_t *input,
size_t input_length)
{
-#if (TFM_CRYPTO_HASH_MODULE_DISABLED != 0)
+#ifdef TFM_CRYPTO_HASH_MODULE_DISABLED
return PSA_ERROR_NOT_SUPPORTED;
#else
psa_status_t status;
@@ -845,7 +845,7 @@
size_t hash_size,
size_t *hash_length)
{
-#if (TFM_CRYPTO_HASH_MODULE_DISABLED != 0)
+#ifdef TFM_CRYPTO_HASH_MODULE_DISABLED
return PSA_ERROR_NOT_SUPPORTED;
#else
psa_status_t status;
@@ -884,7 +884,7 @@
const uint8_t *hash,
size_t hash_length)
{
-#if (TFM_CRYPTO_HASH_MODULE_DISABLED != 0)
+#ifdef TFM_CRYPTO_HASH_MODULE_DISABLED
return PSA_ERROR_NOT_SUPPORTED;
#else
psa_status_t status;
@@ -918,7 +918,7 @@
__attribute__((section("SFN")))
psa_status_t psa_hash_abort(psa_hash_operation_t *operation)
{
-#if (TFM_CRYPTO_HASH_MODULE_DISABLED != 0)
+#ifdef TFM_CRYPTO_HASH_MODULE_DISABLED
return PSA_ERROR_NOT_SUPPORTED;
#else
psa_status_t status;
@@ -952,7 +952,7 @@
psa_status_t psa_hash_clone(const psa_hash_operation_t *source_operation,
psa_hash_operation_t *target_operation)
{
-#if (TFM_CRYPTO_HASH_MODULE_DISABLED != 0)
+#ifdef TFM_CRYPTO_HASH_MODULE_DISABLED
return PSA_ERROR_NOT_SUPPORTED;
#else
psa_status_t status;
@@ -987,7 +987,7 @@
psa_key_handle_t handle,
psa_algorithm_t alg)
{
-#if (TFM_CRYPTO_MAC_MODULE_DISABLED != 0)
+#ifdef TFM_CRYPTO_MAC_MODULE_DISABLED
return PSA_ERROR_NOT_SUPPORTED;
#else
psa_status_t status;
@@ -1024,7 +1024,7 @@
psa_key_handle_t handle,
psa_algorithm_t alg)
{
-#if (TFM_CRYPTO_MAC_MODULE_DISABLED != 0)
+#ifdef TFM_CRYPTO_MAC_MODULE_DISABLED
return PSA_ERROR_NOT_SUPPORTED;
#else
psa_status_t status;
@@ -1061,7 +1061,7 @@
const uint8_t *input,
size_t input_length)
{
-#if (TFM_CRYPTO_MAC_MODULE_DISABLED != 0)
+#ifdef TFM_CRYPTO_MAC_MODULE_DISABLED
return PSA_ERROR_NOT_SUPPORTED;
#else
psa_status_t status;
@@ -1098,7 +1098,7 @@
size_t mac_size,
size_t *mac_length)
{
-#if (TFM_CRYPTO_MAC_MODULE_DISABLED != 0)
+#ifdef TFM_CRYPTO_MAC_MODULE_DISABLED
return PSA_ERROR_NOT_SUPPORTED;
#else
psa_status_t status;
@@ -1137,7 +1137,7 @@
const uint8_t *mac,
size_t mac_length)
{
-#if (TFM_CRYPTO_MAC_MODULE_DISABLED != 0)
+#ifdef TFM_CRYPTO_MAC_MODULE_DISABLED
return PSA_ERROR_NOT_SUPPORTED;
#else
psa_status_t status;
@@ -1172,7 +1172,7 @@
__attribute__((section("SFN")))
psa_status_t psa_mac_abort(psa_mac_operation_t *operation)
{
-#if (TFM_CRYPTO_MAC_MODULE_DISABLED != 0)
+#ifdef TFM_CRYPTO_MAC_MODULE_DISABLED
return PSA_ERROR_NOT_SUPPORTED;
#else
psa_status_t status;
@@ -1215,7 +1215,7 @@
size_t ciphertext_size,
size_t *ciphertext_length)
{
-#if (TFM_CRYPTO_AEAD_MODULE_DISABLED != 0)
+#ifdef TFM_CRYPTO_AEAD_MODULE_DISABLED
return PSA_ERROR_NOT_SUPPORTED;
#else
psa_status_t status;
@@ -1290,7 +1290,7 @@
size_t plaintext_size,
size_t *plaintext_length)
{
-#if (TFM_CRYPTO_AEAD_MODULE_DISABLED != 0)
+#ifdef TFM_CRYPTO_AEAD_MODULE_DISABLED
return PSA_ERROR_NOT_SUPPORTED;
#else
psa_status_t status;
@@ -1361,7 +1361,7 @@
size_t signature_size,
size_t *signature_length)
{
-#if (TFM_CRYPTO_ASYMMETRIC_MODULE_DISABLED != 0)
+#ifdef TFM_CRYPTO_ASYMMETRIC_MODULE_DISABLED
return PSA_ERROR_NOT_SUPPORTED;
#else
psa_status_t status;
@@ -1404,7 +1404,7 @@
const uint8_t *signature,
size_t signature_length)
{
-#if (TFM_CRYPTO_ASYMMETRIC_MODULE_DISABLED != 0)
+#ifdef TFM_CRYPTO_ASYMMETRIC_MODULE_DISABLED
return PSA_ERROR_NOT_SUPPORTED;
#else
psa_status_t status;
@@ -1445,7 +1445,7 @@
size_t output_size,
size_t *output_length)
{
-#if (TFM_CRYPTO_ASYMMETRIC_MODULE_DISABLED != 0)
+#ifdef TFM_CRYPTO_ASYMMETRIC_MODULE_DISABLED
return PSA_ERROR_NOT_SUPPORTED;
#else
psa_status_t status;
@@ -1507,7 +1507,7 @@
size_t output_size,
size_t *output_length)
{
-#if (TFM_CRYPTO_ASYMMETRIC_MODULE_DISABLED != 0)
+#ifdef TFM_CRYPTO_ASYMMETRIC_MODULE_DISABLED
return PSA_ERROR_NOT_SUPPORTED;
#else
psa_status_t status;
@@ -1562,7 +1562,7 @@
psa_status_t psa_get_generator_capacity(const psa_crypto_generator_t *generator,
size_t *capacity)
{
-#if (TFM_CRYPTO_GENERATOR_MODULE_DISABLED != 0)
+#ifdef TFM_CRYPTO_GENERATOR_MODULE_DISABLED
return PSA_ERROR_NOT_SUPPORTED;
#else
psa_status_t status;
@@ -1598,7 +1598,7 @@
uint8_t *output,
size_t output_length)
{
-#if (TFM_CRYPTO_GENERATOR_MODULE_DISABLED != 0)
+#ifdef TFM_CRYPTO_GENERATOR_MODULE_DISABLED
return PSA_ERROR_NOT_SUPPORTED;
#else
psa_status_t status;
@@ -1635,7 +1635,7 @@
size_t bits,
psa_crypto_generator_t *generator)
{
-#if (TFM_CRYPTO_GENERATOR_MODULE_DISABLED != 0)
+#ifdef TFM_CRYPTO_GENERATOR_MODULE_DISABLED
return PSA_ERROR_NOT_SUPPORTED;
#else
psa_status_t status;
@@ -1668,7 +1668,7 @@
__attribute__((section("SFN")))
psa_status_t psa_generator_abort(psa_crypto_generator_t *generator)
{
-#if (TFM_CRYPTO_GENERATOR_MODULE_DISABLED != 0)
+#ifdef TFM_CRYPTO_GENERATOR_MODULE_DISABLED
return PSA_ERROR_NOT_SUPPORTED;
#else
psa_status_t status;
@@ -1709,7 +1709,7 @@
size_t label_length,
size_t capacity)
{
-#if (TFM_CRYPTO_GENERATOR_MODULE_DISABLED != 0)
+#ifdef TFM_CRYPTO_GENERATOR_MODULE_DISABLED
return PSA_ERROR_NOT_SUPPORTED;
#else
psa_status_t status;
@@ -1774,7 +1774,7 @@
size_t peer_key_length,
psa_algorithm_t alg)
{
-#if (TFM_CRYPTO_GENERATOR_MODULE_DISABLED != 0)
+#ifdef TFM_CRYPTO_GENERATOR_MODULE_DISABLED
return PSA_ERROR_NOT_SUPPORTED;
#else
psa_status_t status;
@@ -1813,7 +1813,7 @@
psa_status_t psa_generate_random(uint8_t *output,
size_t output_size)
{
-#if (TFM_CRYPTO_GENERATOR_MODULE_DISABLED != 0)
+#ifdef TFM_CRYPTO_GENERATOR_MODULE_DISABLED
return PSA_ERROR_NOT_SUPPORTED;
#else
psa_status_t status;
@@ -1855,7 +1855,7 @@
const void *extra,
size_t extra_size)
{
-#if (TFM_CRYPTO_GENERATOR_MODULE_DISABLED != 0)
+#ifdef TFM_CRYPTO_GENERATOR_MODULE_DISABLED
return PSA_ERROR_NOT_SUPPORTED;
#else
psa_status_t status;