aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEdison Ai <edison.ai@arm.com>2019-04-16 14:49:05 +0800
committerEdison Ai <edison.ai@arm.com>2019-06-28 08:53:57 +0800
commitfeb0f0c7e42ab0f9f2e5fc0e855267c96a9b8175 (patch)
tree9745c25bdebbeca617949edac1b8073d14ab084e
parent18142c645b05388786ace20ca56228fe2e8ad111 (diff)
downloadtrusted-firmware-m-feb0f0c7e42ab0f9f2e5fc0e855267c96a9b8175.tar.gz
Build: Remove "tfm_symbol" from manifest
According to PSA FF, the "tfm_symbol" need be removed from the manifest file. And use "signal" to get the secure function entry. It requests that the signal name should be the supper case of the secure function name. Change-Id: I6ff1fc3011219b7bcd21f89ad893c3f227ef12d0 Signed-off-by: Edison Ai <edison.ai@arm.com>
-rw-r--r--interface/include/tfm_veneers.h.template2
-rw-r--r--secure_fw/ns_callable/tfm_veneers.c.template4
-rw-r--r--secure_fw/services/audit_logging/manifest.yaml15
-rw-r--r--secure_fw/services/crypto/manifest.yaml43
-rw-r--r--secure_fw/services/initial_attestation/manifest.yaml6
-rw-r--r--secure_fw/services/platform/manifest.yaml6
-rw-r--r--secure_fw/services/secure_storage/manifest.yaml15
-rw-r--r--test/test_services/tfm_core_test/manifest.yaml9
-rw-r--r--test/test_services/tfm_core_test_2/manifest.yaml13
-rw-r--r--test/test_services/tfm_secure_client_service/manifest.yaml3
10 files changed, 26 insertions, 90 deletions
diff --git a/interface/include/tfm_veneers.h.template b/interface/include/tfm_veneers.h.template
index 9fcc1b31d7..3613b01ab4 100644
--- a/interface/include/tfm_veneers.h.template
+++ b/interface/include/tfm_veneers.h.template
@@ -22,7 +22,7 @@ extern "C" {
{% endif %}
/******** {{manifest.manifest.name}} ********/
{% for function in manifest.manifest.secure_functions%}
-psa_status_t tfm_{{function.tfm_symbol}}_veneer(psa_invec *in_vec, size_t in_len, psa_outvec *out_vec, size_t out_len);
+psa_status_t tfm_{{function.signal.lower()}}_veneer(psa_invec *in_vec, size_t in_len, psa_outvec *out_vec, size_t out_len);
{% endfor %}
{% if manifest.attr.conditional %}
#endif /* {{manifest.attr.conditional}} */
diff --git a/secure_fw/ns_callable/tfm_veneers.c.template b/secure_fw/ns_callable/tfm_veneers.c.template
index b58b2f3363..366d7983ef 100644
--- a/secure_fw/ns_callable/tfm_veneers.c.template
+++ b/secure_fw/ns_callable/tfm_veneers.c.template
@@ -16,7 +16,7 @@
{% endif %}
/******** {{manifest.manifest.name}} ********/
{% for sec_func in manifest.manifest.secure_functions %}
-psa_status_t {{sec_func.tfm_symbol}}(psa_invec *, size_t, psa_outvec *, size_t);
+psa_status_t {{sec_func.signal.lower()}}(psa_invec *, size_t, psa_outvec *, size_t);
{% endfor %}
{% if manifest.attr.conditional %}
#endif /* {{manifest.attr.conditional}} */
@@ -42,7 +42,7 @@ psa_status_t {{sec_func.tfm_symbol}}(psa_invec *, size_t, psa_outvec *, size_t);
{% endif %}
/******** {{manifest.manifest.name}} ********/
{% for sec_func in manifest.manifest.secure_functions %}
-TFM_VENEER_FUNCTION({{manifest.manifest.name}}, {{sec_func.tfm_symbol}})
+TFM_VENEER_FUNCTION({{manifest.manifest.name}}, {{sec_func.signal.lower()}})
{% endfor %}
{% if manifest.attr.conditional %}
#endif /* {{manifest.attr.conditional}} */
diff --git a/secure_fw/services/audit_logging/manifest.yaml b/secure_fw/services/audit_logging/manifest.yaml
index 07fb879346..cc3c5a2d66 100644
--- a/secure_fw/services/audit_logging/manifest.yaml
+++ b/secure_fw/services/audit_logging/manifest.yaml
@@ -23,40 +23,35 @@
"secure_functions": [
{
"sfid": "TFM_AUDIT_RETRIEVE_RECORD_SFID",
- "signal": "TFM_AUDIT_RETRIEVE_RECORD",
- "tfm_symbol": "audit_core_retrieve_record",
+ "signal": "AUDIT_CORE_RETRIEVE_RECORD",
"non_secure_clients": true,
"minor_version": 1,
"minor_policy": "strict"
},
{
"sfid": "TFM_AUDIT_ADD_RECORD_SFID",
- "signal": "TFM_AUDIT_ADD_RECORD",
- "tfm_symbol": "audit_core_add_record",
+ "signal": "AUDIT_CORE_ADD_RECORD",
"non_secure_clients": false,
"minor_version": 1,
"minor_policy": "strict"
},
{
"sfid": "TFM_AUDIT_GET_INFO_SFID",
- "signal": "TFM_AUDIT_GET_INFO",
- "tfm_symbol": "audit_core_get_info",
+ "signal": "AUDIT_CORE_GET_INFO",
"non_secure_clients": true,
"minor_version": 1,
"minor_policy": "strict"
},
{
"sfid": "TFM_AUDIT_GET_RECORD_INFO_SFID",
- "signal": "TFM_AUDIT_GET_RECORD_INFO",
- "tfm_symbol": "audit_core_get_record_info",
+ "signal": "AUDIT_CORE_GET_RECORD_INFO",
"non_secure_clients": true,
"minor_version": 1,
"minor_policy": "strict"
},
{
"sfid": "TFM_AUDIT_DELETE_RECORD_SFID",
- "signal": "TFM_AUDIT_DELETE_RECORD",
- "tfm_symbol": "audit_core_delete_record",
+ "signal": "AUDIT_CORE_DELETE_RECORD",
"non_secure_clients": true,
"minor_version": 1,
"minor_policy": "strict"
diff --git a/secure_fw/services/crypto/manifest.yaml b/secure_fw/services/crypto/manifest.yaml
index ca1709f0c8..768203f5d0 100644
--- a/secure_fw/services/crypto/manifest.yaml
+++ b/secure_fw/services/crypto/manifest.yaml
@@ -17,7 +17,6 @@
{
"sfid": "TFM_CRYPTO_ALLOCATE_KEY_SFID",
"signal": "TFM_CRYPTO_ALLOCATE_KEY",
- "tfm_symbol": "tfm_crypto_allocate_key",
"non_secure_clients": true,
"minor_version": 1,
"minor_policy": "strict"
@@ -25,7 +24,6 @@
{
"sfid": "TFM_CRYPTO_IMPORT_KEY_SFID",
"signal": "TFM_CRYPTO_IMPORT_KEY",
- "tfm_symbol": "tfm_crypto_import_key",
"non_secure_clients": true,
"minor_version": 1,
"minor_policy": "strict"
@@ -33,7 +31,6 @@
{
"sfid": "TFM_CRYPTO_DESTROY_KEY_SFID",
"signal": "TFM_CRYPTO_DESTROY_KEY",
- "tfm_symbol": "tfm_crypto_destroy_key",
"non_secure_clients": true,
"minor_version": 1,
"minor_policy": "strict"
@@ -41,7 +38,6 @@
{
"sfid": "TFM_CRYPTO_GET_KEY_INFORMATION_SFID",
"signal": "TFM_CRYPTO_GET_KEY_INFORMATION",
- "tfm_symbol": "tfm_crypto_get_key_information",
"non_secure_clients": true,
"minor_version": 1,
"minor_policy": "strict"
@@ -49,7 +45,6 @@
{
"sfid": "TFM_CRYPTO_EXPORT_KEY_SFID",
"signal": "TFM_CRYPTO_EXPORT_KEY",
- "tfm_symbol": "tfm_crypto_export_key",
"non_secure_clients": true,
"minor_version": 1,
"minor_policy": "strict"
@@ -57,7 +52,6 @@
{
"sfid": "TFM_CRYPTO_EXPORT_PUBLIC_KEY_SFID",
"signal": "TFM_CRYPTO_EXPORT_PUBLIC_KEY",
- "tfm_symbol": "tfm_crypto_export_public_key",
"non_secure_clients": true,
"minor_version": 1,
"minor_policy": "strict"
@@ -65,7 +59,6 @@
{
"sfid": "TFM_CRYPTO_COPY_KEY_SFID",
"signal": "TFM_CRYPTO_COPY_KEY",
- "tfm_symbol": "tfm_crypto_copy_key",
"non_secure_clients": true,
"minor_version": 1,
"minor_policy": "strict"
@@ -73,7 +66,6 @@
{
"sfid": "TFM_CRYPTO_SET_KEY_POLICY_SFID",
"signal": "TFM_CRYPTO_SET_KEY_POLICY",
- "tfm_symbol": "tfm_crypto_set_key_policy",
"non_secure_clients": true,
"minor_version": 1,
"minor_policy": "strict"
@@ -81,7 +73,6 @@
{
"sfid": "TFM_CRYPTO_GET_KEY_POLICY_SFID",
"signal": "TFM_CRYPTO_GET_KEY_POLICY",
- "tfm_symbol": "tfm_crypto_get_key_policy",
"non_secure_clients": true,
"minor_version": 1,
"minor_policy": "strict"
@@ -89,7 +80,6 @@
{
"sfid": "TFM_CRYPTO_GET_KEY_LIFETIME_SFID",
"signal": "TFM_CRYPTO_GET_KEY_LIFETIME",
- "tfm_symbol": "tfm_crypto_get_key_lifetime",
"non_secure_clients": true,
"minor_version": 1,
"minor_policy": "strict"
@@ -97,7 +87,6 @@
{
"sfid": "TFM_CRYPTO_CIPHER_GENERATE_IV_SFID",
"signal": "TFM_CRYPTO_CIPHER_GENERATE_IV",
- "tfm_symbol": "tfm_crypto_cipher_generate_iv",
"non_secure_clients": true,
"minor_version": 1,
"minor_policy": "strict"
@@ -105,7 +94,6 @@
{
"sfid": "TFM_CRYPTO_CIPHER_SET_IV_SFID",
"signal": "TFM_CRYPTO_CIPHER_SET_IV",
- "tfm_symbol": "tfm_crypto_cipher_set_iv",
"non_secure_clients": true,
"minor_version": 1,
"minor_policy": "strict"
@@ -113,7 +101,6 @@
{
"sfid": "TFM_CRYPTO_CIPHER_ENCRYPT_SETUP_SFID",
"signal": "TFM_CRYPTO_CIPHER_ENCRYPT_SETUP",
- "tfm_symbol": "tfm_crypto_cipher_encrypt_setup",
"non_secure_clients": true,
"minor_version": 1,
"minor_policy": "strict"
@@ -121,7 +108,6 @@
{
"sfid": "TFM_CRYPTO_CIPHER_DECRYPT_SETUP_SFID",
"signal": "TFM_CRYPTO_CIPHER_DECRYPT_SETUP",
- "tfm_symbol": "tfm_crypto_cipher_decrypt_setup",
"non_secure_clients": true,
"minor_version": 1,
"minor_policy": "strict"
@@ -129,7 +115,6 @@
{
"sfid": "TFM_CRYPTO_CIPHER_UPDATE_SFID",
"signal": "TFM_CRYPTO_CIPHER_UPDATE",
- "tfm_symbol": "tfm_crypto_cipher_update",
"non_secure_clients": true,
"minor_version": 1,
"minor_policy": "strict"
@@ -137,7 +122,6 @@
{
"sfid": "TFM_CRYPTO_CIPHER_ABORT_SFID",
"signal": "TFM_CRYPTO_CIPHER_ABORT",
- "tfm_symbol": "tfm_crypto_cipher_abort",
"non_secure_clients": true,
"minor_version": 1,
"minor_policy": "strict"
@@ -145,7 +129,6 @@
{
"sfid": "TFM_CRYPTO_CIPHER_FINISH_SFID",
"signal": "TFM_CRYPTO_CIPHER_FINISH",
- "tfm_symbol": "tfm_crypto_cipher_finish",
"non_secure_clients": true,
"minor_version": 1,
"minor_policy": "strict"
@@ -153,7 +136,6 @@
{
"sfid": "TFM_CRYPTO_HASH_SETUP_SFID",
"signal": "TFM_CRYPTO_HASH_SETUP",
- "tfm_symbol": "tfm_crypto_hash_setup",
"non_secure_clients": true,
"minor_version": 1,
"minor_policy": "strict"
@@ -161,7 +143,6 @@
{
"sfid": "TFM_CRYPTO_HASH_UPDATE_SFID",
"signal": "TFM_CRYPTO_HASH_UPDATE",
- "tfm_symbol": "tfm_crypto_hash_update",
"non_secure_clients": true,
"minor_version": 1,
"minor_policy": "strict"
@@ -169,7 +150,6 @@
{
"sfid": "TFM_CRYPTO_HASH_FINISH_SFID",
"signal": "TFM_CRYPTO_HASH_FINISH",
- "tfm_symbol": "tfm_crypto_hash_finish",
"non_secure_clients": true,
"minor_version": 1,
"minor_policy": "strict"
@@ -177,7 +157,6 @@
{
"sfid": "TFM_CRYPTO_HASH_VERIFY_SFID",
"signal": "TFM_CRYPTO_HASH_VERIFY",
- "tfm_symbol": "tfm_crypto_hash_verify",
"non_secure_clients": true,
"minor_version": 1,
"minor_policy": "strict"
@@ -185,7 +164,6 @@
{
"sfid": "TFM_CRYPTO_HASH_ABORT_SFID",
"signal": "TFM_CRYPTO_HASH_ABORT",
- "tfm_symbol": "tfm_crypto_hash_abort",
"non_secure_clients": true,
"minor_version": 1,
"minor_policy": "strict"
@@ -193,7 +171,6 @@
{
"sfid": "TFM_CRYPTO_HASH_CLONE_SFID",
"signal": "TFM_CRYPTO_HASH_CLONE",
- "tfm_symbol": "tfm_crypto_hash_clone",
"non_secure_clients": true,
"minor_version": 1,
"minor_policy": "strict"
@@ -201,7 +178,6 @@
{
"sfid": "TFM_CRYPTO_MAC_SIGN_SETUP_SFID",
"signal": "TFM_CRYPTO_MAC_SIGN_SETUP",
- "tfm_symbol": "tfm_crypto_mac_sign_setup",
"non_secure_clients": true,
"minor_version": 1,
"minor_policy": "strict"
@@ -209,7 +185,6 @@
{
"sfid": "TFM_CRYPTO_MAC_VERIFY_SETUP_SFID",
"signal": "TFM_CRYPTO_MAC_VERIFY_SETUP",
- "tfm_symbol": "tfm_crypto_mac_verify_setup",
"non_secure_clients": true,
"minor_version": 1,
"minor_policy": "strict"
@@ -217,7 +192,6 @@
{
"sfid": "TFM_CRYPTO_MAC_UPDATE_SFID",
"signal": "TFM_CRYPTO_MAC_UPDATE",
- "tfm_symbol": "tfm_crypto_mac_update",
"non_secure_clients": true,
"minor_version": 1,
"minor_policy": "strict"
@@ -225,7 +199,6 @@
{
"sfid": "TFM_CRYPTO_MAC_SIGN_FINISH_SFID",
"signal": "TFM_CRYPTO_MAC_SIGN_FINISH",
- "tfm_symbol": "tfm_crypto_mac_sign_finish",
"non_secure_clients": true,
"minor_version": 1,
"minor_policy": "strict"
@@ -233,7 +206,6 @@
{
"sfid": "TFM_CRYPTO_MAC_VERIFY_FINISH_SFID",
"signal": "TFM_CRYPTO_MAC_VERIFY_FINISH",
- "tfm_symbol": "tfm_crypto_mac_verify_finish",
"non_secure_clients": true,
"minor_version": 1,
"minor_policy": "strict"
@@ -241,7 +213,6 @@
{
"sfid": "TFM_CRYPTO_MAC_ABORT_SFID",
"signal": "TFM_CRYPTO_MAC_ABORT",
- "tfm_symbol": "tfm_crypto_mac_abort",
"non_secure_clients": true,
"minor_version": 1,
"minor_policy": "strict"
@@ -249,7 +220,6 @@
{
"sfid": "TFM_CRYPTO_AEAD_ENCRYPT_SFID",
"signal": "TFM_CRYPTO_AEAD_ENCRYPT",
- "tfm_symbol": "tfm_crypto_aead_encrypt",
"non_secure_clients": true,
"minor_version": 1,
"minor_policy": "strict"
@@ -257,7 +227,6 @@
{
"sfid": "TFM_CRYPTO_AEAD_DECRYPT_SFID",
"signal": "TFM_CRYPTO_AEAD_DECRYPT",
- "tfm_symbol": "tfm_crypto_aead_decrypt",
"non_secure_clients": true,
"minor_version": 1,
"minor_policy": "strict"
@@ -265,7 +234,6 @@
{
"sfid": "TFM_CRYPTO_ASYMMETRIC_SIGN_SFID",
"signal": "TFM_CRYPTO_ASYMMETRIC_SIGN",
- "tfm_symbol": "tfm_crypto_asymmetric_sign",
"non_secure_clients": true,
"minor_version": 1,
"minor_policy": "strict"
@@ -273,7 +241,6 @@
{
"sfid": "TFM_CRYPTO_ASYMMETRIC_VERIFY_SFID",
"signal": "TFM_CRYPTO_ASYMMETRIC_VERIFY",
- "tfm_symbol": "tfm_crypto_asymmetric_verify",
"non_secure_clients": true,
"minor_version": 1,
"minor_policy": "strict"
@@ -281,7 +248,6 @@
{
"sfid": "TFM_CRYPTO_ASYMMETRIC_ENCRYPT_SFID",
"signal": "TFM_CRYPTO_ASYMMETRIC_ENCRYPT",
- "tfm_symbol": "tfm_crypto_asymmetric_encrypt",
"non_secure_clients": true,
"minor_version": 1,
"minor_policy": "strict"
@@ -289,7 +255,6 @@
{
"sfid": "TFM_CRYPTO_ASYMMETRIC_DECRYPT_SFID",
"signal": "TFM_CRYPTO_ASYMMETRIC_DECRYPT",
- "tfm_symbol": "tfm_crypto_asymmetric_decrypt",
"non_secure_clients": true,
"minor_version": 1,
"minor_policy": "strict"
@@ -297,7 +262,6 @@
{
"sfid": "TFM_CRYPTO_GET_GENERATOR_CAPACITY_SFID",
"signal": "TFM_CRYPTO_GET_GENERATOR_CAPACITY",
- "tfm_symbol": "tfm_crypto_get_generator_capacity",
"non_secure_clients": true,
"minor_version": 1,
"minor_policy": "strict"
@@ -305,7 +269,6 @@
{
"sfid": "TFM_CRYPTO_GENERATOR_READ_SFID",
"signal": "TFM_CRYPTO_GENERATOR_READ",
- "tfm_symbol": "tfm_crypto_generator_read",
"non_secure_clients": true,
"minor_version": 1,
"minor_policy": "strict"
@@ -313,7 +276,6 @@
{
"sfid": "TFM_CRYPTO_GENERATOR_IMPORT_KEY_SFID",
"signal": "TFM_CRYPTO_GENERATOR_IMPORT_KEY",
- "tfm_symbol": "tfm_crypto_generator_import_key",
"non_secure_clients": true,
"minor_version": 1,
"minor_policy": "strict"
@@ -321,7 +283,6 @@
{
"sfid": "TFM_CRYPTO_GENERATOR_ABORT_SFID",
"signal": "TFM_CRYPTO_GENERATOR_ABORT",
- "tfm_symbol": "tfm_crypto_generator_abort",
"non_secure_clients": true,
"minor_version": 1,
"minor_policy": "strict"
@@ -329,7 +290,6 @@
{
"sfid": "TFM_CRYPTO_KEY_DERIVATION_SFID",
"signal": "TFM_CRYPTO_KEY_DERIVATION",
- "tfm_symbol": "tfm_crypto_key_derivation",
"non_secure_clients": true,
"minor_version": 1,
"minor_policy": "strict"
@@ -337,7 +297,6 @@
{
"sfid": "TFM_CRYPTO_KEY_AGREEMENT_SFID",
"signal": "TFM_CRYPTO_KEY_AGREEMENT",
- "tfm_symbol": "tfm_crypto_key_agreement",
"non_secure_clients": true,
"minor_version": 1,
"minor_policy": "strict"
@@ -345,7 +304,6 @@
{
"sfid": "TFM_CRYPTO_GENERATE_RANDOM_SFID",
"signal": "TFM_CRYPTO_GENERATE_RANDOM",
- "tfm_symbol": "tfm_crypto_generate_random",
"non_secure_clients": true,
"minor_version": 1,
"minor_policy": "strict"
@@ -353,7 +311,6 @@
{
"sfid": "TFM_CRYPTO_GENERATE_KEY_SFID",
"signal": "TFM_CRYPTO_GENERATE_KEY",
- "tfm_symbol": "tfm_crypto_generate_key",
"non_secure_clients": true,
"minor_version": 1,
"minor_policy": "strict"
diff --git a/secure_fw/services/initial_attestation/manifest.yaml b/secure_fw/services/initial_attestation/manifest.yaml
index a33b5a63d4..4c1b5a15bc 100644
--- a/secure_fw/services/initial_attestation/manifest.yaml
+++ b/secure_fw/services/initial_attestation/manifest.yaml
@@ -16,16 +16,14 @@
"secure_functions": [
{
"sfid": "TFM_ATTEST_GET_TOKEN_SFID",
- "signal": "TFM_ATTEST_GET_TOKEN",
- "tfm_symbol": "initial_attest_get_token",
+ "signal": "INITIAL_ATTEST_GET_TOKEN",
"non_secure_clients": true,
"minor_version": 1,
"minor_policy": "strict"
},
{
"sfid": "TFM_ATTEST_GET_TOKEN_SIZE_SFID",
- "signal": "TFM_ATTEST_GET_TOKEN_SIZE",
- "tfm_symbol": "initial_attest_get_token_size",
+ "signal": "INITIAL_ATTEST_GET_TOKEN_SIZE",
"non_secure_clients": true,
"minor_version": 1,
"minor_policy": "strict"
diff --git a/secure_fw/services/platform/manifest.yaml b/secure_fw/services/platform/manifest.yaml
index 81af25ecad..3f08793a60 100644
--- a/secure_fw/services/platform/manifest.yaml
+++ b/secure_fw/services/platform/manifest.yaml
@@ -16,16 +16,14 @@
"secure_functions": [
{
"sfid": "TFM_SP_PLATFORM_SYSTEM_RESET_SFID",
- "signal": "TFM_SP_PLATFORM_SYSTEM_RESET",
- "tfm_symbol": "platform_sp_system_reset",
+ "signal": "PLATFORM_SP_SYSTEM_RESET",
"non_secure_clients": true,
"minor_version": 1,
"minor_policy": "strict"
},
{
"sfid": "TFM_SP_PLATFORM_IOCTL_SFID",
- "signal": "TFM_SP_PLATFORM_IOCTL",
- "tfm_symbol": "platform_sp_ioctl",
+ "signal": "PLATFORM_SP_IOCTL",
"non_secure_clients": true,
"minor_version": 1,
"minor_policy": "strict"
diff --git a/secure_fw/services/secure_storage/manifest.yaml b/secure_fw/services/secure_storage/manifest.yaml
index 48ba07a65b..cad5f8c656 100644
--- a/secure_fw/services/secure_storage/manifest.yaml
+++ b/secure_fw/services/secure_storage/manifest.yaml
@@ -16,40 +16,35 @@
"secure_functions": [
{
"sfid": "TFM_SST_SET_SFID",
- "signal": "TFM_SST_SET",
- "tfm_symbol": "tfm_sst_set_req",
+ "signal": "TFM_SST_SET_REQ",
"non_secure_clients": true,
"minor_version": 1,
"minor_policy": "strict"
},
{
"sfid": "TFM_SST_GET_SFID",
- "signal": "TFM_SST_GET",
- "tfm_symbol": "tfm_sst_get_req",
+ "signal": "TFM_SST_GET_REQ",
"non_secure_clients": true,
"minor_version": 1,
"minor_policy": "strict"
},
{
"sfid": "TFM_SST_GET_INFO_SFID",
- "signal": "TFM_SST_GET_INFO",
- "tfm_symbol": "tfm_sst_get_info_req",
+ "signal": "TFM_SST_GET_INFO_REQ",
"non_secure_clients": true,
"minor_version": 1,
"minor_policy": "strict"
},
{
"sfid": "TFM_SST_REMOVE_SFID",
- "signal": "TFM_SST_REMOVE",
- "tfm_symbol": "tfm_sst_remove_req",
+ "signal": "TFM_SST_REMOVE_REQ",
"non_secure_clients": true,
"minor_version": 1,
"minor_policy": "strict"
},
{
"sfid": "TFM_SST_GET_SUPPORT_SFID",
- "signal": "TFM_SST_GET_SUPPORT",
- "tfm_symbol": "tfm_sst_get_support_req",
+ "signal": "TFM_SST_GET_SUPPORT_REQ",
"non_secure_clients": true,
"minor_version": 1,
"minor_policy": "strict"
diff --git a/test/test_services/tfm_core_test/manifest.yaml b/test/test_services/tfm_core_test/manifest.yaml
index 67c2d07e5a..c39ff9f6a0 100644
--- a/test/test_services/tfm_core_test/manifest.yaml
+++ b/test/test_services/tfm_core_test/manifest.yaml
@@ -22,24 +22,21 @@
"secure_functions": [
{
"sfid": "TFM_CORE_TEST_SFN_SFID",
- "signal": "TFM_CORE_TEST_SFN",
- "tfm_symbol": "spm_core_test_sfn",
+ "signal": "SPM_CORE_TEST_SFN",
"non_secure_clients": true,
"minor_version": 1,
"minor_policy": "strict"
},
{
"sfid": "TFM_CORE_TEST_SFN_INIT_SUCCESS_SFID",
- "signal": "TFM_CORE_TEST_SFN_INIT_SUCCESS",
- "tfm_symbol": "spm_core_test_sfn_init_success",
+ "signal": "SPM_CORE_TEST_SFN_INIT_SUCCESS",
"non_secure_clients": true,
"minor_version": 1,
"minor_policy": "strict"
},
{
"sfid": "TFM_CORE_TEST_SFN_DIRECT_RECURSION_SFID",
- "signal": "TFM_CORE_TEST_SFN_DIRECT_RECURSION",
- "tfm_symbol": "spm_core_test_sfn_direct_recursion",
+ "signal": "SPM_CORE_TEST_SFN_DIRECT_RECURSION",
"non_secure_clients": true,
"minor_version": 1,
"minor_policy": "strict"
diff --git a/test/test_services/tfm_core_test_2/manifest.yaml b/test/test_services/tfm_core_test_2/manifest.yaml
index 2e49755226..57a721d0ea 100644
--- a/test/test_services/tfm_core_test_2/manifest.yaml
+++ b/test/test_services/tfm_core_test_2/manifest.yaml
@@ -16,32 +16,29 @@
"secure_functions": [
{
"sfid": "TFM_CORE_TEST_2_SFN_SLAVE_SERVICE_SFID",
- "signal": "TFM_CORE_TEST_2_SFN_SLAVE_SERVICE",
- "tfm_symbol": "spm_core_test_2_slave_service",
+ "signal": "SPM_CORE_TEST_2_SLAVE_SERVICE",
"non_secure_clients": false,
"minor_version": 1,
"minor_policy": "strict"
},
{
"sfid": "TFM_CORE_TEST_2_SFN_INVERT_SFID",
- "signal": "TFM_CORE_TEST_2_SFN_INVERT",
- "tfm_symbol": "spm_core_test_2_sfn_invert",
+ "signal": "SPM_CORE_TEST_2_SFN_INVERT",
+
"non_secure_clients": true,
"minor_version": 1,
"minor_policy": "strict"
},
{
"sfid": "TFM_CORE_TEST_2_SFN_CHECK_CALLER_CLIENT_ID_SFID",
- "signal": "TFM_CORE_TEST_2_SFN_CHECK_CALLER_CLIENT_ID",
- "tfm_symbol": "spm_core_test_2_check_caller_client_id",
+ "signal": "SPM_CORE_TEST_2_CHECK_CALLER_CLIENT_ID",
"non_secure_clients": true,
"minor_version": 1,
"minor_policy": "strict"
},
{
"sfid": "TFM_CORE_TEST_2_SFN_GET_EVERY_SECOND_BYTE",
- "signal": "TFM_CORE_TEST_2_SFN_GET_EVERY_SECOND_BYTE",
- "tfm_symbol": "spm_core_test_2_get_every_second_byte",
+ "signal": "SPM_CORE_TEST_2_GET_EVERY_SECOND_BYTE",
"non_secure_clients": true,
"minor_version": 1,
"minor_policy": "strict"
diff --git a/test/test_services/tfm_secure_client_service/manifest.yaml b/test/test_services/tfm_secure_client_service/manifest.yaml
index e90ffc22d4..e1640f32aa 100644
--- a/test/test_services/tfm_secure_client_service/manifest.yaml
+++ b/test/test_services/tfm_secure_client_service/manifest.yaml
@@ -22,8 +22,7 @@
"secure_functions": [
{
"sfid": "TFM_SECURE_CLIENT_SFN_RUN_TESTS_SFID",
- "signal": "TFM_SECURE_CLIENT_SFN_RUN_TESTS",
- "tfm_symbol": "tfm_secure_client_service_sfn_run_tests",
+ "signal": "TFM_SECURE_CLIENT_SERVICE_SFN_RUN_TESTS",
"non_secure_clients": true,
"minor_version": 1,
"minor_policy": "strict"