diff --git a/library/psa_crypto_aead.c b/library/psa_crypto_aead.c
index 4fb0e3b..0daa303 100644
--- a/library/psa_crypto_aead.c
+++ b/library/psa_crypto_aead.c
@@ -337,13 +337,12 @@
 
 /* Set the key and algorithm for a multipart authenticated encryption
  * operation. */
-psa_status_t mbedtls_psa_aead_encrypt_setup( mbedtls_psa_aead_operation_t
-                                                                    *operation,
-                                             const psa_key_attributes_t
-                                                                    *attributes,
-                                             const uint8_t *key_buffer,
-                                             size_t key_buffer_size,
-                                             psa_algorithm_t alg )
+psa_status_t mbedtls_psa_aead_encrypt_setup(
+    mbedtls_psa_aead_operation_t *operation,
+    const psa_key_attributes_t *attributes,
+    const uint8_t *key_buffer,
+    size_t key_buffer_size,
+    psa_algorithm_t alg )
 {
     psa_status_t status = PSA_ERROR_CORRUPTION_DETECTED;
 
@@ -358,13 +357,12 @@
 
 /* Set the key and algorithm for a multipart authenticated decryption
  * operation. */
-psa_status_t mbedtls_psa_aead_decrypt_setup( mbedtls_psa_aead_operation_t
-                                                                    *operation,
-                                             const psa_key_attributes_t
-                                                                    *attributes,
-                                             const uint8_t *key_buffer,
-                                             size_t key_buffer_size,
-                                             psa_algorithm_t alg )
+psa_status_t mbedtls_psa_aead_decrypt_setup(
+    mbedtls_psa_aead_operation_t *operation,
+    const psa_key_attributes_t *attributes,
+    const uint8_t *key_buffer,
+    size_t key_buffer_size,
+    psa_algorithm_t alg )
 {
     psa_status_t status = PSA_ERROR_CORRUPTION_DETECTED;
 
@@ -380,10 +378,10 @@
 }
 
 /* Set a nonce for the multipart AEAD operation*/
-psa_status_t mbedtls_psa_aead_set_nonce( mbedtls_psa_aead_operation_t
-                                                                    *operation,
-                                         const uint8_t *nonce,
-                                         size_t nonce_length )
+psa_status_t mbedtls_psa_aead_set_nonce(
+    mbedtls_psa_aead_operation_t *operation,
+    const uint8_t *nonce,
+    size_t nonce_length )
 {
     psa_status_t status = PSA_ERROR_CORRUPTION_DETECTED;
 
@@ -439,10 +437,10 @@
     return( status );
 }
  /* Declare the lengths of the message and additional data for AEAD. */
-psa_status_t mbedtls_psa_aead_set_lengths( mbedtls_psa_aead_operation_t
-                                                                    *operation,
-                                           size_t ad_length,
-                                           size_t plaintext_length )
+psa_status_t mbedtls_psa_aead_set_lengths(
+    mbedtls_psa_aead_operation_t *operation,
+    size_t ad_length,
+    size_t plaintext_length )
 {
 
 #if defined(MBEDTLS_PSA_BUILTIN_ALG_GCM)
@@ -491,10 +489,10 @@
 }
 
 /* Pass additional data to an active multipart AEAD operation. */
-psa_status_t mbedtls_psa_aead_update_ad( mbedtls_psa_aead_operation_t
-                                                                    *operation,
-                                         const uint8_t *input,
-                                         size_t input_length )
+psa_status_t mbedtls_psa_aead_update_ad(
+    mbedtls_psa_aead_operation_t *operation,
+    const uint8_t *input,
+    size_t input_length )
 {
     psa_status_t status = PSA_ERROR_CORRUPTION_DETECTED;
 
@@ -574,12 +572,13 @@
 
 /* Encrypt or decrypt a message fragment in an active multipart AEAD
  * operation.*/
-psa_status_t mbedtls_psa_aead_update( mbedtls_psa_aead_operation_t *operation,
-                                      const uint8_t *input,
-                                      size_t input_length,
-                                      uint8_t *output,
-                                      size_t output_size,
-                                      size_t *output_length )
+psa_status_t mbedtls_psa_aead_update(
+    mbedtls_psa_aead_operation_t *operation,
+    const uint8_t *input,
+    size_t input_length,
+    uint8_t *output,
+    size_t output_size,
+    size_t *output_length )
 {
     size_t update_output_length;
     psa_status_t status = PSA_ERROR_CORRUPTION_DETECTED;
@@ -719,10 +718,10 @@
 
 /* Common checks for both mbedtls_psa_aead_finish() and
    mbedtls_psa_aead_verify() */
-static psa_status_t mbedtls_psa_aead_finish_checks( mbedtls_psa_aead_operation_t
-                                                                    *operation,
-                                                    size_t output_size,
-                                                    size_t tag_size )
+static psa_status_t mbedtls_psa_aead_finish_checks(
+    mbedtls_psa_aead_operation_t *operation,
+    size_t output_size,
+    size_t tag_size )
 {
     size_t finish_output_size;
 
@@ -744,13 +743,14 @@
 }
 
 /* Finish encrypting a message in a multipart AEAD operation. */
-psa_status_t mbedtls_psa_aead_finish( mbedtls_psa_aead_operation_t *operation,
-                                      uint8_t *ciphertext,
-                                      size_t ciphertext_size,
-                                      size_t *ciphertext_length,
-                                      uint8_t *tag,
-                                      size_t tag_size,
-                                      size_t *tag_length )
+psa_status_t mbedtls_psa_aead_finish(
+    mbedtls_psa_aead_operation_t *operation,
+    uint8_t *ciphertext,
+    size_t ciphertext_size,
+    size_t *ciphertext_length,
+    uint8_t *tag,
+    size_t tag_size,
+    size_t *tag_length )
 {
     psa_status_t status = PSA_ERROR_CORRUPTION_DETECTED;
     size_t finish_output_size = 0;
@@ -808,12 +808,13 @@
 
 /* Finish authenticating and decrypting a message in a multipart AEAD
  * operation.*/
-psa_status_t mbedtls_psa_aead_verify( mbedtls_psa_aead_operation_t *operation,
-                                      uint8_t *plaintext,
-                                      size_t plaintext_size,
-                                      size_t *plaintext_length,
-                                      const uint8_t *tag,
-                                      size_t tag_length )
+psa_status_t mbedtls_psa_aead_verify(
+    mbedtls_psa_aead_operation_t *operation,
+    uint8_t *plaintext,
+    size_t plaintext_size,
+    size_t *plaintext_length,
+    const uint8_t *tag,
+    size_t tag_length )
 {
     psa_status_t status = PSA_ERROR_CORRUPTION_DETECTED;
     int ret = MBEDTLS_ERR_ERROR_CORRUPTION_DETECTED;
@@ -911,7 +912,8 @@
 }
 
 /* Abort an AEAD operation */
-psa_status_t mbedtls_psa_aead_abort( mbedtls_psa_aead_operation_t *operation )
+psa_status_t mbedtls_psa_aead_abort(
+   mbedtls_psa_aead_operation_t *operation )
 {
     switch( operation->alg )
     {
diff --git a/library/psa_crypto_aead.h b/library/psa_crypto_aead.h
index cf62301..fcac5ca 100644
--- a/library/psa_crypto_aead.h
+++ b/library/psa_crypto_aead.h
@@ -185,13 +185,12 @@
  * \retval #PSA_ERROR_INSUFFICIENT_MEMORY
  *         Failed to allocate memory for key material
  */
-psa_status_t mbedtls_psa_aead_encrypt_setup(mbedtls_psa_aead_operation_t
-                                                                     *operation,
-                                            const psa_key_attributes_t
-                                                                    *attributes,
-                                            const uint8_t *key_buffer,
-                                            size_t key_buffer_size,
-                                            psa_algorithm_t alg);
+psa_status_t mbedtls_psa_aead_encrypt_setup(
+    mbedtls_psa_aead_operation_t *operation,
+    const psa_key_attributes_t *attributes,
+    const uint8_t *key_buffer,
+    size_t key_buffer_size,
+    psa_algorithm_t alg );
 
 /** Set the key for a multipart authenticated decryption operation.
  *
@@ -230,13 +229,12 @@
  * \retval #PSA_ERROR_INSUFFICIENT_MEMORY
  *         Failed to allocate memory for key material
  */
-psa_status_t mbedtls_psa_aead_decrypt_setup(mbedtls_psa_aead_operation_t
-                                                                     *operation,
-                                            const psa_key_attributes_t
-                                                                    *attributes,
-                                            const uint8_t *key_buffer,
-                                            size_t key_buffer_size,
-                                            psa_algorithm_t alg);
+psa_status_t mbedtls_psa_aead_decrypt_setup(
+    mbedtls_psa_aead_operation_t *operation,
+    const psa_key_attributes_t *attributes,
+    const uint8_t *key_buffer,
+    size_t key_buffer_size,
+    psa_algorithm_t alg );
 
 /** Set the nonce for an authenticated encryption or decryption operation.
  *
@@ -266,9 +264,10 @@
  *         Algorithm previously set is not supported in this configuration of
  *         the library.
  */
-psa_status_t mbedtls_psa_aead_set_nonce(mbedtls_psa_aead_operation_t *operation,
-                                        const uint8_t *nonce,
-                                        size_t nonce_length);
+psa_status_t mbedtls_psa_aead_set_nonce(
+    mbedtls_psa_aead_operation_t *operation,
+    const uint8_t *nonce,
+    size_t nonce_length );
 
 /** Declare the lengths of the message and additional data for AEAD.
  *
@@ -307,10 +306,10 @@
  *         Algorithm previously set is not supported in this configuration of
  *         the library.
  */
-psa_status_t mbedtls_psa_aead_set_lengths(mbedtls_psa_aead_operation_t
-                                                                     *operation,
-                                          size_t ad_length,
-                                          size_t plaintext_length);
+psa_status_t mbedtls_psa_aead_set_lengths(
+    mbedtls_psa_aead_operation_t *operation,
+    size_t ad_length,
+    size_t plaintext_length );
 
 /** Pass additional data to an active AEAD operation.
  *
@@ -361,9 +360,10 @@
  *         Algorithm previously set is not supported in this configuration of
  *         the library.
  */
-psa_status_t mbedtls_psa_aead_update_ad(mbedtls_psa_aead_operation_t *operation,
-                                        const uint8_t *input,
-                                        size_t input_length);
+psa_status_t mbedtls_psa_aead_update_ad(
+    mbedtls_psa_aead_operation_t *operation,
+    const uint8_t *input,
+    size_t input_length );
 
 /** Encrypt or decrypt a message fragment in an active AEAD operation.
  *
@@ -437,12 +437,13 @@
  *         (CCM only) Unable to allocate memory for the tag or the body
 
  */
-psa_status_t mbedtls_psa_aead_update(mbedtls_psa_aead_operation_t *operation,
-                                     const uint8_t *input,
-                                     size_t input_length,
-                                     uint8_t *output,
-                                     size_t output_size,
-                                     size_t *output_length);
+psa_status_t mbedtls_psa_aead_update(
+    mbedtls_psa_aead_operation_t *operation,
+    const uint8_t *input,
+    size_t input_length,
+    uint8_t *output,
+    size_t output_size,
+    size_t *output_length );
 
 /** Finish encrypting a message in an AEAD operation.
  *
@@ -521,13 +522,14 @@
  *         less than the plaintext length that was previously
  *         specified with mbedtls_psa_aead_set_lengths().
  */
-psa_status_t mbedtls_psa_aead_finish(mbedtls_psa_aead_operation_t *operation,
-                                     uint8_t *ciphertext,
-                                     size_t ciphertext_size,
-                                     size_t *ciphertext_length,
-                                     uint8_t *tag,
-                                     size_t tag_size,
-                                     size_t *tag_length);
+psa_status_t mbedtls_psa_aead_finish(
+    mbedtls_psa_aead_operation_t *operation,
+    uint8_t *ciphertext,
+    size_t ciphertext_size,
+    size_t *ciphertext_length,
+    uint8_t *tag,
+    size_t tag_size,
+    size_t *tag_length );
 
 /** Finish authenticating and decrypting a message in an AEAD operation.
  *
@@ -605,12 +607,13 @@
  * \retval #PSA_ERROR_INSUFFICIENT_MEMORY
  *         (CCM only) Failed to allocate temporary buffer
  */
-psa_status_t mbedtls_psa_aead_verify(mbedtls_psa_aead_operation_t *operation,
-                                     uint8_t *plaintext,
-                                     size_t plaintext_size,
-                                     size_t *plaintext_length,
-                                     const uint8_t *tag,
-                                     size_t tag_length);
+psa_status_t mbedtls_psa_aead_verify(
+    mbedtls_psa_aead_operation_t *operation,
+    uint8_t *plaintext,
+    size_t plaintext_size,
+    size_t *plaintext_length,
+    const uint8_t *tag,
+    size_t tag_length );
 
 /** Abort an AEAD operation.
  *
@@ -636,7 +639,7 @@
  * \retval #PSA_SUCCESS
  *         Success.
  */
-psa_status_t mbedtls_psa_aead_abort(mbedtls_psa_aead_operation_t *operation);
-
+psa_status_t mbedtls_psa_aead_abort(
+    mbedtls_psa_aead_operation_t *operation );
 
 #endif /* PSA_CRYPTO_AEAD */