ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

crypto service: Assemble bit crypto key ids

pull/9575/head
itayzafrir 2019-01-30 22:38:38 +02:00
parent 2b9b29455f
commit 3992b83a52
1 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
components/TARGET_PSA/services/crypto/COMPONENT_SPE/psa_crypto_partition.c
View File

@ -27,6 +27,8 @@
#define mbedtls_free free #define mbedtls_free free
#endif #endif
#include "mbed_assert.h"
// ---------------------------------- Macros ----------------------------------- // ---------------------------------- Macros -----------------------------------
#if !defined(MIN) #if !defined(MIN)
#define MIN( a, b ) ( ( ( a ) < ( b ) ) ? ( a ) : ( b ) ) #define MIN( a, b ) ( ( ( a ) < ( b ) ) ? ( a ) : ( b ) )
@ -53,6 +55,9 @@ the data will be read in chunks of size */
#endif #endif
static psa_spm_hash_clone_t psa_spm_hash_clones[MAX_CONCURRENT_HASH_CLONES]; static psa_spm_hash_clone_t psa_spm_hash_clones[MAX_CONCURRENT_HASH_CLONES];
#define CLIENT_PSA_KEY_ID_SIZE_IN_BYTES 4
MBED_STATIC_ASSERT(sizeof(psa_key_id_t) != CLIENT_PSA_KEY_ID_SIZE_IN_BYTES, "Unexpected psa_key_id_t size");
// ------------------------- Internal Helper Functions ------------------------- // ------------------------- Internal Helper Functions -------------------------
static inline psa_status_t reserve_hash_clone(int32_t partition_id, void *source_operation, size_t *index) static inline psa_status_t reserve_hash_clone(int32_t partition_id, void *source_operation, size_t *index)
{ {
@ -1217,13 +1222,18 @@ static void psa_key_management_operation(void)
} }
case PSA_CREATE_KEY: { case PSA_CREATE_KEY: {
psa_key_id_t id = 0; psa_key_id_t id;
id.owner = psa_identity(msg.handle);
bytes_read = psa_read(msg.handle, 1, &id, msg.in_size[1]); bytes_read = psa_read(msg.handle, 1, &(id.key_id), msg.in_size[1]);
if (bytes_read != msg.in_size[1]) { if (bytes_read != msg.in_size[1]) {
SPM_PANIC("SPM read length mismatch"); SPM_PANIC("SPM read length mismatch");
} }
if (msg.in_size[1] != CLIENT_PSA_KEY_ID_SIZE_IN_BYTES) {
SPM_PANIC("Unexpected psa_key_id_t size received from client");
}
status = psa_create_key(psa_key_mng.lifetime, id, &psa_key_mng.handle); status = psa_create_key(psa_key_mng.lifetime, id, &psa_key_mng.handle);
if (status == PSA_SUCCESS) { if (status == PSA_SUCCESS) {
psa_write(msg.handle, 0, &psa_key_mng.handle, sizeof(psa_key_mng.handle)); psa_write(msg.handle, 0, &psa_key_mng.handle, sizeof(psa_key_mng.handle));
@ -1232,13 +1242,18 @@ static void psa_key_management_operation(void)
} }
case PSA_OPEN_KEY: { case PSA_OPEN_KEY: {
psa_key_id_t id = 0; psa_key_id_t id;
id.owner = psa_identity(msg.handle);
bytes_read = psa_read(msg.handle, 1, &id, msg.in_size[1]); bytes_read = psa_read(msg.handle, 1, &(id.key_id), msg.in_size[1]);
if (bytes_read != msg.in_size[1]) { if (bytes_read != msg.in_size[1]) {
SPM_PANIC("SPM read length mismatch"); SPM_PANIC("SPM read length mismatch");
} }
if (msg.in_size[1] != CLIENT_PSA_KEY_ID_SIZE_IN_BYTES) {
SPM_PANIC("Unexpected psa_key_id_t size received from client");
}
status = psa_open_key(psa_key_mng.lifetime, id, &psa_key_mng.handle); status = psa_open_key(psa_key_mng.lifetime, id, &psa_key_mng.handle);
if (status == PSA_SUCCESS) { if (status == PSA_SUCCESS) {
psa_write(msg.handle, 0, &psa_key_mng.handle, sizeof(psa_key_mng.handle)); psa_write(msg.handle, 0, &psa_key_mng.handle, sizeof(psa_key_mng.handle));