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;