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>
diff --git a/interface/include/tfm_crypto_defs.h b/interface/include/tfm_crypto_defs.h
index adddf4c..23154a6 100644
--- a/interface/include/tfm_crypto_defs.h
+++ b/interface/include/tfm_crypto_defs.h
@@ -54,54 +54,54 @@
};
/**
- * \brief Define a progressive numerical value for each SFID which can be used
+ * \brief Define a progressive numerical value for each SID which can be used
* when dispatching the requests to the service
*/
enum {
- TFM_CRYPTO_ALLOCATE_KEY_SFID = (0u),
- TFM_CRYPTO_IMPORT_KEY_SFID,
- TFM_CRYPTO_DESTROY_KEY_SFID,
- TFM_CRYPTO_GET_KEY_INFORMATION_SFID,
- TFM_CRYPTO_EXPORT_KEY_SFID,
- TFM_CRYPTO_EXPORT_PUBLIC_KEY_SFID,
- TFM_CRYPTO_COPY_KEY_SFID,
- TFM_CRYPTO_SET_KEY_POLICY_SFID,
- TFM_CRYPTO_GET_KEY_POLICY_SFID,
- TFM_CRYPTO_GET_KEY_LIFETIME_SFID,
- TFM_CRYPTO_CIPHER_GENERATE_IV_SFID,
- TFM_CRYPTO_CIPHER_SET_IV_SFID,
- TFM_CRYPTO_CIPHER_ENCRYPT_SETUP_SFID,
- TFM_CRYPTO_CIPHER_DECRYPT_SETUP_SFID,
- TFM_CRYPTO_CIPHER_UPDATE_SFID,
- TFM_CRYPTO_CIPHER_ABORT_SFID,
- TFM_CRYPTO_CIPHER_FINISH_SFID,
- TFM_CRYPTO_HASH_SETUP_SFID,
- TFM_CRYPTO_HASH_UPDATE_SFID,
- TFM_CRYPTO_HASH_FINISH_SFID,
- TFM_CRYPTO_HASH_VERIFY_SFID,
- TFM_CRYPTO_HASH_ABORT_SFID,
- TFM_CRYPTO_HASH_CLONE_SFID,
- TFM_CRYPTO_MAC_SIGN_SETUP_SFID,
- TFM_CRYPTO_MAC_VERIFY_SETUP_SFID,
- TFM_CRYPTO_MAC_UPDATE_SFID,
- TFM_CRYPTO_MAC_SIGN_FINISH_SFID,
- TFM_CRYPTO_MAC_VERIFY_FINISH_SFID,
- TFM_CRYPTO_MAC_ABORT_SFID,
- TFM_CRYPTO_AEAD_ENCRYPT_SFID,
- TFM_CRYPTO_AEAD_DECRYPT_SFID,
- TFM_CRYPTO_ASYMMETRIC_SIGN_SFID,
- TFM_CRYPTO_ASYMMETRIC_VERIFY_SFID,
- TFM_CRYPTO_ASYMMETRIC_ENCRYPT_SFID,
- TFM_CRYPTO_ASYMMETRIC_DECRYPT_SFID,
- TFM_CRYPTO_GET_GENERATOR_CAPACITY_SFID,
- TFM_CRYPTO_GENERATOR_READ_SFID,
- TFM_CRYPTO_GENERATOR_IMPORT_KEY_SFID,
- TFM_CRYPTO_GENERATOR_ABORT_SFID,
- TFM_CRYPTO_KEY_DERIVATION_SFID,
- TFM_CRYPTO_KEY_AGREEMENT_SFID,
- TFM_CRYPTO_GENERATE_RANDOM_SFID,
- TFM_CRYPTO_GENERATE_KEY_SFID,
- TFM_CRYPTO_SFID_MAX,
+ TFM_CRYPTO_ALLOCATE_KEY_SID = (0u),
+ TFM_CRYPTO_IMPORT_KEY_SID,
+ TFM_CRYPTO_DESTROY_KEY_SID,
+ TFM_CRYPTO_GET_KEY_INFORMATION_SID,
+ TFM_CRYPTO_EXPORT_KEY_SID,
+ TFM_CRYPTO_EXPORT_PUBLIC_KEY_SID,
+ TFM_CRYPTO_COPY_KEY_SID,
+ TFM_CRYPTO_SET_KEY_POLICY_SID,
+ TFM_CRYPTO_GET_KEY_POLICY_SID,
+ TFM_CRYPTO_GET_KEY_LIFETIME_SID,
+ TFM_CRYPTO_CIPHER_GENERATE_IV_SID,
+ TFM_CRYPTO_CIPHER_SET_IV_SID,
+ TFM_CRYPTO_CIPHER_ENCRYPT_SETUP_SID,
+ TFM_CRYPTO_CIPHER_DECRYPT_SETUP_SID,
+ TFM_CRYPTO_CIPHER_UPDATE_SID,
+ TFM_CRYPTO_CIPHER_ABORT_SID,
+ TFM_CRYPTO_CIPHER_FINISH_SID,
+ TFM_CRYPTO_HASH_SETUP_SID,
+ TFM_CRYPTO_HASH_UPDATE_SID,
+ TFM_CRYPTO_HASH_FINISH_SID,
+ TFM_CRYPTO_HASH_VERIFY_SID,
+ TFM_CRYPTO_HASH_ABORT_SID,
+ TFM_CRYPTO_HASH_CLONE_SID,
+ TFM_CRYPTO_MAC_SIGN_SETUP_SID,
+ TFM_CRYPTO_MAC_VERIFY_SETUP_SID,
+ TFM_CRYPTO_MAC_UPDATE_SID,
+ TFM_CRYPTO_MAC_SIGN_FINISH_SID,
+ TFM_CRYPTO_MAC_VERIFY_FINISH_SID,
+ TFM_CRYPTO_MAC_ABORT_SID,
+ TFM_CRYPTO_AEAD_ENCRYPT_SID,
+ TFM_CRYPTO_AEAD_DECRYPT_SID,
+ TFM_CRYPTO_ASYMMETRIC_SIGN_SID,
+ TFM_CRYPTO_ASYMMETRIC_VERIFY_SID,
+ TFM_CRYPTO_ASYMMETRIC_ENCRYPT_SID,
+ TFM_CRYPTO_ASYMMETRIC_DECRYPT_SID,
+ TFM_CRYPTO_GET_GENERATOR_CAPACITY_SID,
+ TFM_CRYPTO_GENERATOR_READ_SID,
+ TFM_CRYPTO_GENERATOR_IMPORT_KEY_SID,
+ TFM_CRYPTO_GENERATOR_ABORT_SID,
+ TFM_CRYPTO_KEY_DERIVATION_SID,
+ TFM_CRYPTO_KEY_AGREEMENT_SID,
+ TFM_CRYPTO_GENERATE_RANDOM_SID,
+ TFM_CRYPTO_GENERATE_KEY_SID,
+ TFM_CRYPTO_SID_MAX,
};
/**
@@ -112,10 +112,10 @@
#define TFM_CRYPTO_MIN_VER (0x0001)
/**
- * \brief Define an invalid value for an SFID
+ * \brief Define an invalid value for an SID
*
*/
-#define TFM_CRYPTO_SFID_INVALID (~0x0u)
+#define TFM_CRYPTO_SID_INVALID (~0x0u)
/**
* \brief This value is used to mark an handle as invalid.