Crypto: Rename SFN/Secure Function terms
The Secure Function (SFN) is a new terminology introduced in
FF-M v1.1 to refer to RoT Service callback functions.
The "SFN" in crypto is not the same.
This patch renames the SFN/sfn to srv to avoid confusions.
Change-Id: I2e57332fa8c3e71044f2ff73d70cb94f4863ceb3
Signed-off-by: Kevin Peng <kevin.peng@arm.com>
diff --git a/interface/include/tfm_crypto_defs.h b/interface/include/tfm_crypto_defs.h
index 2eaa28b..c2f4d7c 100644
--- a/interface/include/tfm_crypto_defs.h
+++ b/interface/include/tfm_crypto_defs.h
@@ -34,7 +34,7 @@
*
*/
struct tfm_crypto_pack_iovec {
- uint32_t sfn_id; /*!< Secure function ID used to dispatch the
+ uint32_t srv_id; /*!< Crypto service ID used to dispatch the
* request
*/
uint16_t step; /*!< Key derivation step */
diff --git a/interface/src/tfm_crypto_func_api.c b/interface/src/tfm_crypto_func_api.c
index b8d3be9..66759fc 100644
--- a/interface/src/tfm_crypto_func_api.c
+++ b/interface/src/tfm_crypto_func_api.c
@@ -11,13 +11,13 @@
#include "psa/crypto.h"
#include "tfm_ns_interface.h"
-#define API_DISPATCH(sfn_name, sfn_id) \
- tfm_ns_interface_dispatch((veneer_fn)sfn_name##_veneer, \
+#define API_DISPATCH(srv_name, srv_id) \
+ tfm_ns_interface_dispatch((veneer_fn)srv_name##_veneer, \
(uint32_t)in_vec, IOVEC_LEN(in_vec), \
(uint32_t)out_vec, IOVEC_LEN(out_vec))
-#define API_DISPATCH_NO_OUTVEC(sfn_name, sfn_id) \
- tfm_ns_interface_dispatch((veneer_fn)sfn_name##_veneer, \
+#define API_DISPATCH_NO_OUTVEC(srv_name, srv_id) \
+ tfm_ns_interface_dispatch((veneer_fn)srv_name##_veneer, \
(uint32_t)in_vec, IOVEC_LEN(in_vec), \
(uint32_t)NULL, 0)
@@ -33,7 +33,7 @@
psa_key_id_t *key)
{
const struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_OPEN_KEY_SID,
+ .srv_id = TFM_CRYPTO_OPEN_KEY_SID,
};
psa_invec in_vec[] = {
{.base = &iov, .len = sizeof(struct tfm_crypto_pack_iovec)},
@@ -50,7 +50,7 @@
psa_status_t psa_close_key(psa_key_id_t key)
{
const struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_CLOSE_KEY_SID,
+ .srv_id = TFM_CRYPTO_CLOSE_KEY_SID,
.key_id = key,
};
psa_invec in_vec[] = {
@@ -68,7 +68,7 @@
{
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_IMPORT_KEY_SID,
+ .srv_id = TFM_CRYPTO_IMPORT_KEY_SID,
};
psa_invec in_vec[] = {
{.base = &iov, .len = sizeof(struct tfm_crypto_pack_iovec)},
@@ -89,7 +89,7 @@
{
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_DESTROY_KEY_SID,
+ .srv_id = TFM_CRYPTO_DESTROY_KEY_SID,
.key_id = key,
};
psa_invec in_vec[] = {
@@ -107,7 +107,7 @@
{
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_GET_KEY_ATTRIBUTES_SID,
+ .srv_id = TFM_CRYPTO_GET_KEY_ATTRIBUTES_SID,
.key_id = key,
};
psa_invec in_vec[] = {
@@ -125,7 +125,7 @@
void psa_reset_key_attributes(psa_key_attributes_t *attributes)
{
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_RESET_KEY_ATTRIBUTES_SID,
+ .srv_id = TFM_CRYPTO_RESET_KEY_ATTRIBUTES_SID,
};
psa_invec in_vec[] = {
{.base = &iov, .len = sizeof(struct tfm_crypto_pack_iovec)},
@@ -146,7 +146,7 @@
{
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_EXPORT_KEY_SID,
+ .srv_id = TFM_CRYPTO_EXPORT_KEY_SID,
.key_id = key,
};
psa_invec in_vec[] = {
@@ -171,7 +171,7 @@
{
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_EXPORT_PUBLIC_KEY_SID,
+ .srv_id = TFM_CRYPTO_EXPORT_PUBLIC_KEY_SID,
.key_id = key,
};
@@ -194,7 +194,7 @@
{
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_PURGE_KEY_SID,
+ .srv_id = TFM_CRYPTO_PURGE_KEY_SID,
.key_id = key,
};
psa_invec in_vec[] = {
@@ -212,7 +212,7 @@
{
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_COPY_KEY_SID,
+ .srv_id = TFM_CRYPTO_COPY_KEY_SID,
.key_id = source_key,
};
@@ -238,7 +238,7 @@
{
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_CIPHER_GENERATE_IV_SID,
+ .srv_id = TFM_CRYPTO_CIPHER_GENERATE_IV_SID,
.op_handle = operation->handle,
};
@@ -264,7 +264,7 @@
{
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_CIPHER_SET_IV_SID,
+ .srv_id = TFM_CRYPTO_CIPHER_SET_IV_SID,
.op_handle = operation->handle,
};
@@ -288,7 +288,7 @@
{
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_CIPHER_ENCRYPT_SETUP_SID,
+ .srv_id = TFM_CRYPTO_CIPHER_ENCRYPT_SETUP_SID,
.key_id = key,
.alg = alg,
.op_handle = operation->handle,
@@ -313,7 +313,7 @@
{
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_CIPHER_DECRYPT_SETUP_SID,
+ .srv_id = TFM_CRYPTO_CIPHER_DECRYPT_SETUP_SID,
.key_id = key,
.alg = alg,
.op_handle = operation->handle,
@@ -341,7 +341,7 @@
{
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_CIPHER_UPDATE_SID,
+ .srv_id = TFM_CRYPTO_CIPHER_UPDATE_SID,
.op_handle = operation->handle,
};
@@ -366,7 +366,7 @@
{
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_CIPHER_ABORT_SID,
+ .srv_id = TFM_CRYPTO_CIPHER_ABORT_SID,
.op_handle = operation->handle,
};
@@ -390,7 +390,7 @@
{
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_CIPHER_FINISH_SID,
+ .srv_id = TFM_CRYPTO_CIPHER_FINISH_SID,
.op_handle = operation->handle,
};
@@ -415,7 +415,7 @@
{
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_HASH_SETUP_SID,
+ .srv_id = TFM_CRYPTO_HASH_SETUP_SID,
.alg = alg,
.op_handle = operation->handle,
};
@@ -439,7 +439,7 @@
{
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_HASH_UPDATE_SID,
+ .srv_id = TFM_CRYPTO_HASH_UPDATE_SID,
.op_handle = operation->handle,
};
@@ -464,7 +464,7 @@
{
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_HASH_FINISH_SID,
+ .srv_id = TFM_CRYPTO_HASH_FINISH_SID,
.op_handle = operation->handle,
};
@@ -490,7 +490,7 @@
{
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_HASH_VERIFY_SID,
+ .srv_id = TFM_CRYPTO_HASH_VERIFY_SID,
.op_handle = operation->handle,
};
@@ -512,7 +512,7 @@
{
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_HASH_ABORT_SID,
+ .srv_id = TFM_CRYPTO_HASH_ABORT_SID,
.op_handle = operation->handle,
};
@@ -534,7 +534,7 @@
{
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_HASH_CLONE_SID,
+ .srv_id = TFM_CRYPTO_HASH_CLONE_SID,
.op_handle = source_operation->handle,
};
@@ -564,7 +564,7 @@
{
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_HASH_COMPUTE_SID,
+ .srv_id = TFM_CRYPTO_HASH_COMPUTE_SID,
.alg = alg,
};
@@ -593,7 +593,7 @@
{
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_HASH_COMPARE_SID,
+ .srv_id = TFM_CRYPTO_HASH_COMPARE_SID,
.alg = alg,
};
@@ -615,7 +615,7 @@
{
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_MAC_SIGN_SETUP_SID,
+ .srv_id = TFM_CRYPTO_MAC_SIGN_SETUP_SID,
.key_id = key,
.alg = alg,
.op_handle = operation->handle,
@@ -640,7 +640,7 @@
{
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_MAC_VERIFY_SETUP_SID,
+ .srv_id = TFM_CRYPTO_MAC_VERIFY_SETUP_SID,
.key_id = key,
.alg = alg,
.op_handle = operation->handle,
@@ -665,7 +665,7 @@
{
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_MAC_UPDATE_SID,
+ .srv_id = TFM_CRYPTO_MAC_UPDATE_SID,
.op_handle = operation->handle,
};
@@ -690,7 +690,7 @@
{
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_MAC_SIGN_FINISH_SID,
+ .srv_id = TFM_CRYPTO_MAC_SIGN_FINISH_SID,
.op_handle = operation->handle,
};
@@ -716,7 +716,7 @@
{
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_MAC_VERIFY_FINISH_SID,
+ .srv_id = TFM_CRYPTO_MAC_VERIFY_FINISH_SID,
.op_handle = operation->handle,
};
@@ -738,7 +738,7 @@
{
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_MAC_ABORT_SID,
+ .srv_id = TFM_CRYPTO_MAC_ABORT_SID,
.op_handle = operation->handle,
};
@@ -769,7 +769,7 @@
{
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_AEAD_ENCRYPT_SID,
+ .srv_id = TFM_CRYPTO_AEAD_ENCRYPT_SID,
.key_id = key,
.alg = alg,
.aead_in = {.nonce = {0}, .nonce_length = 0}
@@ -825,7 +825,7 @@
{
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_AEAD_DECRYPT_SID,
+ .srv_id = TFM_CRYPTO_AEAD_DECRYPT_SID,
.key_id = key,
.alg = alg,
.aead_in = {.nonce = {0}, .nonce_length = 0}
@@ -873,7 +873,7 @@
{
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_AEAD_ENCRYPT_SETUP_SID,
+ .srv_id = TFM_CRYPTO_AEAD_ENCRYPT_SETUP_SID,
.key_id = key,
.alg = alg,
.op_handle = operation->handle,
@@ -897,7 +897,7 @@
{
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_AEAD_DECRYPT_SETUP_SID,
+ .srv_id = TFM_CRYPTO_AEAD_DECRYPT_SETUP_SID,
.key_id = key,
.alg = alg,
.op_handle = operation->handle,
@@ -922,7 +922,7 @@
{
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_AEAD_GENERATE_NONCE_SID,
+ .srv_id = TFM_CRYPTO_AEAD_GENERATE_NONCE_SID,
.op_handle = operation->handle,
};
@@ -947,7 +947,7 @@
{
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_AEAD_SET_NONCE_SID,
+ .srv_id = TFM_CRYPTO_AEAD_SET_NONCE_SID,
.op_handle = operation->handle,
};
@@ -970,7 +970,7 @@
{
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_AEAD_SET_LENGTHS_SID,
+ .srv_id = TFM_CRYPTO_AEAD_SET_LENGTHS_SID,
.ad_length = ad_length,
.plaintext_length = plaintext_length,
.op_handle = operation->handle,
@@ -994,7 +994,7 @@
{
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_AEAD_UPDATE_AD_SID,
+ .srv_id = TFM_CRYPTO_AEAD_UPDATE_AD_SID,
.op_handle = operation->handle,
};
@@ -1020,7 +1020,7 @@
{
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_AEAD_UPDATE_SID,
+ .srv_id = TFM_CRYPTO_AEAD_UPDATE_SID,
.op_handle = operation->handle,
};
@@ -1050,7 +1050,7 @@
{
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_AEAD_FINISH_SID,
+ .srv_id = TFM_CRYPTO_AEAD_FINISH_SID,
.op_handle = operation->handle,
};
@@ -1080,7 +1080,7 @@
{
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_AEAD_VERIFY_SID,
+ .srv_id = TFM_CRYPTO_AEAD_VERIFY_SID,
.op_handle = operation->handle,
};
@@ -1104,7 +1104,7 @@
{
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_AEAD_ABORT_SID,
+ .srv_id = TFM_CRYPTO_AEAD_ABORT_SID,
.op_handle = operation->handle,
};
@@ -1130,7 +1130,7 @@
{
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_SIGN_MESSAGE_SID,
+ .srv_id = TFM_CRYPTO_SIGN_MESSAGE_SID,
.key_id = key,
.alg = alg,
};
@@ -1159,7 +1159,7 @@
{
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_VERIFY_MESSAGE_SID,
+ .srv_id = TFM_CRYPTO_VERIFY_MESSAGE_SID,
.key_id = key,
.alg = alg
};
@@ -1186,7 +1186,7 @@
{
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_SIGN_HASH_SID,
+ .srv_id = TFM_CRYPTO_SIGN_HASH_SID,
.key_id = key,
.alg = alg,
};
@@ -1216,7 +1216,7 @@
{
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_VERIFY_HASH_SID,
+ .srv_id = TFM_CRYPTO_VERIFY_HASH_SID,
.key_id = key,
.alg = alg
};
@@ -1245,7 +1245,7 @@
{
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_ASYMMETRIC_ENCRYPT_SID,
+ .srv_id = TFM_CRYPTO_ASYMMETRIC_ENCRYPT_SID,
.key_id = key,
.alg = alg
};
@@ -1285,7 +1285,7 @@
{
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_ASYMMETRIC_DECRYPT_SID,
+ .srv_id = TFM_CRYPTO_ASYMMETRIC_DECRYPT_SID,
.key_id = key,
.alg = alg
};
@@ -1319,7 +1319,7 @@
{
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_KEY_DERIVATION_GET_CAPACITY_SID,
+ .srv_id = TFM_CRYPTO_KEY_DERIVATION_GET_CAPACITY_SID,
.op_handle = operation->handle,
};
@@ -1344,7 +1344,7 @@
{
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_KEY_DERIVATION_OUTPUT_BYTES_SID,
+ .srv_id = TFM_CRYPTO_KEY_DERIVATION_OUTPUT_BYTES_SID,
.op_handle = operation->handle,
};
@@ -1369,7 +1369,7 @@
{
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_KEY_DERIVATION_INPUT_KEY_SID,
+ .srv_id = TFM_CRYPTO_KEY_DERIVATION_INPUT_KEY_SID,
.key_id = key,
.step = step,
.op_handle = operation->handle,
@@ -1389,7 +1389,7 @@
{
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_KEY_DERIVATION_ABORT_SID,
+ .srv_id = TFM_CRYPTO_KEY_DERIVATION_ABORT_SID,
.op_handle = operation->handle,
};
@@ -1416,7 +1416,7 @@
{
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_KEY_DERIVATION_KEY_AGREEMENT_SID,
+ .srv_id = TFM_CRYPTO_KEY_DERIVATION_KEY_AGREEMENT_SID,
.key_id = private_key,
.step = step,
.op_handle = operation->handle,
@@ -1438,7 +1438,7 @@
{
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_GENERATE_RANDOM_SID,
+ .srv_id = TFM_CRYPTO_GENERATE_RANDOM_SID,
};
psa_invec in_vec[] = {
@@ -1464,7 +1464,7 @@
{
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_GENERATE_KEY_SID,
+ .srv_id = TFM_CRYPTO_GENERATE_KEY_SID,
};
psa_invec in_vec[] = {
@@ -1492,7 +1492,7 @@
{
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_MAC_COMPUTE_SID,
+ .srv_id = TFM_CRYPTO_MAC_COMPUTE_SID,
.key_id = key,
.alg = alg,
};
@@ -1521,7 +1521,7 @@
{
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_MAC_VERIFY_SID,
+ .srv_id = TFM_CRYPTO_MAC_VERIFY_SID,
.key_id = key,
.alg = alg,
};
@@ -1548,7 +1548,7 @@
{
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_CIPHER_ENCRYPT_SID,
+ .srv_id = TFM_CRYPTO_CIPHER_ENCRYPT_SID,
.key_id = key,
.alg = alg,
};
@@ -1578,7 +1578,7 @@
{
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_CIPHER_DECRYPT_SID,
+ .srv_id = TFM_CRYPTO_CIPHER_DECRYPT_SID,
.key_id = key,
.alg = alg,
};
@@ -1608,7 +1608,7 @@
{
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_RAW_KEY_AGREEMENT_SID,
+ .srv_id = TFM_CRYPTO_RAW_KEY_AGREEMENT_SID,
.alg = alg,
.key_id = private_key
};
@@ -1635,7 +1635,7 @@
{
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_KEY_DERIVATION_SETUP_SID,
+ .srv_id = TFM_CRYPTO_KEY_DERIVATION_SETUP_SID,
.alg = alg,
.op_handle = operation->handle,
};
@@ -1658,7 +1658,7 @@
{
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_KEY_DERIVATION_SET_CAPACITY_SID,
+ .srv_id = TFM_CRYPTO_KEY_DERIVATION_SET_CAPACITY_SID,
.capacity = capacity,
.op_handle = operation->handle,
};
@@ -1680,7 +1680,7 @@
{
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_KEY_DERIVATION_INPUT_BYTES_SID,
+ .srv_id = TFM_CRYPTO_KEY_DERIVATION_INPUT_BYTES_SID,
.step = step,
.op_handle = operation->handle,
};
@@ -1702,7 +1702,7 @@
{
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_KEY_DERIVATION_OUTPUT_KEY_SID,
+ .srv_id = TFM_CRYPTO_KEY_DERIVATION_OUTPUT_KEY_SID,
.op_handle = operation->handle,
};
diff --git a/interface/src/tfm_crypto_ipc_api.c b/interface/src/tfm_crypto_ipc_api.c
index fd4c4c0..da5358a 100644
--- a/interface/src/tfm_crypto_ipc_api.c
+++ b/interface/src/tfm_crypto_ipc_api.c
@@ -11,12 +11,12 @@
#include "psa_manifest/sid.h"
#include "psa/client.h"
-#define API_DISPATCH(sfn_name, sfn_id) \
+#define API_DISPATCH(srv_name, srv_id) \
psa_call(TFM_CRYPTO_HANDLE, PSA_IPC_CALL, \
in_vec, IOVEC_LEN(in_vec), \
out_vec, IOVEC_LEN(out_vec))
-#define API_DISPATCH_NO_OUTVEC(sfn_name, sfn_id) \
+#define API_DISPATCH_NO_OUTVEC(srv_name, srv_id) \
psa_call(TFM_CRYPTO_HANDLE, PSA_IPC_CALL, \
in_vec, IOVEC_LEN(in_vec), \
(psa_outvec *)NULL, 0)
@@ -34,7 +34,7 @@
{
psa_status_t status;
const struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_OPEN_KEY_SID,
+ .srv_id = TFM_CRYPTO_OPEN_KEY_SID,
};
psa_invec in_vec[] = {
{.base = &iov, .len = sizeof(struct tfm_crypto_pack_iovec)},
@@ -54,7 +54,7 @@
{
psa_status_t status;
const struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_CLOSE_KEY_SID,
+ .srv_id = TFM_CRYPTO_CLOSE_KEY_SID,
.key_id = key,
};
psa_invec in_vec[] = {
@@ -74,7 +74,7 @@
{
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_IMPORT_KEY_SID,
+ .srv_id = TFM_CRYPTO_IMPORT_KEY_SID,
};
psa_invec in_vec[] = {
{.base = &iov, .len = sizeof(struct tfm_crypto_pack_iovec)},
@@ -95,7 +95,7 @@
{
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_DESTROY_KEY_SID,
+ .srv_id = TFM_CRYPTO_DESTROY_KEY_SID,
.key_id = key,
};
psa_invec in_vec[] = {
@@ -113,7 +113,7 @@
{
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_GET_KEY_ATTRIBUTES_SID,
+ .srv_id = TFM_CRYPTO_GET_KEY_ATTRIBUTES_SID,
.key_id = key,
};
psa_invec in_vec[] = {
@@ -131,7 +131,7 @@
void psa_reset_key_attributes(psa_key_attributes_t *attributes)
{
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_RESET_KEY_ATTRIBUTES_SID,
+ .srv_id = TFM_CRYPTO_RESET_KEY_ATTRIBUTES_SID,
};
psa_invec in_vec[] = {
{.base = &iov, .len = sizeof(struct tfm_crypto_pack_iovec)},
@@ -152,7 +152,7 @@
{
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_EXPORT_KEY_SID,
+ .srv_id = TFM_CRYPTO_EXPORT_KEY_SID,
.key_id = key,
};
psa_invec in_vec[] = {
@@ -177,7 +177,7 @@
{
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_EXPORT_PUBLIC_KEY_SID,
+ .srv_id = TFM_CRYPTO_EXPORT_PUBLIC_KEY_SID,
.key_id = key,
};
@@ -200,7 +200,7 @@
{
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_PURGE_KEY_SID,
+ .srv_id = TFM_CRYPTO_PURGE_KEY_SID,
.key_id = key,
};
psa_invec in_vec[] = {
@@ -218,7 +218,7 @@
{
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_COPY_KEY_SID,
+ .srv_id = TFM_CRYPTO_COPY_KEY_SID,
.key_id = source_key,
};
@@ -244,7 +244,7 @@
{
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_CIPHER_GENERATE_IV_SID,
+ .srv_id = TFM_CRYPTO_CIPHER_GENERATE_IV_SID,
.op_handle = operation->handle,
};
@@ -270,7 +270,7 @@
{
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_CIPHER_SET_IV_SID,
+ .srv_id = TFM_CRYPTO_CIPHER_SET_IV_SID,
.op_handle = operation->handle,
};
@@ -294,7 +294,7 @@
{
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_CIPHER_ENCRYPT_SETUP_SID,
+ .srv_id = TFM_CRYPTO_CIPHER_ENCRYPT_SETUP_SID,
.key_id = key,
.alg = alg,
.op_handle = operation->handle,
@@ -319,7 +319,7 @@
{
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_CIPHER_DECRYPT_SETUP_SID,
+ .srv_id = TFM_CRYPTO_CIPHER_DECRYPT_SETUP_SID,
.key_id = key,
.alg = alg,
.op_handle = operation->handle,
@@ -347,7 +347,7 @@
{
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_CIPHER_UPDATE_SID,
+ .srv_id = TFM_CRYPTO_CIPHER_UPDATE_SID,
.op_handle = operation->handle,
};
@@ -372,7 +372,7 @@
{
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_CIPHER_ABORT_SID,
+ .srv_id = TFM_CRYPTO_CIPHER_ABORT_SID,
.op_handle = operation->handle,
};
@@ -396,7 +396,7 @@
{
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_CIPHER_FINISH_SID,
+ .srv_id = TFM_CRYPTO_CIPHER_FINISH_SID,
.op_handle = operation->handle,
};
@@ -421,7 +421,7 @@
{
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_HASH_SETUP_SID,
+ .srv_id = TFM_CRYPTO_HASH_SETUP_SID,
.alg = alg,
.op_handle = operation->handle,
};
@@ -445,7 +445,7 @@
{
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_HASH_UPDATE_SID,
+ .srv_id = TFM_CRYPTO_HASH_UPDATE_SID,
.op_handle = operation->handle,
};
@@ -470,7 +470,7 @@
{
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_HASH_FINISH_SID,
+ .srv_id = TFM_CRYPTO_HASH_FINISH_SID,
.op_handle = operation->handle,
};
@@ -496,7 +496,7 @@
{
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_HASH_VERIFY_SID,
+ .srv_id = TFM_CRYPTO_HASH_VERIFY_SID,
.op_handle = operation->handle,
};
@@ -518,7 +518,7 @@
{
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_HASH_ABORT_SID,
+ .srv_id = TFM_CRYPTO_HASH_ABORT_SID,
.op_handle = operation->handle,
};
@@ -540,7 +540,7 @@
{
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_HASH_CLONE_SID,
+ .srv_id = TFM_CRYPTO_HASH_CLONE_SID,
.op_handle = source_operation->handle,
};
@@ -570,7 +570,7 @@
{
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_HASH_COMPUTE_SID,
+ .srv_id = TFM_CRYPTO_HASH_COMPUTE_SID,
.alg = alg,
};
@@ -599,7 +599,7 @@
{
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_HASH_COMPARE_SID,
+ .srv_id = TFM_CRYPTO_HASH_COMPARE_SID,
.alg = alg,
};
@@ -621,7 +621,7 @@
{
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_MAC_SIGN_SETUP_SID,
+ .srv_id = TFM_CRYPTO_MAC_SIGN_SETUP_SID,
.key_id = key,
.alg = alg,
.op_handle = operation->handle,
@@ -646,7 +646,7 @@
{
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_MAC_VERIFY_SETUP_SID,
+ .srv_id = TFM_CRYPTO_MAC_VERIFY_SETUP_SID,
.key_id = key,
.alg = alg,
.op_handle = operation->handle,
@@ -671,7 +671,7 @@
{
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_MAC_UPDATE_SID,
+ .srv_id = TFM_CRYPTO_MAC_UPDATE_SID,
.op_handle = operation->handle,
};
@@ -696,7 +696,7 @@
{
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_MAC_SIGN_FINISH_SID,
+ .srv_id = TFM_CRYPTO_MAC_SIGN_FINISH_SID,
.op_handle = operation->handle,
};
@@ -722,7 +722,7 @@
{
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_MAC_VERIFY_FINISH_SID,
+ .srv_id = TFM_CRYPTO_MAC_VERIFY_FINISH_SID,
.op_handle = operation->handle,
};
@@ -744,7 +744,7 @@
{
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_MAC_ABORT_SID,
+ .srv_id = TFM_CRYPTO_MAC_ABORT_SID,
.op_handle = operation->handle,
};
@@ -775,7 +775,7 @@
{
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_AEAD_ENCRYPT_SID,
+ .srv_id = TFM_CRYPTO_AEAD_ENCRYPT_SID,
.key_id = key,
.alg = alg,
.aead_in = {.nonce = {0}, .nonce_length = 0}
@@ -836,7 +836,7 @@
{
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_AEAD_DECRYPT_SID,
+ .srv_id = TFM_CRYPTO_AEAD_DECRYPT_SID,
.key_id = key,
.alg = alg,
.aead_in = {.nonce = {0}, .nonce_length = 0}
@@ -889,7 +889,7 @@
{
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_AEAD_ENCRYPT_SETUP_SID,
+ .srv_id = TFM_CRYPTO_AEAD_ENCRYPT_SETUP_SID,
.key_id = key,
.alg = alg,
.op_handle = operation->handle,
@@ -913,7 +913,7 @@
{
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_AEAD_DECRYPT_SETUP_SID,
+ .srv_id = TFM_CRYPTO_AEAD_DECRYPT_SETUP_SID,
.key_id = key,
.alg = alg,
.op_handle = operation->handle,
@@ -938,7 +938,7 @@
{
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_AEAD_GENERATE_NONCE_SID,
+ .srv_id = TFM_CRYPTO_AEAD_GENERATE_NONCE_SID,
.op_handle = operation->handle,
};
@@ -963,7 +963,7 @@
{
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_AEAD_SET_NONCE_SID,
+ .srv_id = TFM_CRYPTO_AEAD_SET_NONCE_SID,
.op_handle = operation->handle,
};
@@ -986,7 +986,7 @@
{
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_AEAD_SET_LENGTHS_SID,
+ .srv_id = TFM_CRYPTO_AEAD_SET_LENGTHS_SID,
.ad_length = ad_length,
.plaintext_length = plaintext_length,
.op_handle = operation->handle,
@@ -1010,7 +1010,7 @@
{
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_AEAD_UPDATE_AD_SID,
+ .srv_id = TFM_CRYPTO_AEAD_UPDATE_AD_SID,
.op_handle = operation->handle,
};
@@ -1046,7 +1046,7 @@
{
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_AEAD_UPDATE_SID,
+ .srv_id = TFM_CRYPTO_AEAD_UPDATE_SID,
.op_handle = operation->handle,
};
@@ -1086,7 +1086,7 @@
{
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_AEAD_FINISH_SID,
+ .srv_id = TFM_CRYPTO_AEAD_FINISH_SID,
.op_handle = operation->handle,
};
@@ -1136,7 +1136,7 @@
{
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_AEAD_VERIFY_SID,
+ .srv_id = TFM_CRYPTO_AEAD_VERIFY_SID,
.op_handle = operation->handle,
};
@@ -1179,7 +1179,7 @@
{
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_AEAD_ABORT_SID,
+ .srv_id = TFM_CRYPTO_AEAD_ABORT_SID,
.op_handle = operation->handle,
};
@@ -1205,7 +1205,7 @@
{
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_SIGN_MESSAGE_SID,
+ .srv_id = TFM_CRYPTO_SIGN_MESSAGE_SID,
.key_id = key,
.alg = alg,
};
@@ -1234,7 +1234,7 @@
{
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_VERIFY_MESSAGE_SID,
+ .srv_id = TFM_CRYPTO_VERIFY_MESSAGE_SID,
.key_id = key,
.alg = alg
};
@@ -1261,7 +1261,7 @@
{
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_SIGN_HASH_SID,
+ .srv_id = TFM_CRYPTO_SIGN_HASH_SID,
.key_id = key,
.alg = alg,
};
@@ -1291,7 +1291,7 @@
{
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_VERIFY_HASH_SID,
+ .srv_id = TFM_CRYPTO_VERIFY_HASH_SID,
.key_id = key,
.alg = alg
};
@@ -1320,7 +1320,7 @@
{
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_ASYMMETRIC_ENCRYPT_SID,
+ .srv_id = TFM_CRYPTO_ASYMMETRIC_ENCRYPT_SID,
.key_id = key,
.alg = alg
};
@@ -1365,7 +1365,7 @@
{
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_ASYMMETRIC_DECRYPT_SID,
+ .srv_id = TFM_CRYPTO_ASYMMETRIC_DECRYPT_SID,
.key_id = key,
.alg = alg
};
@@ -1404,7 +1404,7 @@
{
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_KEY_DERIVATION_GET_CAPACITY_SID,
+ .srv_id = TFM_CRYPTO_KEY_DERIVATION_GET_CAPACITY_SID,
.op_handle = operation->handle,
};
@@ -1429,7 +1429,7 @@
{
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_KEY_DERIVATION_OUTPUT_BYTES_SID,
+ .srv_id = TFM_CRYPTO_KEY_DERIVATION_OUTPUT_BYTES_SID,
.op_handle = operation->handle,
};
@@ -1454,7 +1454,7 @@
{
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_KEY_DERIVATION_INPUT_KEY_SID,
+ .srv_id = TFM_CRYPTO_KEY_DERIVATION_INPUT_KEY_SID,
.key_id = key,
.step = step,
.op_handle = operation->handle,
@@ -1474,7 +1474,7 @@
{
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_KEY_DERIVATION_ABORT_SID,
+ .srv_id = TFM_CRYPTO_KEY_DERIVATION_ABORT_SID,
.op_handle = operation->handle,
};
@@ -1501,7 +1501,7 @@
{
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_KEY_DERIVATION_KEY_AGREEMENT_SID,
+ .srv_id = TFM_CRYPTO_KEY_DERIVATION_KEY_AGREEMENT_SID,
.key_id = private_key,
.step = step,
.op_handle = operation->handle,
@@ -1523,7 +1523,7 @@
{
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_GENERATE_RANDOM_SID,
+ .srv_id = TFM_CRYPTO_GENERATE_RANDOM_SID,
};
psa_invec in_vec[] = {
@@ -1549,7 +1549,7 @@
{
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_GENERATE_KEY_SID,
+ .srv_id = TFM_CRYPTO_GENERATE_KEY_SID,
};
psa_invec in_vec[] = {
@@ -1577,7 +1577,7 @@
{
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_MAC_COMPUTE_SID,
+ .srv_id = TFM_CRYPTO_MAC_COMPUTE_SID,
.key_id = key,
.alg = alg,
};
@@ -1606,7 +1606,7 @@
{
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_MAC_VERIFY_SID,
+ .srv_id = TFM_CRYPTO_MAC_VERIFY_SID,
.key_id = key,
.alg = alg,
};
@@ -1633,7 +1633,7 @@
{
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_CIPHER_ENCRYPT_SID,
+ .srv_id = TFM_CRYPTO_CIPHER_ENCRYPT_SID,
.key_id = key,
.alg = alg,
};
@@ -1663,7 +1663,7 @@
{
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_CIPHER_DECRYPT_SID,
+ .srv_id = TFM_CRYPTO_CIPHER_DECRYPT_SID,
.key_id = key,
.alg = alg,
};
@@ -1693,7 +1693,7 @@
{
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_RAW_KEY_AGREEMENT_SID,
+ .srv_id = TFM_CRYPTO_RAW_KEY_AGREEMENT_SID,
.alg = alg,
.key_id = private_key
};
@@ -1720,7 +1720,7 @@
{
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_KEY_DERIVATION_SETUP_SID,
+ .srv_id = TFM_CRYPTO_KEY_DERIVATION_SETUP_SID,
.alg = alg,
.op_handle = operation->handle,
};
@@ -1743,7 +1743,7 @@
{
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_KEY_DERIVATION_SET_CAPACITY_SID,
+ .srv_id = TFM_CRYPTO_KEY_DERIVATION_SET_CAPACITY_SID,
.capacity = capacity,
.op_handle = operation->handle,
};
@@ -1765,7 +1765,7 @@
{
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_KEY_DERIVATION_INPUT_BYTES_SID,
+ .srv_id = TFM_CRYPTO_KEY_DERIVATION_INPUT_BYTES_SID,
.step = step,
.op_handle = operation->handle,
};
@@ -1787,7 +1787,7 @@
{
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_KEY_DERIVATION_OUTPUT_KEY_SID,
+ .srv_id = TFM_CRYPTO_KEY_DERIVATION_OUTPUT_KEY_SID,
.op_handle = operation->handle,
};
diff --git a/secure_fw/partitions/crypto/crypto_init.c b/secure_fw/partitions/crypto/crypto_init.c
index d11ea84..5c9965c 100644
--- a/secure_fw/partitions/crypto/crypto_init.c
+++ b/secure_fw/partitions/crypto/crypto_init.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018-2021, Arm Limited. All rights reserved.
+ * Copyright (c) 2018-2022, Arm Limited. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*
@@ -111,9 +111,9 @@
scratch.alloc_index = 0;
}
-static psa_status_t tfm_crypto_call_sfn(psa_msg_t *msg,
+static psa_status_t tfm_crypto_call_srv(psa_msg_t *msg,
struct tfm_crypto_pack_iovec *iov,
- const uint32_t sfn_id)
+ const uint32_t srv_id)
{
psa_status_t status = PSA_SUCCESS;
size_t in_len = PSA_MAX_IOVEC, out_len = PSA_MAX_IOVEC, i;
@@ -170,7 +170,7 @@
(void)tfm_crypto_set_scratch_owner(msg->client_id);
/* Call the uniform signature API */
- status = sfid_func_table[sfn_id](in_vec, in_len, out_vec, out_len);
+ status = sfid_func_table[srv_id](in_vec, in_len, out_vec, out_len);
/* Write into the IPC framework outputs from the scratch */
for (i = 0; i < out_len; i++) {
@@ -185,7 +185,7 @@
static psa_status_t tfm_crypto_parse_msg(psa_msg_t *msg,
struct tfm_crypto_pack_iovec *iov,
- uint32_t *sfn_id_p)
+ uint32_t *srv_id_p)
{
size_t read_size;
@@ -199,12 +199,12 @@
return PSA_ERROR_GENERIC_ERROR;
}
- if (iov->sfn_id >= TFM_CRYPTO_SID_MAX) {
- *sfn_id_p = TFM_CRYPTO_SID_INVALID;
+ if (iov->srv_id >= TFM_CRYPTO_SID_MAX) {
+ *srv_id_p = TFM_CRYPTO_SID_INVALID;
return PSA_ERROR_GENERIC_ERROR;
}
- *sfn_id_p = iov->sfn_id;
+ *srv_id_p = iov->srv_id;
return PSA_SUCCESS;
}
@@ -214,7 +214,7 @@
psa_signal_t signals;
psa_msg_t msg;
psa_status_t status = PSA_SUCCESS;
- uint32_t sfn_id = TFM_CRYPTO_SID_INVALID;
+ uint32_t srv_id = TFM_CRYPTO_SID_INVALID;
struct tfm_crypto_pack_iovec iov = {0};
while (1) {
@@ -229,10 +229,10 @@
switch (msg.type) {
case PSA_IPC_CALL:
/* Parse the message */
- status = tfm_crypto_parse_msg(&msg, &iov, &sfn_id);
+ status = tfm_crypto_parse_msg(&msg, &iov, &srv_id);
/* Call the dispatcher based on the SID passed as type */
if (status == PSA_SUCCESS) {
- status = tfm_crypto_call_sfn(&msg, &iov, sfn_id);
+ status = tfm_crypto_call_srv(&msg, &iov, srv_id);
}
psa_reply(msg.handle, status);
break;
diff --git a/secure_fw/partitions/crypto/tfm_crypto_private.h b/secure_fw/partitions/crypto/tfm_crypto_private.h
index b28224a..34a41c8 100644
--- a/secure_fw/partitions/crypto/tfm_crypto_private.h
+++ b/secure_fw/partitions/crypto/tfm_crypto_private.h
@@ -33,12 +33,12 @@
}
/*
- * Validate the IOVEC[] lengths for IPC model. The tfm_crypto_call_sfn()
+ * Validate the IOVEC[] lengths for IPC model. The tfm_crypto_call_srv()
* reduces the entries in IOVEC[] which are empty from `in_len` and `out_len`.
* This means that Crypto service APIs need to ensure that the `in_len`
* and `out_len` are within the expected range.
*
- * Also tfm_crypto_call_sfn() ensures that all entries in IOVEC[] are
+ * Also tfm_crypto_call_srv() ensures that all entries in IOVEC[] are
* initialised. Hence all entries in IOVEC[] can be accessed to
* initialize internal variables even if they are outside `in_len`
* and `out_len`.
diff --git a/secure_fw/partitions/crypto/tfm_crypto_secure_api.c b/secure_fw/partitions/crypto/tfm_crypto_secure_api.c
index 77fa4f1..5cc7e90 100644
--- a/secure_fw/partitions/crypto/tfm_crypto_secure_api.c
+++ b/secure_fw/partitions/crypto/tfm_crypto_secure_api.c
@@ -17,23 +17,23 @@
#ifdef TFM_PSA_API
-#define API_DISPATCH(sfn_name, sfn_id) \
+#define API_DISPATCH(srv_name, srv_id) \
psa_call(TFM_CRYPTO_HANDLE, PSA_IPC_CALL, \
in_vec, ARRAY_SIZE(in_vec), \
out_vec, ARRAY_SIZE(out_vec))
-#define API_DISPATCH_NO_OUTVEC(sfn_name, sfn_id) \
+#define API_DISPATCH_NO_OUTVEC(srv_name, srv_id) \
psa_call(TFM_CRYPTO_HANDLE, PSA_IPC_CALL, \
in_vec, ARRAY_SIZE(in_vec), \
(psa_outvec *)NULL, 0)
#else
-#define API_DISPATCH(sfn_name, sfn_id) \
- sfn_name##_veneer( \
+#define API_DISPATCH(srv_name, srv_id) \
+ srv_name##_veneer( \
in_vec, ARRAY_SIZE(in_vec), \
out_vec, ARRAY_SIZE(out_vec))
-#define API_DISPATCH_NO_OUTVEC(sfn_name, sfn_id) \
- sfn_name##_veneer( \
+#define API_DISPATCH_NO_OUTVEC(srv_name, srv_id) \
+ srv_name##_veneer( \
in_vec, ARRAY_SIZE(in_vec), \
NULL, 0)
#endif /* TFM_PSA_API */
@@ -54,7 +54,7 @@
#else
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_OPEN_KEY_SID,
+ .srv_id = TFM_CRYPTO_OPEN_KEY_SID,
};
psa_invec in_vec[] = {
{.base = &iov, .len = sizeof(struct tfm_crypto_pack_iovec)},
@@ -78,7 +78,7 @@
#else
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_CLOSE_KEY_SID,
+ .srv_id = TFM_CRYPTO_CLOSE_KEY_SID,
.key_id = key_id,
};
psa_invec in_vec[] = {
@@ -102,7 +102,7 @@
#else
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_IMPORT_KEY_SID,
+ .srv_id = TFM_CRYPTO_IMPORT_KEY_SID,
};
psa_invec in_vec[] = {
{.base = &iov, .len = sizeof(struct tfm_crypto_pack_iovec)},
@@ -127,7 +127,7 @@
#else
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_DESTROY_KEY_SID,
+ .srv_id = TFM_CRYPTO_DESTROY_KEY_SID,
.key_id = key_id,
};
psa_invec in_vec[] = {
@@ -149,7 +149,7 @@
#else
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_GET_KEY_ATTRIBUTES_SID,
+ .srv_id = TFM_CRYPTO_GET_KEY_ATTRIBUTES_SID,
.key_id = key_id,
};
psa_invec in_vec[] = {
@@ -172,7 +172,7 @@
return PSA_ERROR_NOT_SUPPORTED;
#else
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_RESET_KEY_ATTRIBUTES_SID,
+ .srv_id = TFM_CRYPTO_RESET_KEY_ATTRIBUTES_SID,
};
psa_invec in_vec[] = {
{.base = &iov, .len = sizeof(struct tfm_crypto_pack_iovec)},
@@ -198,7 +198,7 @@
#else
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_EXPORT_KEY_SID,
+ .srv_id = TFM_CRYPTO_EXPORT_KEY_SID,
.key_id = key_id,
};
psa_invec in_vec[] = {
@@ -227,7 +227,7 @@
#else
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_EXPORT_PUBLIC_KEY_SID,
+ .srv_id = TFM_CRYPTO_EXPORT_PUBLIC_KEY_SID,
.key_id = key_id,
};
@@ -254,7 +254,7 @@
#else
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_PURGE_KEY_SID,
+ .srv_id = TFM_CRYPTO_PURGE_KEY_SID,
.key_id = key_id,
};
psa_invec in_vec[] = {
@@ -277,7 +277,7 @@
#else
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_COPY_KEY_SID,
+ .srv_id = TFM_CRYPTO_COPY_KEY_SID,
.key_id = source_key_id,
};
@@ -307,7 +307,7 @@
#else
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_CIPHER_GENERATE_IV_SID,
+ .srv_id = TFM_CRYPTO_CIPHER_GENERATE_IV_SID,
.op_handle = operation->handle,
};
@@ -337,7 +337,7 @@
#else
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_CIPHER_SET_IV_SID,
+ .srv_id = TFM_CRYPTO_CIPHER_SET_IV_SID,
.op_handle = operation->handle,
};
@@ -365,7 +365,7 @@
#else
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_CIPHER_ENCRYPT_SETUP_SID,
+ .srv_id = TFM_CRYPTO_CIPHER_ENCRYPT_SETUP_SID,
.key_id = key_id,
.alg = alg,
.op_handle = operation->handle,
@@ -394,7 +394,7 @@
#else
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_CIPHER_DECRYPT_SETUP_SID,
+ .srv_id = TFM_CRYPTO_CIPHER_DECRYPT_SETUP_SID,
.key_id = key_id,
.alg = alg,
.op_handle = operation->handle,
@@ -427,7 +427,7 @@
#else
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_CIPHER_UPDATE_SID,
+ .srv_id = TFM_CRYPTO_CIPHER_UPDATE_SID,
.op_handle = operation->handle,
};
@@ -456,7 +456,7 @@
#else
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_CIPHER_ABORT_SID,
+ .srv_id = TFM_CRYPTO_CIPHER_ABORT_SID,
.op_handle = operation->handle,
};
@@ -484,7 +484,7 @@
#else
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_CIPHER_FINISH_SID,
+ .srv_id = TFM_CRYPTO_CIPHER_FINISH_SID,
.op_handle = operation->handle,
};
@@ -513,7 +513,7 @@
#else
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_HASH_SETUP_SID,
+ .srv_id = TFM_CRYPTO_HASH_SETUP_SID,
.alg = alg,
.op_handle = operation->handle,
};
@@ -541,7 +541,7 @@
#else
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_HASH_UPDATE_SID,
+ .srv_id = TFM_CRYPTO_HASH_UPDATE_SID,
.op_handle = operation->handle,
};
@@ -570,7 +570,7 @@
#else
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_HASH_FINISH_SID,
+ .srv_id = TFM_CRYPTO_HASH_FINISH_SID,
.op_handle = operation->handle,
};
@@ -600,7 +600,7 @@
#else
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_HASH_VERIFY_SID,
+ .srv_id = TFM_CRYPTO_HASH_VERIFY_SID,
.op_handle = operation->handle,
};
@@ -626,7 +626,7 @@
#else
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_HASH_ABORT_SID,
+ .srv_id = TFM_CRYPTO_HASH_ABORT_SID,
.op_handle = operation->handle,
};
@@ -652,7 +652,7 @@
#else
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_HASH_CLONE_SID,
+ .srv_id = TFM_CRYPTO_HASH_CLONE_SID,
.op_handle = source_operation->handle,
};
@@ -686,7 +686,7 @@
#else
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_HASH_COMPUTE_SID,
+ .srv_id = TFM_CRYPTO_HASH_COMPUTE_SID,
.alg = alg,
};
@@ -719,7 +719,7 @@
#else
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_HASH_COMPARE_SID,
+ .srv_id = TFM_CRYPTO_HASH_COMPARE_SID,
.alg = alg,
};
@@ -745,7 +745,7 @@
#else
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_MAC_SIGN_SETUP_SID,
+ .srv_id = TFM_CRYPTO_MAC_SIGN_SETUP_SID,
.key_id = key_id,
.alg = alg,
.op_handle = operation->handle,
@@ -774,7 +774,7 @@
#else
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_MAC_VERIFY_SETUP_SID,
+ .srv_id = TFM_CRYPTO_MAC_VERIFY_SETUP_SID,
.key_id = key_id,
.alg = alg,
.op_handle = operation->handle,
@@ -803,7 +803,7 @@
#else
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_MAC_UPDATE_SID,
+ .srv_id = TFM_CRYPTO_MAC_UPDATE_SID,
.op_handle = operation->handle,
};
@@ -832,7 +832,7 @@
#else
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_MAC_SIGN_FINISH_SID,
+ .srv_id = TFM_CRYPTO_MAC_SIGN_FINISH_SID,
.op_handle = operation->handle,
};
@@ -862,7 +862,7 @@
#else
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_MAC_VERIFY_FINISH_SID,
+ .srv_id = TFM_CRYPTO_MAC_VERIFY_FINISH_SID,
.op_handle = operation->handle,
};
@@ -888,7 +888,7 @@
#else
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_MAC_ABORT_SID,
+ .srv_id = TFM_CRYPTO_MAC_ABORT_SID,
.op_handle = operation->handle,
};
@@ -923,7 +923,7 @@
#else
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_AEAD_ENCRYPT_SID,
+ .srv_id = TFM_CRYPTO_AEAD_ENCRYPT_SID,
.key_id = key_id,
.alg = alg,
.aead_in = {.nonce = {0}, .nonce_length = 0}
@@ -993,7 +993,7 @@
#else
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_AEAD_DECRYPT_SID,
+ .srv_id = TFM_CRYPTO_AEAD_DECRYPT_SID,
.key_id = key_id,
.alg = alg,
.aead_in = {.nonce = {0}, .nonce_length = 0}
@@ -1055,7 +1055,7 @@
#else
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_AEAD_ENCRYPT_SETUP_SID,
+ .srv_id = TFM_CRYPTO_AEAD_ENCRYPT_SETUP_SID,
.key_id = key,
.alg = alg,
.op_handle = operation->handle,
@@ -1083,7 +1083,7 @@
#else
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_AEAD_DECRYPT_SETUP_SID,
+ .srv_id = TFM_CRYPTO_AEAD_DECRYPT_SETUP_SID,
.key_id = key,
.alg = alg,
.op_handle = operation->handle,
@@ -1112,7 +1112,7 @@
#else
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_AEAD_GENERATE_NONCE_SID,
+ .srv_id = TFM_CRYPTO_AEAD_GENERATE_NONCE_SID,
.op_handle = operation->handle,
};
@@ -1141,7 +1141,7 @@
#else
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_AEAD_SET_NONCE_SID,
+ .srv_id = TFM_CRYPTO_AEAD_SET_NONCE_SID,
.op_handle = operation->handle,
};
@@ -1168,7 +1168,7 @@
#else
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_AEAD_SET_LENGTHS_SID,
+ .srv_id = TFM_CRYPTO_AEAD_SET_LENGTHS_SID,
.ad_length = ad_length,
.plaintext_length = plaintext_length,
.op_handle = operation->handle,
@@ -1196,7 +1196,7 @@
#else
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_AEAD_UPDATE_AD_SID,
+ .srv_id = TFM_CRYPTO_AEAD_UPDATE_AD_SID,
.op_handle = operation->handle,
};
@@ -1242,7 +1242,7 @@
#else
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_AEAD_UPDATE_SID,
+ .srv_id = TFM_CRYPTO_AEAD_UPDATE_SID,
.op_handle = operation->handle,
};
@@ -1291,7 +1291,7 @@
#else
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_AEAD_FINISH_SID,
+ .srv_id = TFM_CRYPTO_AEAD_FINISH_SID,
.op_handle = operation->handle,
};
@@ -1354,7 +1354,7 @@
#else
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_AEAD_VERIFY_SID,
+ .srv_id = TFM_CRYPTO_AEAD_VERIFY_SID,
.op_handle = operation->handle,
};
@@ -1409,7 +1409,7 @@
#else
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_AEAD_ABORT_SID,
+ .srv_id = TFM_CRYPTO_AEAD_ABORT_SID,
.op_handle = operation->handle,
};
@@ -1439,7 +1439,7 @@
#else
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_SIGN_MESSAGE_SID,
+ .srv_id = TFM_CRYPTO_SIGN_MESSAGE_SID,
.key_id = key_id,
.alg = alg,
};
@@ -1472,7 +1472,7 @@
#else
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_VERIFY_MESSAGE_SID,
+ .srv_id = TFM_CRYPTO_VERIFY_MESSAGE_SID,
.key_id = key_id,
.alg = alg
};
@@ -1503,7 +1503,7 @@
#else
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_SIGN_HASH_SID,
+ .srv_id = TFM_CRYPTO_SIGN_HASH_SID,
.key_id = key_id,
.alg = alg,
};
@@ -1537,7 +1537,7 @@
#else
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_VERIFY_HASH_SID,
+ .srv_id = TFM_CRYPTO_VERIFY_HASH_SID,
.key_id = key_id,
.alg = alg
};
@@ -1570,7 +1570,7 @@
#else
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_ASYMMETRIC_ENCRYPT_SID,
+ .srv_id = TFM_CRYPTO_ASYMMETRIC_ENCRYPT_SID,
.key_id = key_id,
.alg = alg
};
@@ -1624,7 +1624,7 @@
#else
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_ASYMMETRIC_DECRYPT_SID,
+ .srv_id = TFM_CRYPTO_ASYMMETRIC_DECRYPT_SID,
.key_id = key_id,
.alg = alg
};
@@ -1672,7 +1672,7 @@
#else
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_KEY_DERIVATION_GET_CAPACITY_SID,
+ .srv_id = TFM_CRYPTO_KEY_DERIVATION_GET_CAPACITY_SID,
.op_handle = operation->handle,
};
@@ -1701,7 +1701,7 @@
#else
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_KEY_DERIVATION_OUTPUT_BYTES_SID,
+ .srv_id = TFM_CRYPTO_KEY_DERIVATION_OUTPUT_BYTES_SID,
.op_handle = operation->handle,
};
@@ -1730,7 +1730,7 @@
#else
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_KEY_DERIVATION_INPUT_KEY_SID,
+ .srv_id = TFM_CRYPTO_KEY_DERIVATION_INPUT_KEY_SID,
.key_id = key_id,
.step = step,
.op_handle = operation->handle,
@@ -1754,7 +1754,7 @@
#else
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_KEY_DERIVATION_ABORT_SID,
+ .srv_id = TFM_CRYPTO_KEY_DERIVATION_ABORT_SID,
.op_handle = operation->handle,
};
@@ -1785,7 +1785,7 @@
#else
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_KEY_DERIVATION_KEY_AGREEMENT_SID,
+ .srv_id = TFM_CRYPTO_KEY_DERIVATION_KEY_AGREEMENT_SID,
.key_id = private_key,
.step = step,
.op_handle = operation->handle,
@@ -1815,7 +1815,7 @@
#else
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_GENERATE_RANDOM_SID,
+ .srv_id = TFM_CRYPTO_GENERATE_RANDOM_SID,
};
psa_invec in_vec[] = {
@@ -1845,7 +1845,7 @@
#else
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_GENERATE_KEY_SID,
+ .srv_id = TFM_CRYPTO_GENERATE_KEY_SID,
};
psa_invec in_vec[] = {
@@ -1877,7 +1877,7 @@
#else
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_MAC_COMPUTE_SID,
+ .srv_id = TFM_CRYPTO_MAC_COMPUTE_SID,
.key_id = key_id,
.alg = alg,
};
@@ -1910,7 +1910,7 @@
#else
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_MAC_VERIFY_SID,
+ .srv_id = TFM_CRYPTO_MAC_VERIFY_SID,
.key_id = key_id,
.alg = alg,
};
@@ -1941,7 +1941,7 @@
#else
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_CIPHER_ENCRYPT_SID,
+ .srv_id = TFM_CRYPTO_CIPHER_ENCRYPT_SID,
.key_id = key_id,
.alg = alg,
};
@@ -1975,7 +1975,7 @@
#else
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_CIPHER_DECRYPT_SID,
+ .srv_id = TFM_CRYPTO_CIPHER_DECRYPT_SID,
.key_id = key_id,
.alg = alg,
};
@@ -2009,7 +2009,7 @@
#else
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_RAW_KEY_AGREEMENT_SID,
+ .srv_id = TFM_CRYPTO_RAW_KEY_AGREEMENT_SID,
.alg = alg,
.key_id = private_key
};
@@ -2040,7 +2040,7 @@
#else
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_KEY_DERIVATION_SETUP_SID,
+ .srv_id = TFM_CRYPTO_KEY_DERIVATION_SETUP_SID,
.alg = alg,
.op_handle = operation->handle,
};
@@ -2068,7 +2068,7 @@
#else
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_KEY_DERIVATION_SET_CAPACITY_SID,
+ .srv_id = TFM_CRYPTO_KEY_DERIVATION_SET_CAPACITY_SID,
.capacity = capacity,
.op_handle = operation->handle,
};
@@ -2095,7 +2095,7 @@
#else
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_KEY_DERIVATION_INPUT_BYTES_SID,
+ .srv_id = TFM_CRYPTO_KEY_DERIVATION_INPUT_BYTES_SID,
.step = step,
.op_handle = operation->handle,
};
@@ -2122,7 +2122,7 @@
#else
psa_status_t status;
struct tfm_crypto_pack_iovec iov = {
- .sfn_id = TFM_CRYPTO_KEY_DERIVATION_OUTPUT_KEY_SID,
+ .srv_id = TFM_CRYPTO_KEY_DERIVATION_OUTPUT_KEY_SID,
.op_handle = operation->handle,
};