Add buffer protection for `cipher_generate_iv` and `cipher_set_iv`
Signed-off-by: Gabor Mezei <gabor.mezei@arm.com>
diff --git a/library/psa_crypto.c b/library/psa_crypto.c
index c6a0a8b..7ccf167 100644
--- a/library/psa_crypto.c
+++ b/library/psa_crypto.c
@@ -3719,7 +3719,7 @@
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 @@
}
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 @@
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 @@
} else {
psa_cipher_abort(operation);
}
+
+ LOCAL_INPUT_FREE(iv_external, iv);
+
return status;
}