commit 080b2e2269628200fc5e35a9d5410221b6b2b733
author Edison Ai <edison.ai@arm.com> Wed Apr 17 16:27:21 2019 +0800
committer Ken Liu <ken.liu@arm.com> Tue Jul 09 01:57:24 2019 +0000
tree d9d2a7701df8027286ed71674609b74b0cc28075
parent 0169b9f0f687400f45ce73eefd28ce1e61f1c740

Build: Correct property name in services

- Add "sid" for audit_logging, initial_attestation, platform
- Rename "sfid" to "name"
- Remove "_SID" postfix from "name"
- Rename "strict" to "STRICT"
- Change macro with "_SFID" postfix to "_SID"

Change-Id: I08f83bdefc5e8412608cc27062ac5e3af9ac3a5c
Signed-off-by: Edison Ai <edison.ai@arm.com>

secure_fw/services/crypto/crypto_init.c

diff --git a/secure_fw/services/crypto/crypto_init.c b/secure_fw/services/crypto/crypto_init.c
index c719d07..e32ceb0 100644
--- a/secure_fw/services/crypto/crypto_init.c
+++ b/secure_fw/services/crypto/crypto_init.c
@@ -29,7 +29,7 @@
  * \brief Table containing all the Uniform Signature API exposed
  *        by the TF-M Crypto partition
  */
-static const tfm_crypto_us_t sfid_func_table[TFM_CRYPTO_SFID_MAX] = {
+static const tfm_crypto_us_t sfid_func_table[TFM_CRYPTO_SID_MAX] = {
 #define X(api_name) api_name,
 LIST_TFM_CRYPTO_UNIFORM_SIGNATURE_API
 #undef X
@@ -194,8 +194,8 @@
         return PSA_ERROR_GENERIC_ERROR;
     }
 
-    if (iov->sfn_id >= TFM_CRYPTO_SFID_MAX) {
-        *sfn_id_p = TFM_CRYPTO_SFID_INVALID;
+    if (iov->sfn_id >= TFM_CRYPTO_SID_MAX) {
+        *sfn_id_p = TFM_CRYPTO_SID_INVALID;
         return PSA_ERROR_GENERIC_ERROR;
     }
 
@@ -209,7 +209,7 @@
     psa_signal_t signals = 0;
     psa_msg_t msg;
     psa_status_t status = PSA_SUCCESS;
-    uint32_t sfn_id = TFM_CRYPTO_SFID_INVALID;
+    uint32_t sfn_id = TFM_CRYPTO_SID_INVALID;
     struct tfm_crypto_pack_iovec iov = {0};
 
     while (1) {
@@ -232,8 +232,8 @@
             case PSA_IPC_CALL:
                 /* Parse the message */
                 status = tfm_crypto_parse_msg(&msg, &iov, &sfn_id);
-                /* Call the dispatcher based on the SFID passed as type */
-                if (sfn_id != TFM_CRYPTO_SFID_INVALID) {
+                /* Call the dispatcher based on the SID passed as type */
+                if (sfn_id != TFM_CRYPTO_SID_INVALID) {
                     status = tfm_crypto_call_sfn(&msg, &iov, sfn_id);
                 } else {
                     status = PSA_ERROR_GENERIC_ERROR;