From 6e3d238ffd0ef353e76d67dd2bd33ad57205564a Mon Sep 17 00:00:00 2001 From: Moran Peker Date: Wed, 27 Feb 2019 15:03:45 +0200 Subject: [PATCH] Styling --- .../psa_attest_inject_key.c | 21 +++++++------------ .../psa_initial_attestation_api.c | 2 -- .../COMPONENT_SPE/psa_attestation_partition.c | 1 - 3 files changed, 7 insertions(+), 17 deletions(-) diff --git a/components/TARGET_PSA/services/attestation/COMPONENT_PSA_SRV_IPC/psa_attest_inject_key.c b/components/TARGET_PSA/services/attestation/COMPONENT_PSA_SRV_IPC/psa_attest_inject_key.c index 405c5b16cd..5189ab3be3 100755 --- a/components/TARGET_PSA/services/attestation/COMPONENT_PSA_SRV_IPC/psa_attest_inject_key.c +++ b/components/TARGET_PSA/services/attestation/COMPONENT_PSA_SRV_IPC/psa_attest_inject_key.c @@ -33,21 +33,14 @@ psa_attestation_inject_key(const uint8_t *key_data, { psa_handle_t handle = PSA_NULL_HANDLE; psa_status_t call_error = PSA_SUCCESS; - psa_invec in_vec[2]; - psa_outvec out_vec[2]; + psa_invec in_vec[2] = { + { &type, sizeof(type) }, + { key_data, key_data_length } + }; - in_vec[0] = (psa_invec) { - &type, - sizeof(type) - }; - in_vec[1] = (psa_invec) { - key_data, key_data_length - }; - out_vec[0] = (psa_outvec) { - public_key_data, public_key_data_size - }; - out_vec[1] = (psa_outvec) { - public_key_data_length, sizeof(*public_key_data_length) + psa_outvec out_vec[2] = { + { public_key_data, public_key_data_size }, + { public_key_data_length, sizeof(*public_key_data_length) } }; handle = psa_connect(PSA_ATTEST_INJECT_KEY_ID, MINOR_VER); diff --git a/components/TARGET_PSA/services/attestation/COMPONENT_PSA_SRV_IPC/psa_initial_attestation_api.c b/components/TARGET_PSA/services/attestation/COMPONENT_PSA_SRV_IPC/psa_initial_attestation_api.c index 609b684272..8985076db8 100755 --- a/components/TARGET_PSA/services/attestation/COMPONENT_PSA_SRV_IPC/psa_initial_attestation_api.c +++ b/components/TARGET_PSA/services/attestation/COMPONENT_PSA_SRV_IPC/psa_initial_attestation_api.c @@ -57,9 +57,7 @@ enum psa_attest_err_t psa_initial_attest_get_token_size(uint32_t challenge_size, uint32_t *token_size) { psa_status_t err_call; - psa_handle_t handle = PSA_NULL_HANDLE; - psa_invec in_vec[1] = { { &challenge_size, sizeof(uint32_t) } }; psa_outvec out_vec[1] = { { token_size, sizeof(uint32_t) } }; diff --git a/components/TARGET_PSA/services/attestation/COMPONENT_SPE/psa_attestation_partition.c b/components/TARGET_PSA/services/attestation/COMPONENT_SPE/psa_attestation_partition.c index afef1fe638..8a399d3551 100755 --- a/components/TARGET_PSA/services/attestation/COMPONENT_SPE/psa_attestation_partition.c +++ b/components/TARGET_PSA/services/attestation/COMPONENT_SPE/psa_attestation_partition.c @@ -175,7 +175,6 @@ static void psa_attest_inject_key(void) size_t public_key_data_length = 0; uint8_t *key_data = NULL; psa_key_type_t type; - uint32_t bytes_read = 0; if (msg.in_size[0] != sizeof(psa_key_type_t)) {