commit 6db0e73dc48208fdd5c15bd39027e429bade83ef
author David Horstmann <david.horstmann@arm.com> Mon Dec 11 15:35:59 2023 +0000
committer David Horstmann <david.horstmann@arm.com> Tue Feb 06 13:39:02 2024 +0000
tree 891671e33fd70af134b9cb8a0690a0f343ec7ec4
parent 2914fac28a970b609a0ffad6f7840771f7f1155b

Add buffer copying to psa_aead_finish()

Signed-off-by: David Horstmann <david.horstmann@arm.com>

library/psa_crypto.c

diff --git a/library/psa_crypto.c b/library/psa_crypto.c
index d5fc495..1aad3cd 100644
--- a/library/psa_crypto.c
+++ b/library/psa_crypto.c
@@ -5192,15 +5192,21 @@
 
 /* Finish encrypting a message in a multipart AEAD operation. */
 psa_status_t psa_aead_finish(psa_aead_operation_t *operation,
-                             uint8_t *ciphertext,
+                             uint8_t *ciphertext_external,
                              size_t ciphertext_size,
                              size_t *ciphertext_length,
-                             uint8_t *tag,
+                             uint8_t *tag_external,
                              size_t tag_size,
                              size_t *tag_length)
 {
     psa_status_t status = PSA_ERROR_CORRUPTION_DETECTED;
 
+    LOCAL_OUTPUT_DECLARE(ciphertext_external, ciphertext);
+    LOCAL_OUTPUT_DECLARE(tag_external, tag);
+
+    LOCAL_OUTPUT_ALLOC(ciphertext_external, ciphertext_size, ciphertext);
+    LOCAL_OUTPUT_ALLOC(tag_external, tag_size, tag);
+
     *ciphertext_length = 0;
     *tag_length = tag_size;
 
@@ -5231,6 +5237,9 @@
 
     psa_aead_abort(operation);
 
+    LOCAL_OUTPUT_FREE(ciphertext_external, ciphertext);
+    LOCAL_OUTPUT_FREE(tag_external, tag);
+
     return status;
 }