Proper multipart AEAD GCM Implementation

Signed-off-by: Paul Elliott <paul.elliott@arm.com>
diff --git a/include/psa/crypto_builtin_composites.h b/include/psa/crypto_builtin_composites.h
index ff8e148..7d8bc1a 100644
--- a/include/psa/crypto_builtin_composites.h
+++ b/include/psa/crypto_builtin_composites.h
@@ -89,16 +89,8 @@
     psa_key_type_t key_type;
 
     unsigned int is_encrypt : 1;
-    unsigned int ad_started : 1;
-    unsigned int body_started : 1;
 
     uint8_t tag_length;
-    uint8_t *tag_buffer;
-
-    /* Buffer to store Nonce - only required until CCM and GCM get proper
-     * multipart support.*/
-    uint8_t *nonce;
-    size_t nonce_length;
 
     union
     {
@@ -117,7 +109,7 @@
 
 } mbedtls_psa_aead_operation_t;
 
-#define MBEDTLS_PSA_AEAD_OPERATION_INIT {0, 0, 0, 0, 0, 0, 0, 0, 0, {0}}
+#define MBEDTLS_PSA_AEAD_OPERATION_INIT {0, 0, 0, 0, {0}}
 
 /*
  * BEYOND THIS POINT, TEST DRIVER DECLARATIONS ONLY.