mirror/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-04-16 08:42:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

psasim: minor fixes to the core

Browse Source 
- do not try to close a connection that was never started
- fix data chunks length for psa_write (prevent memcpy-ing
  to large blocks of data)

Signed-off-by: Valerio Setti <valerio.setti@nordicsemi.no>
This commit is contained in:
Valerio Setti 2024-06-27 18:14:43 +02:00
parent 76ac620d70
commit 7fe75ba72d
3 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/psa-client-server/psasim/src/psa_ff_server.c
View File

@ -474,7 +474,7 @@ void psa_write(psa_handle_t msg_handle, uint32_t outvec_idx,
while (sofar < num_bytes) { while (sofar < num_bytes) {
size_t sending = (num_bytes - sofar); size_t sending = (num_bytes - sofar);
if (sending >= MAX_FRAGMENT_SIZE) { if (sending > (MAX_FRAGMENT_SIZE - (sizeof(size_t) * 2))) {
sending = MAX_FRAGMENT_SIZE - (sizeof(size_t) * 2); sending = MAX_FRAGMENT_SIZE - (sizeof(size_t) * 2);
} }

7
tests/psa-client-server/psasim/src/psa_sim_crypto_client.c
View File

@ -44,7 +44,7 @@ int psa_crypto_call(int function,
invec.base = in_params; invec.base = in_params;
invec.len = in_params_len; invec.len = in_params_len;
size_t max_receive = 8192; size_t max_receive = 24576;
uint8_t *receive = malloc(max_receive); uint8_t *receive = malloc(max_receive);
if (receive == NULL) { if (receive == NULL) {
fprintf(stderr, "FAILED to allocate %u bytes\n", (unsigned) max_receive); fprintf(stderr, "FAILED to allocate %u bytes\n", (unsigned) max_receive);
@ -119,6 +119,11 @@ fail:
void mbedtls_psa_crypto_free(void) void mbedtls_psa_crypto_free(void)
{ {
/* Do not try to close a connection that was never started.*/
if (handle == -1) {
return;
}
CLIENT_PRINT("Closing handle"); CLIENT_PRINT("Closing handle");
psa_close(handle); psa_close(handle);
handle = -1; handle = -1;

7
tests/psa-client-server/psasim/src/psa_sim_generate.pl
View File

@ -349,7 +349,7 @@ int psa_crypto_call(int function,
invec.base = in_params; invec.base = in_params;
invec.len = in_params_len; invec.len = in_params_len;
size_t max_receive = 8192; size_t max_receive = 24576;
uint8_t *receive = malloc(max_receive); uint8_t *receive = malloc(max_receive);
if (receive == NULL) { if (receive == NULL) {
fprintf(stderr, "FAILED to allocate %u bytes\n", (unsigned) max_receive); fprintf(stderr, "FAILED to allocate %u bytes\n", (unsigned) max_receive);
@ -424,6 +424,11 @@ fail:
void mbedtls_psa_crypto_free(void) void mbedtls_psa_crypto_free(void)
{ {
/* Do not try to close a connection that was never started.*/
if (handle == -1) {
return;
}
CLIENT_PRINT("Closing handle"); CLIENT_PRINT("Closing handle");
psa_close(handle); psa_close(handle);
handle = -1; handle = -1;