TeamHepta/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2026-04-15 08:28:50 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add buffer protection for cipher_generate_iv and cipher_set_iv

Browse Source 
Signed-off-by: Gabor Mezei <gabor.mezei@arm.com>
This commit is contained in:
Gabor Mezei
2024-02-01 10:39:26 +01:00
parent ed96d687d7
commit 282bb53edc
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
library/psa_crypto.c
View File

@@ -3719,7 +3719,7 @@ psa_status_t psa_cipher_generate_iv(psa_cipher_operation_t *operation,
exit:
if (status == PSA_SUCCESS) {
memcpy(iv, local_iv, default_iv_length);
psa_crypto_copy_output(local_iv, default_iv_length, iv, iv_size);
*iv_length = default_iv_length;
operation->iv_set = 1;
} else {
@@ -3731,11 +3731,13 @@ exit:
}
psa_status_t psa_cipher_set_iv(psa_cipher_operation_t *operation,
const uint8_t *iv,
const uint8_t *iv_external,
size_t iv_length)
{
psa_status_t status = PSA_ERROR_CORRUPTION_DETECTED;
LOCAL_INPUT_DECLARE(iv_external, iv);
if (operation->id == 0) {
status = PSA_ERROR_BAD_STATE;
goto exit;
@@ -3751,6 +3753,8 @@ psa_status_t psa_cipher_set_iv(psa_cipher_operation_t *operation,
goto exit;
}
LOCAL_INPUT_ALLOC(iv_external, iv_length, iv);
status = psa_driver_wrapper_cipher_set_iv(operation,
iv,
iv_length);
@@ -3761,6 +3765,9 @@ exit:
} else {
psa_cipher_abort(operation);
}
LOCAL_INPUT_FREE(iv_external, iv);
return status;
}