mirror/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-01-29 12:32:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Store operation_ts on PSA sim server side; only send handle to client

Browse Source 
Signed-off-by: Tom Cosgrove <tom.cosgrove@arm.com>
This commit is contained in:
Tom Cosgrove 2024-06-10 14:08:04 +01:00
parent d6048a459c
commit 517f4a1b4d
3 changed files with 150 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
tests/psa-client-server/psasim/src/psa_sim_crypto_server.c
View File

@ -72,7 +72,7 @@ int psa_hash_abort_wrapper(
uint8_t **out_params, size_t *out_params_len)
{
psa_status_t status = PSA_ERROR_CORRUPTION_DETECTED;
psa_hash_operation_t operation;
psa_hash_operation_t *operation;
uint8_t *pos = in_params;
size_t remaining = in_params_len;
@ -84,7 +84,7 @@ int psa_hash_abort_wrapper(
goto fail;
}
ok = psasim_deserialise_psa_hash_operation_t(&pos, &remaining, &operation);
ok = psasim_server_deserialise_psa_hash_operation_t(&pos, &remaining, &operation);
if (!ok) {
goto fail;
}
@ -92,14 +92,14 @@ int psa_hash_abort_wrapper(
// Now we call the actual target function
status = psa_hash_abort(
&operation
operation
);
// NOTE: Should really check there is no overflow as we go along.
size_t result_size =
psasim_serialise_begin_needs() +
psasim_serialise_psa_status_t_needs(status) +
psasim_serialise_psa_hash_operation_t_needs(operation);
psasim_server_serialise_psa_hash_operation_t_needs(operation);
result = malloc(result_size);
if (result == NULL) {
@ -119,7 +119,7 @@ int psa_hash_abort_wrapper(
goto fail;
}
ok = psasim_serialise_psa_hash_operation_t(&rpos, &rremain, operation);
ok = psasim_server_serialise_psa_hash_operation_t(&rpos, &rremain, operation);
if (!ok) {
goto fail;
}
@ -141,8 +141,8 @@ int psa_hash_clone_wrapper(
uint8_t **out_params, size_t *out_params_len)
{
psa_status_t status = PSA_ERROR_CORRUPTION_DETECTED;
psa_hash_operation_t source_operation;
psa_hash_operation_t target_operation;
psa_hash_operation_t *source_operation;
psa_hash_operation_t *target_operation;
uint8_t *pos = in_params;
size_t remaining = in_params_len;
@ -154,12 +154,12 @@ int psa_hash_clone_wrapper(
goto fail;
}
ok = psasim_deserialise_psa_hash_operation_t(&pos, &remaining, &source_operation);
ok = psasim_server_deserialise_psa_hash_operation_t(&pos, &remaining, &source_operation);
if (!ok) {
goto fail;
}
ok = psasim_deserialise_psa_hash_operation_t(&pos, &remaining, &target_operation);
ok = psasim_server_deserialise_psa_hash_operation_t(&pos, &remaining, &target_operation);
if (!ok) {
goto fail;
}
@ -167,15 +167,15 @@ int psa_hash_clone_wrapper(
// Now we call the actual target function
status = psa_hash_clone(
&source_operation,
&target_operation
source_operation,
target_operation
);
// NOTE: Should really check there is no overflow as we go along.
size_t result_size =
psasim_serialise_begin_needs() +
psasim_serialise_psa_status_t_needs(status) +
psasim_serialise_psa_hash_operation_t_needs(target_operation);
psasim_server_serialise_psa_hash_operation_t_needs(target_operation);
result = malloc(result_size);
if (result == NULL) {
@ -195,7 +195,7 @@ int psa_hash_clone_wrapper(
goto fail;
}
ok = psasim_serialise_psa_hash_operation_t(&rpos, &rremain, target_operation);
ok = psasim_server_serialise_psa_hash_operation_t(&rpos, &rremain, target_operation);
if (!ok) {
goto fail;
}
@ -406,7 +406,7 @@ int psa_hash_finish_wrapper(
uint8_t **out_params, size_t *out_params_len)
{
psa_status_t status = PSA_ERROR_CORRUPTION_DETECTED;
psa_hash_operation_t operation;
psa_hash_operation_t *operation;
uint8_t *hash = NULL;
size_t hash_size;
size_t hash_length;
@ -421,7 +421,7 @@ int psa_hash_finish_wrapper(
goto fail;
}
ok = psasim_deserialise_psa_hash_operation_t(&pos, &remaining, &operation);
ok = psasim_server_deserialise_psa_hash_operation_t(&pos, &remaining, &operation);
if (!ok) {
goto fail;
}
@ -439,7 +439,7 @@ int psa_hash_finish_wrapper(
// Now we call the actual target function
status = psa_hash_finish(
&operation,
operation,
hash, hash_size,
&hash_length
);
@ -448,7 +448,7 @@ int psa_hash_finish_wrapper(
size_t result_size =
psasim_serialise_begin_needs() +
psasim_serialise_psa_status_t_needs(status) +
psasim_serialise_psa_hash_operation_t_needs(operation) +
psasim_server_serialise_psa_hash_operation_t_needs(operation) +
psasim_serialise_buffer_needs(hash, hash_size) +
psasim_serialise_size_t_needs(hash_length);
@ -470,7 +470,7 @@ int psa_hash_finish_wrapper(
goto fail;
}
ok = psasim_serialise_psa_hash_operation_t(&rpos, &rremain, operation);
ok = psasim_server_serialise_psa_hash_operation_t(&rpos, &rremain, operation);
if (!ok) {
goto fail;
}
@ -506,7 +506,7 @@ int psa_hash_setup_wrapper(
uint8_t **out_params, size_t *out_params_len)
{
psa_status_t status = PSA_ERROR_CORRUPTION_DETECTED;
psa_hash_operation_t operation;
psa_hash_operation_t *operation;
psa_algorithm_t alg;
uint8_t *pos = in_params;
@ -519,7 +519,7 @@ int psa_hash_setup_wrapper(
goto fail;
}
ok = psasim_deserialise_psa_hash_operation_t(&pos, &remaining, &operation);
ok = psasim_server_deserialise_psa_hash_operation_t(&pos, &remaining, &operation);
if (!ok) {
goto fail;
}
@ -532,7 +532,7 @@ int psa_hash_setup_wrapper(
// Now we call the actual target function
status = psa_hash_setup(
&operation,
operation,
alg
);
@ -540,7 +540,7 @@ int psa_hash_setup_wrapper(
size_t result_size =
psasim_serialise_begin_needs() +
psasim_serialise_psa_status_t_needs(status) +
psasim_serialise_psa_hash_operation_t_needs(operation);
psasim_server_serialise_psa_hash_operation_t_needs(operation);
result = malloc(result_size);
if (result == NULL) {
@ -560,7 +560,7 @@ int psa_hash_setup_wrapper(
goto fail;
}
ok = psasim_serialise_psa_hash_operation_t(&rpos, &rremain, operation);
ok = psasim_server_serialise_psa_hash_operation_t(&rpos, &rremain, operation);
if (!ok) {
goto fail;
}
@ -582,7 +582,7 @@ int psa_hash_update_wrapper(
uint8_t **out_params, size_t *out_params_len)
{
psa_status_t status = PSA_ERROR_CORRUPTION_DETECTED;
psa_hash_operation_t operation;
psa_hash_operation_t *operation;
uint8_t *input = NULL;
size_t input_length;
@ -596,7 +596,7 @@ int psa_hash_update_wrapper(
goto fail;
}
ok = psasim_deserialise_psa_hash_operation_t(&pos, &remaining, &operation);
ok = psasim_server_deserialise_psa_hash_operation_t(&pos, &remaining, &operation);
if (!ok) {
goto fail;
}
@ -609,7 +609,7 @@ int psa_hash_update_wrapper(
// Now we call the actual target function
status = psa_hash_update(
&operation,
operation,
input, input_length
);
@ -617,7 +617,7 @@ int psa_hash_update_wrapper(
size_t result_size =
psasim_serialise_begin_needs() +
psasim_serialise_psa_status_t_needs(status) +
psasim_serialise_psa_hash_operation_t_needs(operation);
psasim_server_serialise_psa_hash_operation_t_needs(operation);
result = malloc(result_size);
if (result == NULL) {
@ -637,7 +637,7 @@ int psa_hash_update_wrapper(
goto fail;
}
ok = psasim_serialise_psa_hash_operation_t(&rpos, &rremain, operation);
ok = psasim_server_serialise_psa_hash_operation_t(&rpos, &rremain, operation);
if (!ok) {
goto fail;
}
@ -663,7 +663,7 @@ int psa_hash_verify_wrapper(
uint8_t **out_params, size_t *out_params_len)
{
psa_status_t status = PSA_ERROR_CORRUPTION_DETECTED;
psa_hash_operation_t operation;
psa_hash_operation_t *operation;
uint8_t *hash = NULL;
size_t hash_length;
@ -677,7 +677,7 @@ int psa_hash_verify_wrapper(
goto fail;
}
ok = psasim_deserialise_psa_hash_operation_t(&pos, &remaining, &operation);
ok = psasim_server_deserialise_psa_hash_operation_t(&pos, &remaining, &operation);
if (!ok) {
goto fail;
}
@ -690,7 +690,7 @@ int psa_hash_verify_wrapper(
// Now we call the actual target function
status = psa_hash_verify(
&operation,
operation,
hash, hash_length
);
@ -698,7 +698,7 @@ int psa_hash_verify_wrapper(
size_t result_size =
psasim_serialise_begin_needs() +
psasim_serialise_psa_status_t_needs(status) +
psasim_serialise_psa_hash_operation_t_needs(operation);
psasim_server_serialise_psa_hash_operation_t_needs(operation);
result = malloc(result_size);
if (result == NULL) {
@ -718,7 +718,7 @@ int psa_hash_verify_wrapper(
goto fail;
}
ok = psasim_serialise_psa_hash_operation_t(&rpos, &rremain, operation);
ok = psasim_server_serialise_psa_hash_operation_t(&rpos, &rremain, operation);
if (!ok) {
goto fail;
}

107
tests/psa-client-server/psasim/src/psa_sim_serialise.c
View File

@ -13,6 +13,51 @@
#include <stdlib.h>
#include <string.h>
/* include/psa/crypto_platform.h:typedef uint32_t mbedtls_psa_client_handle_t;
* but we don't get it on server builds, so redefine it here with a unique type name
*/
typedef uint32_t psasim_client_handle_t;
typedef struct psasim_operation_s {
psasim_client_handle_t handle;
} psasim_operation_t;
#define MAX_LIVE_HANDLES_PER_CLASS 100 /* this many slots */
static psa_hash_operation_t hash_operations[MAX_LIVE_HANDLES_PER_CLASS];
static psasim_client_handle_t hash_operation_handles[MAX_LIVE_HANDLES_PER_CLASS];
static psasim_client_handle_t next_hash_operation_handle = 1;
/* Get a free slot */
static ssize_t allocate_hash_operation_slot(void)
{
psasim_client_handle_t handle = next_hash_operation_handle++;
if (next_hash_operation_handle == 0) { /* wrapped around */
fprintf(stderr, "MAX HASH HANDLES REACHED\n");
exit(1);
}
for (ssize_t i = 0; i < MAX_LIVE_HANDLES_PER_CLASS; i++) {
if (hash_operation_handles[i] == 0) {
hash_operation_handles[i] = handle;
return i;
}
}
return -1; /* all in use */
}
static ssize_t find_hash_slot_by_handle(psasim_client_handle_t handle)
{
for (ssize_t i = 0; i < MAX_LIVE_HANDLES_PER_CLASS; i++) {
if (hash_operation_handles[i] == handle) {
return i;
}
}
return -1; /* all in use */
}
/* Basic idea:
*
* All arguments to a function will be serialised into a single buffer to
@ -404,3 +449,65 @@ int psasim_deserialise_psa_hash_operation_t(uint8_t **pos,
return 1;
}
/* On the server side, we have a certain number of slots. One array holds the
* psa_XXX_operation_t values by slot, the other holds the client-side handles
* for the slots.
*/
size_t psasim_server_serialise_psa_hash_operation_t_needs(psa_hash_operation_t *operation)
{
(void) operation;
/* We will actually return a handle */
return sizeof(psasim_operation_t);
}
int psasim_server_serialise_psa_hash_operation_t(uint8_t **pos,
size_t *remaining,
psa_hash_operation_t *operation)
{
psasim_operation_t client_operation;
if (*remaining < sizeof(client_operation)) {
return 0;
}
ssize_t slot = operation - hash_operations;
client_operation.handle = hash_operation_handles[slot];
memcpy(*pos, &client_operation, sizeof(client_operation));
*pos += sizeof(client_operation);
return 1;
}
int psasim_server_deserialise_psa_hash_operation_t(uint8_t **pos,
size_t *remaining,
psa_hash_operation_t **operation)
{
psasim_operation_t client_operation;
if (*remaining < sizeof(psasim_operation_t)) {
return 0;
}
memcpy(&client_operation, *pos, sizeof(psasim_operation_t));
*pos += sizeof(psasim_operation_t);
*remaining -= sizeof(psasim_operation_t);
ssize_t slot;
if (client_operation.handle == 0) { /* We need a new handle */
slot = allocate_hash_operation_slot();
} else {
slot = find_hash_slot_by_handle(client_operation.handle);
}
if (slot < 0) {
return 0;
}
*operation = &hash_operations[slot];
return 1;
}

10
tests/psa-client-server/psasim/src/psa_sim_serialise.h
View File

@ -408,3 +408,13 @@ int psasim_serialise_psa_hash_operation_t(uint8_t **pos,
int psasim_deserialise_psa_hash_operation_t(uint8_t **pos,
size_t *remaining,
psa_hash_operation_t *value);
size_t psasim_server_serialise_psa_hash_operation_t_needs(psa_hash_operation_t *operation);
int psasim_server_serialise_psa_hash_operation_t(uint8_t **pos,
size_t *remaining,
psa_hash_operation_t *operation);
int psasim_server_deserialise_psa_hash_operation_t(uint8_t **pos,
size_t *remaining,
psa_hash_operation_t **operation);