commit cf85ba2fa5497d1272dd05aceaf53cc5997281bd
author Antonio de Angelis <antonio.deangelis@arm.com> Tue Oct 09 13:29:40 2018 +0100
committer Antonio de Angelis <antonio.deangelis@arm.com> Fri Feb 01 19:33:42 2019 +0000
tree 264cbd69a016ec75d78481897de8ab4a03f7e7cb
parent 377a1550a5c335f5b9ee2185825b19ea2c34b7d4

Crypto: Modularise the interaction with crypto primitives

This patch creates an engine layer inside the service to
modularise all the operations that involve cryptography
primitives.
It also updates the service documentation, fixes some minor
issues in the NS crypto interface test suite, and updates the
manifest file for the crypto service removing outdated functions.

Change-Id: Id2d0e2140741debd22c145f816a4df2ab0351b58
Signed-off-by: Antonio de Angelis <antonio.deangelis@arm.com>

interface/src/tfm_crypto_api.c

diff --git a/interface/src/tfm_crypto_api.c b/interface/src/tfm_crypto_api.c
index a51ac1f..7eb0669 100644
--- a/interface/src/tfm_crypto_api.c
+++ b/interface/src/tfm_crypto_api.c
@@ -31,7 +31,7 @@
                                (uint32_t)data,
                                (uint32_t)data_length);
 
-    return TFM_CRYPTO_PSA_RETURN(err);
+    return TFM_CRYPTO_ERR_TO_PSA_STATUS(err);
 }
 
 psa_status_t psa_destroy_key(psa_key_slot_t key)
@@ -44,7 +44,7 @@
                                0,
                                0);
 
-    return TFM_CRYPTO_PSA_RETURN(err);
+    return TFM_CRYPTO_ERR_TO_PSA_STATUS(err);
 }
 
 psa_status_t psa_get_key_information(psa_key_slot_t key,
@@ -59,7 +59,7 @@
                                (uint32_t)bits,
                                0);
 
-    return TFM_CRYPTO_PSA_RETURN(err);
+    return TFM_CRYPTO_ERR_TO_PSA_STATUS(err);
 }
 
 psa_status_t psa_export_key(psa_key_slot_t key,
@@ -75,7 +75,7 @@
                                (uint32_t)data_size,
                                (uint32_t)data_length);
 
-    return TFM_CRYPTO_PSA_RETURN(err);
+    return TFM_CRYPTO_ERR_TO_PSA_STATUS(err);
 }
 
 psa_status_t psa_export_public_key(psa_key_slot_t key,
@@ -99,7 +99,7 @@
                                (uint32_t)iv_length,
                                0);
 
-    return TFM_CRYPTO_PSA_RETURN(err);
+    return TFM_CRYPTO_ERR_TO_PSA_STATUS(err);
 }
 
 psa_status_t psa_cipher_encrypt_setup(psa_cipher_operation_t *operation,
@@ -115,7 +115,7 @@
                               (uint32_t)alg,
                               0);
 
-    return TFM_CRYPTO_PSA_RETURN(err);
+    return TFM_CRYPTO_ERR_TO_PSA_STATUS(err);
 }
 
 psa_status_t psa_cipher_decrypt_setup(psa_cipher_operation_t *operation,
@@ -131,7 +131,7 @@
                               (uint32_t)alg,
                               0);
 
-    return TFM_CRYPTO_PSA_RETURN(err);
+    return TFM_CRYPTO_ERR_TO_PSA_STATUS(err);
 }
 
 psa_status_t psa_cipher_update(psa_cipher_operation_t *operation,
@@ -159,7 +159,7 @@
                                (uint32_t)&output_s,
                                0);
 
-    return TFM_CRYPTO_PSA_RETURN(err);
+    return TFM_CRYPTO_ERR_TO_PSA_STATUS(err);
 }
 
 psa_status_t psa_cipher_abort(psa_cipher_operation_t *operation)
@@ -172,7 +172,7 @@
                                0,
                                0);
 
-    return TFM_CRYPTO_PSA_RETURN(err);
+    return TFM_CRYPTO_ERR_TO_PSA_STATUS(err);
 }
 
 psa_status_t psa_cipher_finish(psa_cipher_operation_t *operation,
@@ -188,7 +188,7 @@
                                (uint32_t)output_size,
                                (uint32_t)output_length);
 
-    return TFM_CRYPTO_PSA_RETURN(err);
+    return TFM_CRYPTO_ERR_TO_PSA_STATUS(err);
 }
 
 psa_status_t psa_hash_setup(psa_hash_operation_t *operation,
@@ -202,7 +202,7 @@
                                0,
                                0);
 
-    return TFM_CRYPTO_PSA_RETURN(err);
+    return TFM_CRYPTO_ERR_TO_PSA_STATUS(err);
 }
 
 psa_status_t psa_hash_update(psa_hash_operation_t *operation,
@@ -217,7 +217,7 @@
                                (uint32_t)input_length,
                                0);
 
-    return TFM_CRYPTO_PSA_RETURN(err);
+    return TFM_CRYPTO_ERR_TO_PSA_STATUS(err);
 }
 
 psa_status_t psa_hash_finish(psa_hash_operation_t *operation,
@@ -233,7 +233,7 @@
                                (uint32_t)hash_size,
                                (uint32_t)hash_length);
 
-    return TFM_CRYPTO_PSA_RETURN(err);
+    return TFM_CRYPTO_ERR_TO_PSA_STATUS(err);
 }
 
 psa_status_t psa_hash_verify(psa_hash_operation_t *operation,
@@ -248,7 +248,7 @@
                                (uint32_t)hash_length,
                                0);
 
-    return TFM_CRYPTO_PSA_RETURN(err);
+    return TFM_CRYPTO_ERR_TO_PSA_STATUS(err);
 }
 
 psa_status_t psa_hash_abort(psa_hash_operation_t *operation)
@@ -261,5 +261,5 @@
                                0,
                                0);
 
-    return TFM_CRYPTO_PSA_RETURN(err);
+    return TFM_CRYPTO_ERR_TO_PSA_STATUS(err);
 }