mirror/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-03-28 19:21:08 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add buffer protection to psa_raw_key_agreement

Browse Source 
Signed-off-by: Thomas Daubney <thomas.daubney@arm.com>
This commit is contained in:
Thomas Daubney 2024-02-15 12:57:26 +00:00
parent b539126670
commit 81899aba11
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
library/psa_crypto.c
View File

@ -7376,9 +7376,9 @@ psa_status_t psa_key_derivation_key_agreement(psa_key_derivation_operation_t *op
psa_status_t psa_raw_key_agreement(psa_algorithm_t alg, psa_status_t psa_raw_key_agreement(psa_algorithm_t alg,
mbedtls_svc_key_id_t private_key, mbedtls_svc_key_id_t private_key,
const uint8_t *peer_key, const uint8_t *peer_key_external,
size_t peer_key_length, size_t peer_key_length,
uint8_t *output, uint8_t *output_external,
size_t output_size, size_t output_size,
size_t *output_length) size_t *output_length)
{ {
@ -7386,6 +7386,8 @@ psa_status_t psa_raw_key_agreement(psa_algorithm_t alg,
psa_status_t unlock_status = PSA_ERROR_CORRUPTION_DETECTED; psa_status_t unlock_status = PSA_ERROR_CORRUPTION_DETECTED;
psa_key_slot_t *slot = NULL; psa_key_slot_t *slot = NULL;
size_t expected_length; size_t expected_length;
LOCAL_INPUT_DECLARE(peer_key_external, peer_key);
LOCAL_OUTPUT_DECLARE(output_external, output);
if (!PSA_ALG_IS_KEY_AGREEMENT(alg)) { if (!PSA_ALG_IS_KEY_AGREEMENT(alg)) {
status = PSA_ERROR_INVALID_ARGUMENT; status = PSA_ERROR_INVALID_ARGUMENT;
@ -7412,6 +7414,8 @@ psa_status_t psa_raw_key_agreement(psa_algorithm_t alg,
goto exit; goto exit;
} }
LOCAL_INPUT_ALLOC(peer_key_external, peer_key_length, peer_key);
LOCAL_OUTPUT_ALLOC(output_external, output_size, output);
status = psa_key_agreement_raw_internal(alg, slot, status = psa_key_agreement_raw_internal(alg, slot,
peer_key, peer_key_length, peer_key, peer_key_length,
output, output_size, output, output_size,
@ -7432,6 +7436,8 @@ exit:
unlock_status = psa_unregister_read(slot); unlock_status = psa_unregister_read(slot);
LOCAL_INPUT_FREE(peer_key_external, peer_key);
LOCAL_OUTPUT_FREE(output_external, output);
return (status == PSA_SUCCESS) ? unlock_status : status; return (status == PSA_SUCCESS) ? unlock_status : status;
} }