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.
diff --git a/interface/src/tfm_crypto_api.c b/interface/src/tfm_crypto_api.c
index 92d47d1..a4cddbf 100644
--- a/interface/src/tfm_crypto_api.c
+++ b/interface/src/tfm_crypto_api.c
@@ -61,7 +61,7 @@
{
psa_status_t status;
const struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_ALLOCATE_KEY_SFID,
+ .sfn_id = TFM_CRYPTO_ALLOCATE_KEY_SID,
};
psa_invec in_vec[] = {
{.base = &iov, .len = sizeof(struct tfm_crypto_pack_iovec)},
@@ -122,7 +122,7 @@
{
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_IMPORT_KEY_SFID,
+ .sfn_id = TFM_CRYPTO_IMPORT_KEY_SID,
.key_handle = handle,
.type = type,
};
@@ -148,7 +148,7 @@
{
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_DESTROY_KEY_SFID,
+ .sfn_id = TFM_CRYPTO_DESTROY_KEY_SID,
.key_handle = handle,
};
psa_invec in_vec[] = {
@@ -174,7 +174,7 @@
{
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_GET_KEY_INFORMATION_SFID,
+ .sfn_id = TFM_CRYPTO_GET_KEY_INFORMATION_SID,
.key_handle = handle,
};
psa_invec in_vec[] = {
@@ -205,7 +205,7 @@
{
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_EXPORT_KEY_SFID,
+ .sfn_id = TFM_CRYPTO_EXPORT_KEY_SID,
.key_handle = handle,
};
psa_invec in_vec[] = {
@@ -238,7 +238,7 @@
{
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_EXPORT_PUBLIC_KEY_SFID,
+ .sfn_id = TFM_CRYPTO_EXPORT_PUBLIC_KEY_SID,
.key_handle = handle,
};
@@ -271,7 +271,7 @@
{
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_COPY_KEY_SFID,
+ .sfn_id = TFM_CRYPTO_COPY_KEY_SID,
.key_handle = source_handle,
};
@@ -317,7 +317,7 @@
{
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_SET_KEY_POLICY_SFID,
+ .sfn_id = TFM_CRYPTO_SET_KEY_POLICY_SID,
.key_handle = handle,
};
@@ -344,7 +344,7 @@
{
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_GET_KEY_POLICY_SFID,
+ .sfn_id = TFM_CRYPTO_GET_KEY_POLICY_SID,
.key_handle = handle,
};
@@ -373,7 +373,7 @@
{
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_GET_KEY_LIFETIME_SFID,
+ .sfn_id = TFM_CRYPTO_GET_KEY_LIFETIME_SID,
.key_handle = handle,
};
@@ -404,7 +404,7 @@
{
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_CIPHER_GENERATE_IV_SFID,
+ .sfn_id = TFM_CRYPTO_CIPHER_GENERATE_IV_SID,
.op_handle = operation->handle,
};
@@ -438,7 +438,7 @@
{
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_CIPHER_SET_IV_SFID,
+ .sfn_id = TFM_CRYPTO_CIPHER_SET_IV_SID,
.op_handle = operation->handle,
};
@@ -469,7 +469,7 @@
{
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_CIPHER_ENCRYPT_SETUP_SFID,
+ .sfn_id = TFM_CRYPTO_CIPHER_ENCRYPT_SETUP_SID,
.key_handle = handle,
.alg = alg,
.op_handle = operation->handle,
@@ -501,7 +501,7 @@
{
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_CIPHER_DECRYPT_SETUP_SFID,
+ .sfn_id = TFM_CRYPTO_CIPHER_DECRYPT_SETUP_SID,
.key_handle = handle,
.alg = alg,
.op_handle = operation->handle,
@@ -536,7 +536,7 @@
{
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_CIPHER_UPDATE_SFID,
+ .sfn_id = TFM_CRYPTO_CIPHER_UPDATE_SID,
.op_handle = operation->handle,
};
@@ -569,7 +569,7 @@
{
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_CIPHER_ABORT_SFID,
+ .sfn_id = TFM_CRYPTO_CIPHER_ABORT_SID,
.op_handle = operation->handle,
};
@@ -600,7 +600,7 @@
{
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_CIPHER_FINISH_SFID,
+ .sfn_id = TFM_CRYPTO_CIPHER_FINISH_SID,
.op_handle = operation->handle,
};
@@ -633,7 +633,7 @@
{
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_HASH_SETUP_SFID,
+ .sfn_id = TFM_CRYPTO_HASH_SETUP_SID,
.alg = alg,
.op_handle = operation->handle,
};
@@ -665,7 +665,7 @@
{
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_HASH_UPDATE_SFID,
+ .sfn_id = TFM_CRYPTO_HASH_UPDATE_SID,
.op_handle = operation->handle,
};
@@ -698,7 +698,7 @@
{
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_HASH_FINISH_SFID,
+ .sfn_id = TFM_CRYPTO_HASH_FINISH_SID,
.op_handle = operation->handle,
};
@@ -732,7 +732,7 @@
{
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_HASH_VERIFY_SFID,
+ .sfn_id = TFM_CRYPTO_HASH_VERIFY_SID,
.op_handle = operation->handle,
};
@@ -761,7 +761,7 @@
{
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_HASH_ABORT_SFID,
+ .sfn_id = TFM_CRYPTO_HASH_ABORT_SID,
.op_handle = operation->handle,
};
@@ -790,7 +790,7 @@
{
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_HASH_CLONE_SFID,
+ .sfn_id = TFM_CRYPTO_HASH_CLONE_SID,
.op_handle = source_operation->handle,
};
@@ -820,7 +820,7 @@
{
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_MAC_SIGN_SETUP_SFID,
+ .sfn_id = TFM_CRYPTO_MAC_SIGN_SETUP_SID,
.key_handle = handle,
.alg = alg,
.op_handle = operation->handle,
@@ -852,7 +852,7 @@
{
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_MAC_VERIFY_SETUP_SFID,
+ .sfn_id = TFM_CRYPTO_MAC_VERIFY_SETUP_SID,
.key_handle = handle,
.alg = alg,
.op_handle = operation->handle,
@@ -884,7 +884,7 @@
{
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_MAC_UPDATE_SFID,
+ .sfn_id = TFM_CRYPTO_MAC_UPDATE_SID,
.op_handle = operation->handle,
};
@@ -916,7 +916,7 @@
{
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_MAC_SIGN_FINISH_SFID,
+ .sfn_id = TFM_CRYPTO_MAC_SIGN_FINISH_SID,
.op_handle = operation->handle,
};
@@ -950,7 +950,7 @@
{
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_MAC_VERIFY_FINISH_SFID,
+ .sfn_id = TFM_CRYPTO_MAC_VERIFY_FINISH_SID,
.op_handle = operation->handle,
};
@@ -980,7 +980,7 @@
{
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_MAC_ABORT_SFID,
+ .sfn_id = TFM_CRYPTO_MAC_ABORT_SID,
.op_handle = operation->handle,
};
@@ -1018,7 +1018,7 @@
{
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_AEAD_ENCRYPT_SFID,
+ .sfn_id = TFM_CRYPTO_AEAD_ENCRYPT_SID,
.key_handle = handle,
.alg = alg,
.aead_in = {.nonce = {0}, .nonce_length = nonce_length}
@@ -1088,7 +1088,7 @@
{
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_AEAD_DECRYPT_SFID,
+ .sfn_id = TFM_CRYPTO_AEAD_DECRYPT_SID,
.key_handle = handle,
.alg = alg,
.aead_in = {.nonce = {0}, .nonce_length = nonce_length}
@@ -1154,7 +1154,7 @@
{
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_ASYMMETRIC_SIGN_SFID,
+ .sfn_id = TFM_CRYPTO_ASYMMETRIC_SIGN_SID,
.key_handle = handle,
.alg = alg,
};
@@ -1192,7 +1192,7 @@
{
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_ASYMMETRIC_VERIFY_SFID,
+ .sfn_id = TFM_CRYPTO_ASYMMETRIC_VERIFY_SID,
.key_handle = handle,
.alg = alg
};
@@ -1228,7 +1228,7 @@
{
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_ASYMMETRIC_ENCRYPT_SFID,
+ .sfn_id = TFM_CRYPTO_ASYMMETRIC_ENCRYPT_SID,
.key_handle = handle,
.alg = alg
};
@@ -1285,7 +1285,7 @@
{
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_ASYMMETRIC_DECRYPT_SFID,
+ .sfn_id = TFM_CRYPTO_ASYMMETRIC_DECRYPT_SID,
.key_handle = handle,
.alg = alg
};
@@ -1335,7 +1335,7 @@
{
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_GET_GENERATOR_CAPACITY_SFID,
+ .sfn_id = TFM_CRYPTO_GET_GENERATOR_CAPACITY_SID,
.op_handle = generator->handle,
};
@@ -1366,7 +1366,7 @@
{
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_GENERATOR_READ_SFID,
+ .sfn_id = TFM_CRYPTO_GENERATOR_READ_SID,
.op_handle = generator->handle,
};
@@ -1398,7 +1398,7 @@
{
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_GENERATOR_IMPORT_KEY_SFID,
+ .sfn_id = TFM_CRYPTO_GENERATOR_IMPORT_KEY_SID,
.key_handle = handle,
.type = type,
.op_handle = generator->handle,
@@ -1426,7 +1426,7 @@
{
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_GENERATOR_ABORT_SFID,
+ .sfn_id = TFM_CRYPTO_GENERATOR_ABORT_SID,
.op_handle = generator->handle,
};
@@ -1462,7 +1462,7 @@
{
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_KEY_DERIVATION_SFID,
+ .sfn_id = TFM_CRYPTO_KEY_DERIVATION_SID,
.key_handle = handle,
.alg = alg,
.op_handle = generator->handle,
@@ -1522,7 +1522,7 @@
{
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_KEY_AGREEMENT_SFID,
+ .sfn_id = TFM_CRYPTO_KEY_AGREEMENT_SID,
.key_handle = private_key,
.alg = alg,
.op_handle = generator->handle,
@@ -1556,7 +1556,7 @@
{
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_GENERATE_RANDOM_SFID,
+ .sfn_id = TFM_CRYPTO_GENERATE_RANDOM_SID,
};
psa_invec in_vec[] = {
@@ -1593,7 +1593,7 @@
{
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_GENERATE_KEY_SFID,
+ .sfn_id = TFM_CRYPTO_GENERATE_KEY_SID,
.key_handle = handle,
.type = type,
};
diff --git a/secure_fw/services/audit_logging/manifest.yaml b/secure_fw/services/audit_logging/manifest.yaml
index cc3c5a2..fb56a6a 100644
--- a/secure_fw/services/audit_logging/manifest.yaml
+++ b/secure_fw/services/audit_logging/manifest.yaml
@@ -22,39 +22,44 @@
],
"secure_functions": [
{
- "sfid": "TFM_AUDIT_RETRIEVE_RECORD_SFID",
+ "name": "TFM_AUDIT_RETRIEVE_RECORD",
"signal": "AUDIT_CORE_RETRIEVE_RECORD",
+ "sid": "0x00000000",
"non_secure_clients": true,
"minor_version": 1,
- "minor_policy": "strict"
+ "minor_policy": "STRICT"
},
{
- "sfid": "TFM_AUDIT_ADD_RECORD_SFID",
+ "name": "TFM_AUDIT_ADD_RECORD",
"signal": "AUDIT_CORE_ADD_RECORD",
+ "sid": "0x00000001",
"non_secure_clients": false,
"minor_version": 1,
- "minor_policy": "strict"
+ "minor_policy": "STRICT"
},
{
- "sfid": "TFM_AUDIT_GET_INFO_SFID",
+ "name": "TFM_AUDIT_GET_INFO",
"signal": "AUDIT_CORE_GET_INFO",
+ "sid": "0x00000002",
"non_secure_clients": true,
"minor_version": 1,
- "minor_policy": "strict"
+ "minor_policy": "STRICT"
},
{
- "sfid": "TFM_AUDIT_GET_RECORD_INFO_SFID",
+ "name": "TFM_AUDIT_GET_RECORD_INFO",
"signal": "AUDIT_CORE_GET_RECORD_INFO",
+ "sid": "0x00000003",
"non_secure_clients": true,
"minor_version": 1,
- "minor_policy": "strict"
+ "minor_policy": "STRICT"
},
{
- "sfid": "TFM_AUDIT_DELETE_RECORD_SFID",
+ "name": "TFM_AUDIT_DELETE_RECORD",
"signal": "AUDIT_CORE_DELETE_RECORD",
+ "sid": "0x00000004",
"non_secure_clients": true,
"minor_version": 1,
- "minor_policy": "strict"
+ "minor_policy": "STRICT"
}
],
"linker_pattern": {
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;
diff --git a/secure_fw/services/crypto/manifest.yaml b/secure_fw/services/crypto/manifest.yaml
index 768203f..e488f1b 100644
--- a/secure_fw/services/crypto/manifest.yaml
+++ b/secure_fw/services/crypto/manifest.yaml
@@ -15,310 +15,310 @@
"heap_size": "0x0400",
"secure_functions": [
{
- "sfid": "TFM_CRYPTO_ALLOCATE_KEY_SFID",
+ "name": "TFM_CRYPTO_ALLOCATE_KEY",
"signal": "TFM_CRYPTO_ALLOCATE_KEY",
"non_secure_clients": true,
"minor_version": 1,
- "minor_policy": "strict"
+ "minor_policy": "STRICT"
},
{
- "sfid": "TFM_CRYPTO_IMPORT_KEY_SFID",
+ "name": "TFM_CRYPTO_IMPORT_KEY",
"signal": "TFM_CRYPTO_IMPORT_KEY",
"non_secure_clients": true,
"minor_version": 1,
- "minor_policy": "strict"
+ "minor_policy": "STRICT"
},
{
- "sfid": "TFM_CRYPTO_DESTROY_KEY_SFID",
+ "name": "TFM_CRYPTO_DESTROY_KEY",
"signal": "TFM_CRYPTO_DESTROY_KEY",
"non_secure_clients": true,
"minor_version": 1,
- "minor_policy": "strict"
+ "minor_policy": "STRICT"
},
{
- "sfid": "TFM_CRYPTO_GET_KEY_INFORMATION_SFID",
+ "name": "TFM_CRYPTO_GET_KEY_INFORMATION",
"signal": "TFM_CRYPTO_GET_KEY_INFORMATION",
"non_secure_clients": true,
"minor_version": 1,
- "minor_policy": "strict"
+ "minor_policy": "STRICT"
},
{
- "sfid": "TFM_CRYPTO_EXPORT_KEY_SFID",
+ "name": "TFM_CRYPTO_EXPORT_KEY",
"signal": "TFM_CRYPTO_EXPORT_KEY",
"non_secure_clients": true,
"minor_version": 1,
- "minor_policy": "strict"
+ "minor_policy": "STRICT"
},
{
- "sfid": "TFM_CRYPTO_EXPORT_PUBLIC_KEY_SFID",
+ "name": "TFM_CRYPTO_EXPORT_PUBLIC_KEY",
"signal": "TFM_CRYPTO_EXPORT_PUBLIC_KEY",
"non_secure_clients": true,
"minor_version": 1,
- "minor_policy": "strict"
+ "minor_policy": "STRICT"
},
{
- "sfid": "TFM_CRYPTO_COPY_KEY_SFID",
+ "name": "TFM_CRYPTO_COPY_KEY",
"signal": "TFM_CRYPTO_COPY_KEY",
"non_secure_clients": true,
"minor_version": 1,
- "minor_policy": "strict"
+ "minor_policy": "STRICT"
},
{
- "sfid": "TFM_CRYPTO_SET_KEY_POLICY_SFID",
+ "name": "TFM_CRYPTO_SET_KEY_POLICY",
"signal": "TFM_CRYPTO_SET_KEY_POLICY",
"non_secure_clients": true,
"minor_version": 1,
- "minor_policy": "strict"
+ "minor_policy": "STRICT"
},
{
- "sfid": "TFM_CRYPTO_GET_KEY_POLICY_SFID",
+ "name": "TFM_CRYPTO_GET_KEY_POLICY",
"signal": "TFM_CRYPTO_GET_KEY_POLICY",
"non_secure_clients": true,
"minor_version": 1,
- "minor_policy": "strict"
+ "minor_policy": "STRICT"
},
{
- "sfid": "TFM_CRYPTO_GET_KEY_LIFETIME_SFID",
+ "name": "TFM_CRYPTO_GET_KEY_LIFETIME",
"signal": "TFM_CRYPTO_GET_KEY_LIFETIME",
"non_secure_clients": true,
"minor_version": 1,
- "minor_policy": "strict"
+ "minor_policy": "STRICT"
},
{
- "sfid": "TFM_CRYPTO_CIPHER_GENERATE_IV_SFID",
+ "name": "TFM_CRYPTO_CIPHER_GENERATE_IV",
"signal": "TFM_CRYPTO_CIPHER_GENERATE_IV",
"non_secure_clients": true,
"minor_version": 1,
- "minor_policy": "strict"
+ "minor_policy": "STRICT"
},
{
- "sfid": "TFM_CRYPTO_CIPHER_SET_IV_SFID",
+ "name": "TFM_CRYPTO_CIPHER_SET_IV",
"signal": "TFM_CRYPTO_CIPHER_SET_IV",
"non_secure_clients": true,
"minor_version": 1,
- "minor_policy": "strict"
+ "minor_policy": "STRICT"
},
{
- "sfid": "TFM_CRYPTO_CIPHER_ENCRYPT_SETUP_SFID",
+ "name": "TFM_CRYPTO_CIPHER_ENCRYPT_SETUP",
"signal": "TFM_CRYPTO_CIPHER_ENCRYPT_SETUP",
"non_secure_clients": true,
"minor_version": 1,
- "minor_policy": "strict"
+ "minor_policy": "STRICT"
},
{
- "sfid": "TFM_CRYPTO_CIPHER_DECRYPT_SETUP_SFID",
+ "name": "TFM_CRYPTO_CIPHER_DECRYPT_SETUP",
"signal": "TFM_CRYPTO_CIPHER_DECRYPT_SETUP",
"non_secure_clients": true,
"minor_version": 1,
- "minor_policy": "strict"
+ "minor_policy": "STRICT"
},
{
- "sfid": "TFM_CRYPTO_CIPHER_UPDATE_SFID",
+ "name": "TFM_CRYPTO_CIPHER_UPDATE",
"signal": "TFM_CRYPTO_CIPHER_UPDATE",
"non_secure_clients": true,
"minor_version": 1,
- "minor_policy": "strict"
+ "minor_policy": "STRICT"
},
{
- "sfid": "TFM_CRYPTO_CIPHER_ABORT_SFID",
+ "name": "TFM_CRYPTO_CIPHER_ABORT",
"signal": "TFM_CRYPTO_CIPHER_ABORT",
"non_secure_clients": true,
"minor_version": 1,
- "minor_policy": "strict"
+ "minor_policy": "STRICT"
},
{
- "sfid": "TFM_CRYPTO_CIPHER_FINISH_SFID",
+ "name": "TFM_CRYPTO_CIPHER_FINISH",
"signal": "TFM_CRYPTO_CIPHER_FINISH",
"non_secure_clients": true,
"minor_version": 1,
- "minor_policy": "strict"
+ "minor_policy": "STRICT"
},
{
- "sfid": "TFM_CRYPTO_HASH_SETUP_SFID",
+ "name": "TFM_CRYPTO_HASH_SETUP",
"signal": "TFM_CRYPTO_HASH_SETUP",
"non_secure_clients": true,
"minor_version": 1,
- "minor_policy": "strict"
+ "minor_policy": "STRICT"
},
{
- "sfid": "TFM_CRYPTO_HASH_UPDATE_SFID",
+ "name": "TFM_CRYPTO_HASH_UPDATE",
"signal": "TFM_CRYPTO_HASH_UPDATE",
"non_secure_clients": true,
"minor_version": 1,
- "minor_policy": "strict"
+ "minor_policy": "STRICT"
},
{
- "sfid": "TFM_CRYPTO_HASH_FINISH_SFID",
+ "name": "TFM_CRYPTO_HASH_FINISH",
"signal": "TFM_CRYPTO_HASH_FINISH",
"non_secure_clients": true,
"minor_version": 1,
- "minor_policy": "strict"
+ "minor_policy": "STRICT"
},
{
- "sfid": "TFM_CRYPTO_HASH_VERIFY_SFID",
+ "name": "TFM_CRYPTO_HASH_VERIFY",
"signal": "TFM_CRYPTO_HASH_VERIFY",
"non_secure_clients": true,
"minor_version": 1,
- "minor_policy": "strict"
+ "minor_policy": "STRICT"
},
{
- "sfid": "TFM_CRYPTO_HASH_ABORT_SFID",
+ "name": "TFM_CRYPTO_HASH_ABORT",
"signal": "TFM_CRYPTO_HASH_ABORT",
"non_secure_clients": true,
"minor_version": 1,
- "minor_policy": "strict"
+ "minor_policy": "STRICT"
},
{
- "sfid": "TFM_CRYPTO_HASH_CLONE_SFID",
+ "name": "TFM_CRYPTO_HASH_CLONE",
"signal": "TFM_CRYPTO_HASH_CLONE",
"non_secure_clients": true,
"minor_version": 1,
- "minor_policy": "strict"
+ "minor_policy": "STRICT"
},
{
- "sfid": "TFM_CRYPTO_MAC_SIGN_SETUP_SFID",
+ "name": "TFM_CRYPTO_MAC_SIGN_SETUP",
"signal": "TFM_CRYPTO_MAC_SIGN_SETUP",
"non_secure_clients": true,
"minor_version": 1,
- "minor_policy": "strict"
+ "minor_policy": "STRICT"
},
{
- "sfid": "TFM_CRYPTO_MAC_VERIFY_SETUP_SFID",
+ "name": "TFM_CRYPTO_MAC_VERIFY_SETUP",
"signal": "TFM_CRYPTO_MAC_VERIFY_SETUP",
"non_secure_clients": true,
"minor_version": 1,
- "minor_policy": "strict"
+ "minor_policy": "STRICT"
},
{
- "sfid": "TFM_CRYPTO_MAC_UPDATE_SFID",
+ "name": "TFM_CRYPTO_MAC_UPDATE",
"signal": "TFM_CRYPTO_MAC_UPDATE",
"non_secure_clients": true,
"minor_version": 1,
- "minor_policy": "strict"
+ "minor_policy": "STRICT"
},
{
- "sfid": "TFM_CRYPTO_MAC_SIGN_FINISH_SFID",
+ "name": "TFM_CRYPTO_MAC_SIGN_FINISH",
"signal": "TFM_CRYPTO_MAC_SIGN_FINISH",
"non_secure_clients": true,
"minor_version": 1,
- "minor_policy": "strict"
+ "minor_policy": "STRICT"
},
{
- "sfid": "TFM_CRYPTO_MAC_VERIFY_FINISH_SFID",
+ "name": "TFM_CRYPTO_MAC_VERIFY_FINISH",
"signal": "TFM_CRYPTO_MAC_VERIFY_FINISH",
"non_secure_clients": true,
"minor_version": 1,
- "minor_policy": "strict"
+ "minor_policy": "STRICT"
},
{
- "sfid": "TFM_CRYPTO_MAC_ABORT_SFID",
+ "name": "TFM_CRYPTO_MAC_ABORT",
"signal": "TFM_CRYPTO_MAC_ABORT",
"non_secure_clients": true,
"minor_version": 1,
- "minor_policy": "strict"
+ "minor_policy": "STRICT"
},
{
- "sfid": "TFM_CRYPTO_AEAD_ENCRYPT_SFID",
+ "name": "TFM_CRYPTO_AEAD_ENCRYPT",
"signal": "TFM_CRYPTO_AEAD_ENCRYPT",
"non_secure_clients": true,
"minor_version": 1,
- "minor_policy": "strict"
+ "minor_policy": "STRICT"
},
{
- "sfid": "TFM_CRYPTO_AEAD_DECRYPT_SFID",
+ "name": "TFM_CRYPTO_AEAD_DECRYPT",
"signal": "TFM_CRYPTO_AEAD_DECRYPT",
"non_secure_clients": true,
"minor_version": 1,
- "minor_policy": "strict"
+ "minor_policy": "STRICT"
},
{
- "sfid": "TFM_CRYPTO_ASYMMETRIC_SIGN_SFID",
+ "name": "TFM_CRYPTO_ASYMMETRIC_SIGN",
"signal": "TFM_CRYPTO_ASYMMETRIC_SIGN",
"non_secure_clients": true,
"minor_version": 1,
- "minor_policy": "strict"
+ "minor_policy": "STRICT"
},
{
- "sfid": "TFM_CRYPTO_ASYMMETRIC_VERIFY_SFID",
+ "name": "TFM_CRYPTO_ASYMMETRIC_VERIFY",
"signal": "TFM_CRYPTO_ASYMMETRIC_VERIFY",
"non_secure_clients": true,
"minor_version": 1,
- "minor_policy": "strict"
+ "minor_policy": "STRICT"
},
{
- "sfid": "TFM_CRYPTO_ASYMMETRIC_ENCRYPT_SFID",
+ "name": "TFM_CRYPTO_ASYMMETRIC_ENCRYPT",
"signal": "TFM_CRYPTO_ASYMMETRIC_ENCRYPT",
"non_secure_clients": true,
"minor_version": 1,
- "minor_policy": "strict"
+ "minor_policy": "STRICT"
},
{
- "sfid": "TFM_CRYPTO_ASYMMETRIC_DECRYPT_SFID",
+ "name": "TFM_CRYPTO_ASYMMETRIC_DECRYPT",
"signal": "TFM_CRYPTO_ASYMMETRIC_DECRYPT",
"non_secure_clients": true,
"minor_version": 1,
- "minor_policy": "strict"
+ "minor_policy": "STRICT"
},
{
- "sfid": "TFM_CRYPTO_GET_GENERATOR_CAPACITY_SFID",
+ "name": "TFM_CRYPTO_GET_GENERATOR_CAPACITY",
"signal": "TFM_CRYPTO_GET_GENERATOR_CAPACITY",
"non_secure_clients": true,
"minor_version": 1,
- "minor_policy": "strict"
+ "minor_policy": "STRICT"
},
{
- "sfid": "TFM_CRYPTO_GENERATOR_READ_SFID",
+ "name": "TFM_CRYPTO_GENERATOR_READ",
"signal": "TFM_CRYPTO_GENERATOR_READ",
"non_secure_clients": true,
"minor_version": 1,
- "minor_policy": "strict"
+ "minor_policy": "STRICT"
},
{
- "sfid": "TFM_CRYPTO_GENERATOR_IMPORT_KEY_SFID",
+ "name": "TFM_CRYPTO_GENERATOR_IMPORT_KEY",
"signal": "TFM_CRYPTO_GENERATOR_IMPORT_KEY",
"non_secure_clients": true,
"minor_version": 1,
- "minor_policy": "strict"
+ "minor_policy": "STRICT"
},
{
- "sfid": "TFM_CRYPTO_GENERATOR_ABORT_SFID",
+ "name": "TFM_CRYPTO_GENERATOR_ABORT",
"signal": "TFM_CRYPTO_GENERATOR_ABORT",
"non_secure_clients": true,
"minor_version": 1,
- "minor_policy": "strict"
+ "minor_policy": "STRICT"
},
{
- "sfid": "TFM_CRYPTO_KEY_DERIVATION_SFID",
+ "name": "TFM_CRYPTO_KEY_DERIVATION",
"signal": "TFM_CRYPTO_KEY_DERIVATION",
"non_secure_clients": true,
"minor_version": 1,
- "minor_policy": "strict"
+ "minor_policy": "STRICT"
},
{
- "sfid": "TFM_CRYPTO_KEY_AGREEMENT_SFID",
+ "name": "TFM_CRYPTO_KEY_AGREEMENT",
"signal": "TFM_CRYPTO_KEY_AGREEMENT",
"non_secure_clients": true,
"minor_version": 1,
- "minor_policy": "strict"
+ "minor_policy": "STRICT"
},
{
- "sfid": "TFM_CRYPTO_GENERATE_RANDOM_SFID",
+ "name": "TFM_CRYPTO_GENERATE_RANDOM",
"signal": "TFM_CRYPTO_GENERATE_RANDOM",
"non_secure_clients": true,
"minor_version": 1,
- "minor_policy": "strict"
+ "minor_policy": "STRICT"
},
{
- "sfid": "TFM_CRYPTO_GENERATE_KEY_SFID",
+ "name": "TFM_CRYPTO_GENERATE_KEY",
"signal": "TFM_CRYPTO_GENERATE_KEY",
"non_secure_clients": true,
"minor_version": 1,
- "minor_policy": "strict"
+ "minor_policy": "STRICT"
},
],
"services" : [
{
- "name": "TFM_CRYPTO_SID",
+ "name": "TFM_CRYPTO",
"sid": "0x00004000",
"signal": "TFM_CRYPTO_SIG",
"non_secure_clients": "true",
diff --git a/secure_fw/services/crypto/tfm_crypto_secure_api.c b/secure_fw/services/crypto/tfm_crypto_secure_api.c
index 8c3fd47..3ebe23c 100644
--- a/secure_fw/services/crypto/tfm_crypto_secure_api.c
+++ b/secure_fw/services/crypto/tfm_crypto_secure_api.c
@@ -62,7 +62,7 @@
{
psa_status_t status;
const struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_ALLOCATE_KEY_SFID,
+ .sfn_id = TFM_CRYPTO_ALLOCATE_KEY_SID,
};
psa_invec in_vec[] = {
{.base = &iov, .len = sizeof(struct tfm_crypto_pack_iovec)},
@@ -127,7 +127,7 @@
{
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_IMPORT_KEY_SFID,
+ .sfn_id = TFM_CRYPTO_IMPORT_KEY_SID,
.key_handle = handle,
.type = type,
};
@@ -154,7 +154,7 @@
{
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_DESTROY_KEY_SFID,
+ .sfn_id = TFM_CRYPTO_DESTROY_KEY_SID,
.key_handle = handle,
};
psa_invec in_vec[] = {
@@ -181,7 +181,7 @@
{
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_GET_KEY_INFORMATION_SFID,
+ .sfn_id = TFM_CRYPTO_GET_KEY_INFORMATION_SID,
.key_handle = handle,
};
psa_invec in_vec[] = {
@@ -213,7 +213,7 @@
{
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_EXPORT_KEY_SFID,
+ .sfn_id = TFM_CRYPTO_EXPORT_KEY_SID,
.key_handle = handle,
};
psa_invec in_vec[] = {
@@ -247,7 +247,7 @@
{
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_EXPORT_PUBLIC_KEY_SFID,
+ .sfn_id = TFM_CRYPTO_EXPORT_PUBLIC_KEY_SID,
.key_handle = handle,
};
@@ -281,7 +281,7 @@
{
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_COPY_KEY_SFID,
+ .sfn_id = TFM_CRYPTO_COPY_KEY_SID,
.key_handle = source_handle,
};
@@ -331,7 +331,7 @@
{
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_SET_KEY_POLICY_SFID,
+ .sfn_id = TFM_CRYPTO_SET_KEY_POLICY_SID,
.key_handle = handle,
};
@@ -359,7 +359,7 @@
{
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_GET_KEY_POLICY_SFID,
+ .sfn_id = TFM_CRYPTO_GET_KEY_POLICY_SID,
.key_handle = handle,
};
@@ -389,7 +389,7 @@
{
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_GET_KEY_LIFETIME_SFID,
+ .sfn_id = TFM_CRYPTO_GET_KEY_LIFETIME_SID,
.key_handle = handle,
};
@@ -421,7 +421,7 @@
{
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_CIPHER_GENERATE_IV_SFID,
+ .sfn_id = TFM_CRYPTO_CIPHER_GENERATE_IV_SID,
.op_handle = operation->handle,
};
@@ -456,7 +456,7 @@
{
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_CIPHER_SET_IV_SFID,
+ .sfn_id = TFM_CRYPTO_CIPHER_SET_IV_SID,
.op_handle = operation->handle,
};
@@ -488,7 +488,7 @@
{
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_CIPHER_ENCRYPT_SETUP_SFID,
+ .sfn_id = TFM_CRYPTO_CIPHER_ENCRYPT_SETUP_SID,
.key_handle = handle,
.alg = alg,
.op_handle = operation->handle,
@@ -521,7 +521,7 @@
{
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_CIPHER_DECRYPT_SETUP_SFID,
+ .sfn_id = TFM_CRYPTO_CIPHER_DECRYPT_SETUP_SID,
.key_handle = handle,
.alg = alg,
.op_handle = operation->handle,
@@ -557,7 +557,7 @@
{
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_CIPHER_UPDATE_SFID,
+ .sfn_id = TFM_CRYPTO_CIPHER_UPDATE_SID,
.op_handle = operation->handle,
};
@@ -591,7 +591,7 @@
{
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_CIPHER_ABORT_SFID,
+ .sfn_id = TFM_CRYPTO_CIPHER_ABORT_SID,
.op_handle = operation->handle,
};
@@ -623,7 +623,7 @@
{
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_CIPHER_FINISH_SFID,
+ .sfn_id = TFM_CRYPTO_CIPHER_FINISH_SID,
.op_handle = operation->handle,
};
@@ -657,7 +657,7 @@
{
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_HASH_SETUP_SFID,
+ .sfn_id = TFM_CRYPTO_HASH_SETUP_SID,
.alg = alg,
.op_handle = operation->handle,
};
@@ -690,7 +690,7 @@
{
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_HASH_UPDATE_SFID,
+ .sfn_id = TFM_CRYPTO_HASH_UPDATE_SID,
.op_handle = operation->handle,
};
@@ -724,7 +724,7 @@
{
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_HASH_FINISH_SFID,
+ .sfn_id = TFM_CRYPTO_HASH_FINISH_SID,
.op_handle = operation->handle,
};
@@ -759,7 +759,7 @@
{
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_HASH_VERIFY_SFID,
+ .sfn_id = TFM_CRYPTO_HASH_VERIFY_SID,
.op_handle = operation->handle,
};
@@ -789,7 +789,7 @@
{
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_HASH_ABORT_SFID,
+ .sfn_id = TFM_CRYPTO_HASH_ABORT_SID,
.op_handle = operation->handle,
};
@@ -819,7 +819,7 @@
{
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_HASH_CLONE_SFID,
+ .sfn_id = TFM_CRYPTO_HASH_CLONE_SID,
.op_handle = source_operation->handle,
};
@@ -850,7 +850,7 @@
{
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_MAC_SIGN_SETUP_SFID,
+ .sfn_id = TFM_CRYPTO_MAC_SIGN_SETUP_SID,
.key_handle = handle,
.alg = alg,
.op_handle = operation->handle,
@@ -883,7 +883,7 @@
{
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_MAC_VERIFY_SETUP_SFID,
+ .sfn_id = TFM_CRYPTO_MAC_VERIFY_SETUP_SID,
.key_handle = handle,
.alg = alg,
.op_handle = operation->handle,
@@ -916,7 +916,7 @@
{
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_MAC_UPDATE_SFID,
+ .sfn_id = TFM_CRYPTO_MAC_UPDATE_SID,
.op_handle = operation->handle,
};
@@ -949,7 +949,7 @@
{
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_MAC_SIGN_FINISH_SFID,
+ .sfn_id = TFM_CRYPTO_MAC_SIGN_FINISH_SID,
.op_handle = operation->handle,
};
@@ -984,7 +984,7 @@
{
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_MAC_VERIFY_FINISH_SFID,
+ .sfn_id = TFM_CRYPTO_MAC_VERIFY_FINISH_SID,
.op_handle = operation->handle,
};
@@ -1015,7 +1015,7 @@
{
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_MAC_ABORT_SFID,
+ .sfn_id = TFM_CRYPTO_MAC_ABORT_SID,
.op_handle = operation->handle,
};
@@ -1054,7 +1054,7 @@
{
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_AEAD_ENCRYPT_SFID,
+ .sfn_id = TFM_CRYPTO_AEAD_ENCRYPT_SID,
.key_handle = handle,
.alg = alg,
.aead_in = {.nonce = {0}, .nonce_length = nonce_length}
@@ -1125,7 +1125,7 @@
{
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_AEAD_DECRYPT_SFID,
+ .sfn_id = TFM_CRYPTO_AEAD_DECRYPT_SID,
.key_handle = handle,
.alg = alg,
.aead_in = {.nonce = {0}, .nonce_length = nonce_length}
@@ -1192,7 +1192,7 @@
{
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_ASYMMETRIC_SIGN_SFID,
+ .sfn_id = TFM_CRYPTO_ASYMMETRIC_SIGN_SID,
.key_handle = handle,
.alg = alg,
};
@@ -1231,7 +1231,7 @@
{
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_ASYMMETRIC_VERIFY_SFID,
+ .sfn_id = TFM_CRYPTO_ASYMMETRIC_VERIFY_SID,
.key_handle = handle,
.alg = alg
};
@@ -1268,7 +1268,7 @@
{
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_ASYMMETRIC_ENCRYPT_SFID,
+ .sfn_id = TFM_CRYPTO_ASYMMETRIC_ENCRYPT_SID,
.key_handle = handle,
.alg = alg
};
@@ -1326,7 +1326,7 @@
{
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_ASYMMETRIC_DECRYPT_SFID,
+ .sfn_id = TFM_CRYPTO_ASYMMETRIC_DECRYPT_SID,
.key_handle = handle,
.alg = alg
};
@@ -1377,7 +1377,7 @@
{
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_GET_GENERATOR_CAPACITY_SFID,
+ .sfn_id = TFM_CRYPTO_GET_GENERATOR_CAPACITY_SID,
.op_handle = generator->handle,
};
@@ -1409,7 +1409,7 @@
{
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_GENERATOR_READ_SFID,
+ .sfn_id = TFM_CRYPTO_GENERATOR_READ_SID,
.op_handle = generator->handle,
};
@@ -1442,7 +1442,7 @@
{
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_GENERATOR_IMPORT_KEY_SFID,
+ .sfn_id = TFM_CRYPTO_GENERATOR_IMPORT_KEY_SID,
.key_handle = handle,
.type = type,
.op_handle = generator->handle,
@@ -1471,7 +1471,7 @@
{
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_GENERATOR_ABORT_SFID,
+ .sfn_id = TFM_CRYPTO_GENERATOR_ABORT_SID,
.op_handle = generator->handle,
};
@@ -1508,7 +1508,7 @@
{
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_KEY_DERIVATION_SFID,
+ .sfn_id = TFM_CRYPTO_KEY_DERIVATION_SID,
.key_handle = handle,
.alg = alg,
.op_handle = generator->handle,
@@ -1569,7 +1569,7 @@
{
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_KEY_AGREEMENT_SFID,
+ .sfn_id = TFM_CRYPTO_KEY_AGREEMENT_SID,
.key_handle = private_key,
.alg = alg,
.op_handle = generator->handle,
@@ -1604,7 +1604,7 @@
{
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_GENERATE_RANDOM_SFID,
+ .sfn_id = TFM_CRYPTO_GENERATE_RANDOM_SID,
};
psa_invec in_vec[] = {
@@ -1642,7 +1642,7 @@
{
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_GENERATE_KEY_SFID,
+ .sfn_id = TFM_CRYPTO_GENERATE_KEY_SID,
.key_handle = handle,
.type = type,
};
diff --git a/secure_fw/services/initial_attestation/manifest.yaml b/secure_fw/services/initial_attestation/manifest.yaml
index 4c1b5a1..4ccd587 100644
--- a/secure_fw/services/initial_attestation/manifest.yaml
+++ b/secure_fw/services/initial_attestation/manifest.yaml
@@ -15,18 +15,20 @@
"heap_size": "0x0400",
"secure_functions": [
{
- "sfid": "TFM_ATTEST_GET_TOKEN_SFID",
+ "name": "TFM_ATTEST_GET_TOKEN",
"signal": "INITIAL_ATTEST_GET_TOKEN",
+ "sid": "0x00000020",
"non_secure_clients": true,
"minor_version": 1,
- "minor_policy": "strict"
+ "minor_policy": "STRICT"
},
{
- "sfid": "TFM_ATTEST_GET_TOKEN_SIZE_SFID",
+ "name": "TFM_ATTEST_GET_TOKEN_SIZE",
"signal": "INITIAL_ATTEST_GET_TOKEN_SIZE",
+ "sid": "0x00000021",
"non_secure_clients": true,
"minor_version": 1,
- "minor_policy": "strict"
+ "minor_policy": "STRICT"
}
],
"linker_pattern": {
@@ -36,7 +38,7 @@
},
"services": [
{
- "name": "TFM_ATTEST_GET_TOKEN_SID",
+ "name": "TFM_ATTEST_GET_TOKEN",
"sid": "0x00000020",
"signal": "PSA_ATTEST_GET_TOKEN_SIG",
"non_secure_clients": "true",
@@ -44,7 +46,7 @@
"minor_policy": "STRICT"
},
{
- "name": "TFM_ATTEST_GET_TOKEN_SIZE_SID",
+ "name": "TFM_ATTEST_GET_TOKEN_SIZE",
"sid": "0x00000021",
"signal": "PSA_ATTEST_GET_TOKEN_SIZE_SIG",
"non_secure_clients": "true",
diff --git a/secure_fw/services/platform/manifest.yaml b/secure_fw/services/platform/manifest.yaml
index 3f08793..2274e38 100644
--- a/secure_fw/services/platform/manifest.yaml
+++ b/secure_fw/services/platform/manifest.yaml
@@ -15,18 +15,20 @@
"heap_size": "0x0400",
"secure_functions": [
{
- "sfid": "TFM_SP_PLATFORM_SYSTEM_RESET_SFID",
+ "name": "TFM_SP_PLATFORM_SYSTEM_RESET",
"signal": "PLATFORM_SP_SYSTEM_RESET",
+ "sid": "0x00000040",
"non_secure_clients": true,
"minor_version": 1,
- "minor_policy": "strict"
+ "minor_policy": "STRICT"
},
{
- "sfid": "TFM_SP_PLATFORM_IOCTL_SFID",
+ "name": "TFM_SP_PLATFORM_IOCTL",
"signal": "PLATFORM_SP_IOCTL",
+ "sid": "0x00000041",
"non_secure_clients": true,
"minor_version": 1,
- "minor_policy": "strict"
+ "minor_policy": "STRICT"
}
],
"linker_pattern": {
diff --git a/secure_fw/services/secure_storage/manifest.yaml b/secure_fw/services/secure_storage/manifest.yaml
index cad5f8c..95fb463 100644
--- a/secure_fw/services/secure_storage/manifest.yaml
+++ b/secure_fw/services/secure_storage/manifest.yaml
@@ -15,43 +15,43 @@
"heap_size": "0",
"secure_functions": [
{
- "sfid": "TFM_SST_SET_SFID",
+ "name": "TFM_SST_SET",
"signal": "TFM_SST_SET_REQ",
"non_secure_clients": true,
"minor_version": 1,
- "minor_policy": "strict"
+ "minor_policy": "STRICT"
},
{
- "sfid": "TFM_SST_GET_SFID",
+ "name": "TFM_SST_GET",
"signal": "TFM_SST_GET_REQ",
"non_secure_clients": true,
"minor_version": 1,
- "minor_policy": "strict"
+ "minor_policy": "STRICT"
},
{
- "sfid": "TFM_SST_GET_INFO_SFID",
+ "name": "TFM_SST_GET_INFO",
"signal": "TFM_SST_GET_INFO_REQ",
"non_secure_clients": true,
"minor_version": 1,
- "minor_policy": "strict"
+ "minor_policy": "STRICT"
},
{
- "sfid": "TFM_SST_REMOVE_SFID",
+ "name": "TFM_SST_REMOVE",
"signal": "TFM_SST_REMOVE_REQ",
"non_secure_clients": true,
"minor_version": 1,
- "minor_policy": "strict"
+ "minor_policy": "STRICT"
},
{
- "sfid": "TFM_SST_GET_SUPPORT_SFID",
+ "name": "TFM_SST_GET_SUPPORT",
"signal": "TFM_SST_GET_SUPPORT_REQ",
"non_secure_clients": true,
"minor_version": 1,
- "minor_policy": "strict"
+ "minor_policy": "STRICT"
}
],
"services" : [{
- "name": "TFM_SST_SET_SID",
+ "name": "TFM_SST_SET",
"sid": "0x00002000",
"signal": "TFM_SST_SET_SIG",
"non_secure_clients": "true",
@@ -59,7 +59,7 @@
"minor_policy": "STRICT"
},
{
- "name": "TFM_SST_GET_SID",
+ "name": "TFM_SST_GET",
"sid": "0x00002001",
"signal": "TFM_SST_GET_SIG",
"non_secure_clients": "true",
@@ -67,7 +67,7 @@
"minor_policy": "STRICT"
},
{
- "name": "TFM_SST_GET_INFO_SID",
+ "name": "TFM_SST_GET_INFO",
"sid": "0x00002002",
"signal": "TFM_SST_GET_INFO_SIG",
"non_secure_clients": "true",
@@ -75,7 +75,7 @@
"minor_policy": "STRICT"
},
{
- "name": "TFM_SST_REMOVE_SID",
+ "name": "TFM_SST_REMOVE",
"sid": "0x00002003",
"signal": "TFM_SST_REMOVE_SIG",
"non_secure_clients": "true",
@@ -83,7 +83,7 @@
"minor_policy": "STRICT"
},
{
- "name": "TFM_SST_GET_SUPPORT_SID",
+ "name": "TFM_SST_GET_SUPPORT",
"sid": "0x00002004",
"signal": "TFM_SST_GET_SUPPORT_SIG",
"non_secure_clients": "true",
diff --git a/secure_fw/services/tfm_service_list.inc b/secure_fw/services/tfm_service_list.inc
index 8369ccf..f3bf254 100644
--- a/secure_fw/services/tfm_service_list.inc
+++ b/secure_fw/services/tfm_service_list.inc
@@ -12,7 +12,7 @@
/******** TFM_SP_STORAGE ********/
{
- "TFM_SST_SET_SID",
+ "TFM_SST_SET",
TFM_SP_STORAGE_ID,
TFM_SST_SET_SIG,
0x00002000,
@@ -21,7 +21,7 @@
TFM_VERSION_POLICY_STRICT
},
{
- "TFM_SST_GET_SID",
+ "TFM_SST_GET",
TFM_SP_STORAGE_ID,
TFM_SST_GET_SIG,
0x00002001,
@@ -30,7 +30,7 @@
TFM_VERSION_POLICY_STRICT
},
{
- "TFM_SST_GET_INFO_SID",
+ "TFM_SST_GET_INFO",
TFM_SP_STORAGE_ID,
TFM_SST_GET_INFO_SIG,
0x00002002,
@@ -39,7 +39,7 @@
TFM_VERSION_POLICY_STRICT
},
{
- "TFM_SST_REMOVE_SID",
+ "TFM_SST_REMOVE",
TFM_SP_STORAGE_ID,
TFM_SST_REMOVE_SIG,
0x00002003,
@@ -48,7 +48,7 @@
TFM_VERSION_POLICY_STRICT
},
{
- "TFM_SST_GET_SUPPORT_SID",
+ "TFM_SST_GET_SUPPORT",
TFM_SP_STORAGE_ID,
TFM_SST_GET_SUPPORT_SIG,
0x00002004,
@@ -60,7 +60,7 @@
/******** TFM_SP_CRYPTO ********/
{
- "TFM_CRYPTO_SID",
+ "TFM_CRYPTO",
TFM_SP_CRYPTO_ID,
TFM_CRYPTO_SIG,
0x00004000,
@@ -72,7 +72,7 @@
/******** TFM_SP_INITIAL_ATTESTATION ********/
{
- "TFM_ATTEST_GET_TOKEN_SID",
+ "TFM_ATTEST_GET_TOKEN",
TFM_SP_INITIAL_ATTESTATION_ID,
PSA_ATTEST_GET_TOKEN_SIG,
0x00000020,
@@ -81,7 +81,7 @@
TFM_VERSION_POLICY_STRICT
},
{
- "TFM_ATTEST_GET_TOKEN_SIZE_SID",
+ "TFM_ATTEST_GET_TOKEN_SIZE",
TFM_SP_INITIAL_ATTESTATION_ID,
PSA_ATTEST_GET_TOKEN_SIZE_SIG,
0x00000021,
@@ -93,7 +93,7 @@
#ifdef TFM_PARTITION_TEST_CORE
/******** TFM_SP_CORE_TEST ********/
{
- "SPM_CORE_TEST_INIT_SUCCESS_SID",
+ "SPM_CORE_TEST_INIT_SUCCESS",
TFM_SP_CORE_TEST_ID,
SPM_CORE_TEST_INIT_SUCCESS_SIGNAL,
0x00002100,
@@ -102,7 +102,7 @@
TFM_VERSION_POLICY_STRICT
},
{
- "SPM_CORE_TEST_DIRECT_RECURSION_SID",
+ "SPM_CORE_TEST_DIRECT_RECURSION",
TFM_SP_CORE_TEST_ID,
SPM_CORE_TEST_DIRECT_RECURSION_SIGNAL,
0x00002101,
@@ -111,7 +111,7 @@
TFM_VERSION_POLICY_STRICT
},
{
- "SPM_CORE_TEST_MPU_ACCESS_SID",
+ "SPM_CORE_TEST_MPU_ACCESS",
TFM_SP_CORE_TEST_ID,
SPM_CORE_TEST_MPU_ACCESS_SIGNAL,
0x00002102,
@@ -120,7 +120,7 @@
TFM_VERSION_POLICY_STRICT
},
{
- "SPM_CORE_TEST_MEMORY_PERMISSIONS_SID",
+ "SPM_CORE_TEST_MEMORY_PERMISSIONS",
TFM_SP_CORE_TEST_ID,
SPM_CORE_TEST_MEMORY_PERMISSIONS_SIGNAL,
0x00002103,
@@ -129,7 +129,7 @@
TFM_VERSION_POLICY_STRICT
},
{
- "SPM_CORE_TEST_SHARE_REDIRECTION_SID",
+ "SPM_CORE_TEST_SHARE_REDIRECTION",
TFM_SP_CORE_TEST_ID,
SPM_CORE_TEST_SHARE_REDIRECTION_SIGNAL,
0x00002104,
@@ -138,7 +138,7 @@
TFM_VERSION_POLICY_STRICT
},
{
- "SPM_CORE_TEST_SS_TO_SS_SID",
+ "SPM_CORE_TEST_SS_TO_SS",
TFM_SP_CORE_TEST_ID,
SPM_CORE_TEST_SS_TO_SS_SIGNAL,
0x00002105,
@@ -147,7 +147,7 @@
TFM_VERSION_POLICY_STRICT
},
{
- "SPM_CORE_TEST_SS_TO_SS_BUFFER_SID",
+ "SPM_CORE_TEST_SS_TO_SS_BUFFER",
TFM_SP_CORE_TEST_ID,
SPM_CORE_TEST_SS_TO_SS_BUFFER_SIGNAL,
0x00002106,
@@ -156,7 +156,7 @@
TFM_VERSION_POLICY_STRICT
},
{
- "SPM_CORE_TEST_OUTVEC_WRITE_SID",
+ "SPM_CORE_TEST_OUTVEC_WRITE",
TFM_SP_CORE_TEST_ID,
SPM_CORE_TEST_OUTVEC_WRITE_SIGNAL,
0x00002107,
@@ -165,7 +165,7 @@
TFM_VERSION_POLICY_STRICT
},
{
- "SPM_CORE_TEST_PERIPHERAL_ACCESS_SID",
+ "SPM_CORE_TEST_PERIPHERAL_ACCESS",
TFM_SP_CORE_TEST_ID,
SPM_CORE_TEST_PERIPHERAL_ACCESS_SIGNAL,
0x00002108,
@@ -174,7 +174,7 @@
TFM_VERSION_POLICY_STRICT
},
{
- "SPM_CORE_TEST_GET_CALLER_CLIENT_ID_SID",
+ "SPM_CORE_TEST_GET_CALLER_CLIENT_ID",
TFM_SP_CORE_TEST_ID,
SPM_CORE_TEST_GET_CALLER_CLIENT_ID_SIGNAL,
0x00002109,
@@ -183,7 +183,7 @@
TFM_VERSION_POLICY_STRICT
},
{
- "SPM_CORE_TEST_SPM_REQUEST_SID",
+ "SPM_CORE_TEST_SPM_REQUEST",
TFM_SP_CORE_TEST_ID,
SPM_CORE_TEST_SPM_REQUEST_SIGNAL,
0x0000210A,
@@ -192,7 +192,7 @@
TFM_VERSION_POLICY_STRICT
},
{
- "SPM_CORE_TEST_BLOCK_SID",
+ "SPM_CORE_TEST_BLOCK",
TFM_SP_CORE_TEST_ID,
SPM_CORE_TEST_BLOCK_SIGNAL,
0x0000210B,
@@ -201,7 +201,7 @@
TFM_VERSION_POLICY_STRICT
},
{
- "SPM_CORE_TEST_NS_THREAD_SID",
+ "SPM_CORE_TEST_NS_THREAD",
TFM_SP_CORE_TEST_ID,
SPM_CORE_TEST_NS_THREAD_SIGNAL,
0x0000210C,
@@ -214,7 +214,7 @@
#ifdef TFM_PARTITION_TEST_CORE
/******** TFM_SP_CORE_TEST_2 ********/
{
- "SPM_CORE_TEST_2_SLAVE_SERVICE_SID",
+ "SPM_CORE_TEST_2_SLAVE_SERVICE",
TFM_SP_CORE_TEST_2_ID,
SPM_CORE_TEST_2_SLAVE_SERVICE_SIGNAL,
0x00002200,
@@ -223,7 +223,7 @@
TFM_VERSION_POLICY_STRICT
},
{
- "SPM_CORE_TEST_2_CHECK_CALLER_CLIENT_ID_SID",
+ "SPM_CORE_TEST_2_CHECK_CALLER_CLIENT_ID",
TFM_SP_CORE_TEST_2_ID,
SPM_CORE_TEST_2_CHECK_CALLER_CLIENT_ID_SIGNAL,
0x00002201,
@@ -232,7 +232,7 @@
TFM_VERSION_POLICY_STRICT
},
{
- "SPM_CORE_TEST_2_GET_EVERY_SECOND_BYTE_SID",
+ "SPM_CORE_TEST_2_GET_EVERY_SECOND_BYTE",
TFM_SP_CORE_TEST_2_ID,
SPM_CORE_TEST_2_GET_EVERY_SECOND_BYTE_SIGNAL,
0x00002202,
@@ -241,7 +241,7 @@
TFM_VERSION_POLICY_STRICT
},
{
- "SPM_CORE_TEST_2_INVERT_SID",
+ "SPM_CORE_TEST_2_INVERT",
TFM_SP_CORE_TEST_2_ID,
SPM_CORE_TEST_2_INVERT_SIGNAL,
0x00002203,
@@ -254,7 +254,7 @@
#ifdef TFM_PARTITION_TEST_SECURE_SERVICES
/******** TFM_SP_SECURE_TEST_PARTITION ********/
{
- "TFM_SECURE_CLIENT_SFN_RUN_TESTS_SID",
+ "TFM_SECURE_CLIENT_SFN_RUN_TESTS",
TFM_SP_SECURE_TEST_PARTITION_ID,
TFM_SECURE_CLIENT_SFN_RUN_TESTS_SIG,
0x0000F000,
@@ -267,7 +267,7 @@
#ifdef TFM_PARTITION_TEST_CORE_IPC
/******** TFM_SP_IPC_SERVICE_TEST ********/
{
- "IPC_SERVICE_TEST_BASIC_SID",
+ "IPC_SERVICE_TEST_BASIC",
TFM_SP_IPC_SERVICE_TEST_ID,
IPC_SERVICE_TEST_BASIC_SIGNAL,
0x00001000,
@@ -276,7 +276,7 @@
TFM_VERSION_POLICY_STRICT
},
{
- "IPC_SERVICE_TEST_PSA_ACCESS_APP_MEM_SID",
+ "IPC_SERVICE_TEST_PSA_ACCESS_APP_MEM",
TFM_SP_IPC_SERVICE_TEST_ID,
IPC_SERVICE_TEST_PSA_ACCESS_APP_MEM_SIGNAL,
0x00001001,
@@ -285,7 +285,7 @@
TFM_VERSION_POLICY_STRICT
},
{
- "IPC_SERVICE_TEST_PSA_ACCESS_APP_READ_ONLY_MEM_SID",
+ "IPC_SERVICE_TEST_PSA_ACCESS_APP_READ_ONLY_MEM",
TFM_SP_IPC_SERVICE_TEST_ID,
IPC_SERVICE_TEST_PSA_ACCESS_APP_READ_ONLY_MEM_SIGNAL,
0x00001002,
@@ -294,7 +294,7 @@
TFM_VERSION_POLICY_STRICT
},
{
- "IPC_SERVICE_TEST_APP_ACCESS_PSA_MEM_SID",
+ "IPC_SERVICE_TEST_APP_ACCESS_PSA_MEM",
TFM_SP_IPC_SERVICE_TEST_ID,
IPC_SERVICE_TEST_APP_ACCESS_PSA_MEM_SIGNAL,
0x00001003,
@@ -307,7 +307,7 @@
#ifdef TFM_PARTITION_TEST_CORE_IPC
/******** TFM_SP_IPC_CLIENT_TEST ********/
{
- "IPC_CLIENT_TEST_BASIC_SID",
+ "IPC_CLIENT_TEST_BASIC",
TFM_SP_IPC_CLIENT_TEST_ID,
IPC_CLIENT_TEST_BASIC_SIGNAL,
0x00001100,
@@ -316,7 +316,7 @@
TFM_VERSION_POLICY_STRICT
},
{
- "IPC_CLIENT_TEST_PSA_ACCESS_APP_MEM_SID",
+ "IPC_CLIENT_TEST_PSA_ACCESS_APP_MEM",
TFM_SP_IPC_CLIENT_TEST_ID,
IPC_CLIENT_TEST_PSA_ACCESS_APP_MEM_SIGNAL,
0x00001101,
@@ -325,7 +325,7 @@
TFM_VERSION_POLICY_STRICT
},
{
- "IPC_CLIENT_TEST_PSA_ACCESS_APP_READ_ONLY_MEM_SID",
+ "IPC_CLIENT_TEST_PSA_ACCESS_APP_READ_ONLY_MEM",
TFM_SP_IPC_CLIENT_TEST_ID,
IPC_CLIENT_TEST_PSA_ACCESS_APP_READ_ONLY_MEM_SIGNAL,
0x00001102,
@@ -334,7 +334,7 @@
TFM_VERSION_POLICY_STRICT
},
{
- "IPC_CLIENT_TEST_APP_ACCESS_PSA_MEM_SID",
+ "IPC_CLIENT_TEST_APP_ACCESS_PSA_MEM",
TFM_SP_IPC_CLIENT_TEST_ID,
IPC_CLIENT_TEST_APP_ACCESS_PSA_MEM_SIGNAL,
0x00001103,
@@ -343,7 +343,7 @@
TFM_VERSION_POLICY_STRICT
},
{
- "IPC_CLIENT_TEST_MEM_CHECK_SID",
+ "IPC_CLIENT_TEST_MEM_CHECK",
TFM_SP_IPC_CLIENT_TEST_ID,
IPC_CLIENT_TEST_MEM_CHECK_SIGNAL,
0x00001104,
diff --git a/test/test_services/tfm_core_test/manifest.yaml b/test/test_services/tfm_core_test/manifest.yaml
index c39ff9f..93d567c 100644
--- a/test/test_services/tfm_core_test/manifest.yaml
+++ b/test/test_services/tfm_core_test/manifest.yaml
@@ -21,25 +21,25 @@
],
"secure_functions": [
{
- "sfid": "TFM_CORE_TEST_SFN_SFID",
+ "name": "TFM_CORE_TEST_SFN",
"signal": "SPM_CORE_TEST_SFN",
"non_secure_clients": true,
"minor_version": 1,
- "minor_policy": "strict"
+ "minor_policy": "STRICT"
},
{
- "sfid": "TFM_CORE_TEST_SFN_INIT_SUCCESS_SFID",
+ "name": "TFM_CORE_TEST_SFN_INIT_SUCCESS",
"signal": "SPM_CORE_TEST_SFN_INIT_SUCCESS",
"non_secure_clients": true,
"minor_version": 1,
- "minor_policy": "strict"
+ "minor_policy": "STRICT"
},
{
- "sfid": "TFM_CORE_TEST_SFN_DIRECT_RECURSION_SFID",
+ "name": "TFM_CORE_TEST_SFN_DIRECT_RECURSION",
"signal": "SPM_CORE_TEST_SFN_DIRECT_RECURSION",
"non_secure_clients": true,
"minor_version": 1,
- "minor_policy": "strict"
+ "minor_policy": "STRICT"
}
],
"linker_pattern": {
@@ -49,7 +49,7 @@
},
"services": [
{
- "name": "SPM_CORE_TEST_INIT_SUCCESS_SID",
+ "name": "SPM_CORE_TEST_INIT_SUCCESS",
"sid": "0x00002100",
"signal": "SPM_CORE_TEST_INIT_SUCCESS_SIGNAL",
"non_secure_clients": "true",
@@ -57,7 +57,7 @@
"minor_policy": "STRICT"
},
{
- "name": "SPM_CORE_TEST_DIRECT_RECURSION_SID",
+ "name": "SPM_CORE_TEST_DIRECT_RECURSION",
"sid": "0x00002101",
"signal": "SPM_CORE_TEST_DIRECT_RECURSION_SIGNAL",
"non_secure_clients": "true",
@@ -65,7 +65,7 @@
"minor_policy": "STRICT"
},
{
- "name": "SPM_CORE_TEST_MPU_ACCESS_SID",
+ "name": "SPM_CORE_TEST_MPU_ACCESS",
"sid": "0x00002102",
"signal": "SPM_CORE_TEST_MPU_ACCESS_SIGNAL",
"non_secure_clients": "true",
@@ -73,7 +73,7 @@
"minor_policy": "STRICT"
},
{
- "name": "SPM_CORE_TEST_MEMORY_PERMISSIONS_SID",
+ "name": "SPM_CORE_TEST_MEMORY_PERMISSIONS",
"sid": "0x00002103",
"signal": "SPM_CORE_TEST_MEMORY_PERMISSIONS_SIGNAL",
"non_secure_clients": "true",
@@ -81,7 +81,7 @@
"minor_policy": "STRICT"
},
{
- "name": "SPM_CORE_TEST_SHARE_REDIRECTION_SID",
+ "name": "SPM_CORE_TEST_SHARE_REDIRECTION",
"sid": "0x00002104",
"signal": "SPM_CORE_TEST_SHARE_REDIRECTION_SIGNAL",
"non_secure_clients": "true",
@@ -89,7 +89,7 @@
"minor_policy": "STRICT"
},
{
- "name": "SPM_CORE_TEST_SS_TO_SS_SID",
+ "name": "SPM_CORE_TEST_SS_TO_SS",
"sid": "0x00002105",
"signal": "SPM_CORE_TEST_SS_TO_SS_SIGNAL",
"non_secure_clients": "true",
@@ -97,7 +97,7 @@
"minor_policy": "STRICT"
},
{
- "name": "SPM_CORE_TEST_SS_TO_SS_BUFFER_SID",
+ "name": "SPM_CORE_TEST_SS_TO_SS_BUFFER",
"sid": "0x00002106",
"signal": "SPM_CORE_TEST_SS_TO_SS_BUFFER_SIGNAL",
"non_secure_clients": "true",
@@ -105,7 +105,7 @@
"minor_policy": "STRICT"
},
{
- "name": "SPM_CORE_TEST_OUTVEC_WRITE_SID",
+ "name": "SPM_CORE_TEST_OUTVEC_WRITE",
"sid": "0x00002107",
"signal": "SPM_CORE_TEST_OUTVEC_WRITE_SIGNAL",
"non_secure_clients": "true",
@@ -113,7 +113,7 @@
"minor_policy": "STRICT"
},
{
- "name": "SPM_CORE_TEST_PERIPHERAL_ACCESS_SID",
+ "name": "SPM_CORE_TEST_PERIPHERAL_ACCESS",
"sid": "0x00002108",
"signal": "SPM_CORE_TEST_PERIPHERAL_ACCESS_SIGNAL",
"non_secure_clients": "true",
@@ -121,7 +121,7 @@
"minor_policy": "STRICT"
},
{
- "name": "SPM_CORE_TEST_GET_CALLER_CLIENT_ID_SID",
+ "name": "SPM_CORE_TEST_GET_CALLER_CLIENT_ID",
"sid": "0x00002109",
"signal": "SPM_CORE_TEST_GET_CALLER_CLIENT_ID_SIGNAL",
"non_secure_clients": "true",
@@ -129,7 +129,7 @@
"minor_policy": "STRICT"
},
{
- "name": "SPM_CORE_TEST_SPM_REQUEST_SID",
+ "name": "SPM_CORE_TEST_SPM_REQUEST",
"sid": "0x0000210A",
"signal": "SPM_CORE_TEST_SPM_REQUEST_SIGNAL",
"non_secure_clients": "true",
@@ -137,7 +137,7 @@
"minor_policy": "STRICT"
},
{
- "name": "SPM_CORE_TEST_BLOCK_SID",
+ "name": "SPM_CORE_TEST_BLOCK",
"sid": "0x0000210B",
"signal": "SPM_CORE_TEST_BLOCK_SIGNAL",
"non_secure_clients": "true",
@@ -145,7 +145,7 @@
"minor_policy": "STRICT"
},
{
- "name": "SPM_CORE_TEST_NS_THREAD_SID",
+ "name": "SPM_CORE_TEST_NS_THREAD",
"sid": "0x0000210C",
"signal": "SPM_CORE_TEST_NS_THREAD_SIGNAL",
"non_secure_clients": "true",
diff --git a/test/test_services/tfm_core_test_2/manifest.yaml b/test/test_services/tfm_core_test_2/manifest.yaml
index 57a721d..c388912 100644
--- a/test/test_services/tfm_core_test_2/manifest.yaml
+++ b/test/test_services/tfm_core_test_2/manifest.yaml
@@ -15,33 +15,32 @@
"heap_size": "0",
"secure_functions": [
{
- "sfid": "TFM_CORE_TEST_2_SFN_SLAVE_SERVICE_SFID",
+ "name": "TFM_CORE_TEST_2_SFN_SLAVE_SERVICE",
"signal": "SPM_CORE_TEST_2_SLAVE_SERVICE",
"non_secure_clients": false,
"minor_version": 1,
- "minor_policy": "strict"
+ "minor_policy": "STRICT"
},
{
- "sfid": "TFM_CORE_TEST_2_SFN_INVERT_SFID",
+ "name": "TFM_CORE_TEST_2_SFN_INVERT",
"signal": "SPM_CORE_TEST_2_SFN_INVERT",
-
"non_secure_clients": true,
"minor_version": 1,
- "minor_policy": "strict"
+ "minor_policy": "STRICT"
},
{
- "sfid": "TFM_CORE_TEST_2_SFN_CHECK_CALLER_CLIENT_ID_SFID",
+ "name": "TFM_CORE_TEST_2_SFN_CHECK_CALLER_CLIENT_ID",
"signal": "SPM_CORE_TEST_2_CHECK_CALLER_CLIENT_ID",
"non_secure_clients": true,
"minor_version": 1,
- "minor_policy": "strict"
+ "minor_policy": "STRICT"
},
{
- "sfid": "TFM_CORE_TEST_2_SFN_GET_EVERY_SECOND_BYTE",
+ "name": "TFM_CORE_TEST_2_SFN_GET_EVERY_SECOND_BYTE",
"signal": "SPM_CORE_TEST_2_GET_EVERY_SECOND_BYTE",
"non_secure_clients": true,
"minor_version": 1,
- "minor_policy": "strict"
+ "minor_policy": "STRICT"
}
],
"linker_pattern": {
@@ -51,7 +50,7 @@
},
"services": [
{
- "name": "SPM_CORE_TEST_2_SLAVE_SERVICE_SID",
+ "name": "SPM_CORE_TEST_2_SLAVE_SERVICE",
"sid": "0x00002200",
"signal": "SPM_CORE_TEST_2_SLAVE_SERVICE_SIGNAL",
"non_secure_clients": "true",
@@ -59,7 +58,7 @@
"minor_policy": "STRICT"
},
{
- "name": "SPM_CORE_TEST_2_CHECK_CALLER_CLIENT_ID_SID",
+ "name": "SPM_CORE_TEST_2_CHECK_CALLER_CLIENT_ID",
"sid": "0x00002201",
"signal": "SPM_CORE_TEST_2_CHECK_CALLER_CLIENT_ID_SIGNAL",
"non_secure_clients": "true",
@@ -67,7 +66,7 @@
"minor_policy": "STRICT"
},
{
- "name": "SPM_CORE_TEST_2_GET_EVERY_SECOND_BYTE_SID",
+ "name": "SPM_CORE_TEST_2_GET_EVERY_SECOND_BYTE",
"sid": "0x00002202",
"signal": "SPM_CORE_TEST_2_GET_EVERY_SECOND_BYTE_SIGNAL",
"non_secure_clients": "true",
@@ -75,7 +74,7 @@
"minor_policy": "STRICT"
},
{
- "name": "SPM_CORE_TEST_2_INVERT_SID",
+ "name": "SPM_CORE_TEST_2_INVERT",
"sid": "0x00002203",
"signal": "SPM_CORE_TEST_2_INVERT_SIGNAL",
"non_secure_clients": "true",
diff --git a/test/test_services/tfm_ipc_client/tfm_ipc_client_partition.yaml b/test/test_services/tfm_ipc_client/tfm_ipc_client_partition.yaml
index f7c7e02..55a3842 100644
--- a/test/test_services/tfm_ipc_client/tfm_ipc_client_partition.yaml
+++ b/test/test_services/tfm_ipc_client/tfm_ipc_client_partition.yaml
@@ -17,7 +17,7 @@
],
"services" : [
{
- "name": "IPC_CLIENT_TEST_BASIC_SID",
+ "name": "IPC_CLIENT_TEST_BASIC",
"sid": "0x00001100",
"signal": "IPC_CLIENT_TEST_BASIC_SIGNAL",
"non_secure_clients": "true",
@@ -25,7 +25,7 @@
"minor_policy": "STRICT"
},
{
- "name": "IPC_CLIENT_TEST_PSA_ACCESS_APP_MEM_SID",
+ "name": "IPC_CLIENT_TEST_PSA_ACCESS_APP_MEM",
"sid": "0x00001101",
"signal": "IPC_CLIENT_TEST_PSA_ACCESS_APP_MEM_SIGNAL",
"non_secure_clients": "true",
@@ -33,7 +33,7 @@
"minor_policy": "STRICT"
},
{
- "name": "IPC_CLIENT_TEST_PSA_ACCESS_APP_READ_ONLY_MEM_SID",
+ "name": "IPC_CLIENT_TEST_PSA_ACCESS_APP_READ_ONLY_MEM",
"sid": "0x00001102",
"signal": "IPC_CLIENT_TEST_PSA_ACCESS_APP_READ_ONLY_MEM_SIGNAL",
"non_secure_clients": "true",
@@ -41,7 +41,7 @@
"minor_policy": "STRICT"
},
{
- "name": "IPC_CLIENT_TEST_APP_ACCESS_PSA_MEM_SID",
+ "name": "IPC_CLIENT_TEST_APP_ACCESS_PSA_MEM",
"sid": "0x00001103",
"signal": "IPC_CLIENT_TEST_APP_ACCESS_PSA_MEM_SIGNAL",
"non_secure_clients": "true",
@@ -49,7 +49,7 @@
"minor_policy": "STRICT"
},
{
- "name": "IPC_CLIENT_TEST_MEM_CHECK_SID",
+ "name": "IPC_CLIENT_TEST_MEM_CHECK",
"sid": "0x00001104",
"signal": "IPC_CLIENT_TEST_MEM_CHECK_SIGNAL",
"non_secure_clients": "true",
diff --git a/test/test_services/tfm_ipc_service/tfm_ipc_service_partition.yaml b/test/test_services/tfm_ipc_service/tfm_ipc_service_partition.yaml
index 97a3d28..be0133c 100644
--- a/test/test_services/tfm_ipc_service/tfm_ipc_service_partition.yaml
+++ b/test/test_services/tfm_ipc_service/tfm_ipc_service_partition.yaml
@@ -17,7 +17,7 @@
],
"services" : [
{
- "name": "IPC_SERVICE_TEST_BASIC_SID",
+ "name": "IPC_SERVICE_TEST_BASIC",
"sid": "0x00001000",
"signal": "IPC_SERVICE_TEST_BASIC_SIGNAL",
"non_secure_clients": "true",
@@ -25,7 +25,7 @@
"minor_policy": "STRICT"
},
{
- "name": "IPC_SERVICE_TEST_PSA_ACCESS_APP_MEM_SID",
+ "name": "IPC_SERVICE_TEST_PSA_ACCESS_APP_MEM",
"sid": "0x00001001",
"signal": "IPC_SERVICE_TEST_PSA_ACCESS_APP_MEM_SIGNAL",
"non_secure_clients": "true",
@@ -33,7 +33,7 @@
"minor_policy": "STRICT"
},
{
- "name": "IPC_SERVICE_TEST_PSA_ACCESS_APP_READ_ONLY_MEM_SID",
+ "name": "IPC_SERVICE_TEST_PSA_ACCESS_APP_READ_ONLY_MEM",
"sid": "0x00001002",
"signal": "IPC_SERVICE_TEST_PSA_ACCESS_APP_READ_ONLY_MEM_SIGNAL",
"non_secure_clients": "true",
@@ -41,7 +41,7 @@
"minor_policy": "STRICT"
},
{
- "name": "IPC_SERVICE_TEST_APP_ACCESS_PSA_MEM_SID",
+ "name": "IPC_SERVICE_TEST_APP_ACCESS_PSA_MEM",
"sid": "0x00001003",
"signal": "IPC_SERVICE_TEST_APP_ACCESS_PSA_MEM_SIGNAL",
"non_secure_clients": "true",
diff --git a/test/test_services/tfm_secure_client_service/manifest.yaml b/test/test_services/tfm_secure_client_service/manifest.yaml
index e1640f3..474c65d 100644
--- a/test/test_services/tfm_secure_client_service/manifest.yaml
+++ b/test/test_services/tfm_secure_client_service/manifest.yaml
@@ -21,16 +21,16 @@
],
"secure_functions": [
{
- "sfid": "TFM_SECURE_CLIENT_SFN_RUN_TESTS_SFID",
+ "name": "TFM_SECURE_CLIENT_SFN_RUN_TESTS",
"signal": "TFM_SECURE_CLIENT_SERVICE_SFN_RUN_TESTS",
"non_secure_clients": true,
"minor_version": 1,
- "minor_policy": "strict"
+ "minor_policy": "STRICT"
},
],
"services": [
{
- "name": "TFM_SECURE_CLIENT_SFN_RUN_TESTS_SID",
+ "name": "TFM_SECURE_CLIENT_SFN_RUN_TESTS",
"sid": "0x0000F000",
"signal": "TFM_SECURE_CLIENT_SFN_RUN_TESTS_SIG",
"non_secure_clients": "true",