commit 71b0567c87e07ba7376b991f46d94bcac8afbfa8
author Paul Elliott <paul.elliott@arm.com> Fri Sep 24 11:18:13 2021 +0100
committer Paul Elliott <paul.elliott@arm.com> Fri Sep 24 11:18:13 2021 +0100
tree 6401fa474c5131b8fc0638eb7c78ef560576e1f2
parent 3db0b70263f142425c7f2a9bdcc8e99449fa2741
parent f0f2294f57c2c4867befa30e4b21042eb05b9b8f

Merge remote-tracking branch 'upstream/development' into psa-m-aead-merge

Also fiixed the following merge problems:

crypto_struct.h   : Added MBEDTLS_PRIVATE to psa_aead_operation_s
                    members (merge conflict)
psa_crypto_aead.c : Added ciphertext_length to mbedtls_gcm_finish
                    call (change of API during development)

Signed-off-by: Paul Elliott <paul.elliott@arm.com>

library/psa_crypto_aead.c

diff --git a/library/psa_crypto_aead.c b/library/psa_crypto_aead.c
index 01d5d19..9000abf 100644
--- a/library/psa_crypto_aead.c
+++ b/library/psa_crypto_aead.c
@@ -643,7 +643,7 @@
 
         status =  mbedtls_to_psa_error(
             mbedtls_gcm_finish( &operation->ctx.gcm,
-                                ciphertext, ciphertext_size,
+                                ciphertext, ciphertext_size, ciphertext_length,
                                 tag, operation->tag_length ) );
     }
     else