diff --git a/library/psa_crypto_client.c b/library/psa_crypto_client.c
index 7dc36a8..4f09f02 100644
--- a/library/psa_crypto_client.c
+++ b/library/psa_crypto_client.c
@@ -23,39 +23,37 @@
 
 #if defined(MBEDTLS_PSA_CRYPTO_CLIENT)
 
-#include <string.h>
-#include "mbedtls/platform.h"
-#if !defined(MBEDTLS_PLATFORM_C)
-#define mbedtls_calloc calloc
-#define mbedtls_free   free
-#endif
+#    include <string.h>
+#    include "mbedtls/platform.h"
+#    if !defined(MBEDTLS_PLATFORM_C)
+#        define mbedtls_calloc calloc
+#        define mbedtls_free   free
+#    endif
 
-void psa_reset_key_attributes( psa_key_attributes_t *attributes )
+void psa_reset_key_attributes(psa_key_attributes_t *attributes)
 {
-    mbedtls_free( attributes->domain_parameters );
-    memset( attributes, 0, sizeof( *attributes ) );
+    mbedtls_free(attributes->domain_parameters);
+    memset(attributes, 0, sizeof(*attributes));
 }
 
-psa_status_t psa_set_key_domain_parameters( psa_key_attributes_t *attributes,
-                                            psa_key_type_t type,
-                                            const uint8_t *data,
-                                            size_t data_length )
+psa_status_t psa_set_key_domain_parameters(psa_key_attributes_t *attributes,
+                                           psa_key_type_t type,
+                                           const uint8_t *data,
+                                           size_t data_length)
 {
     uint8_t *copy = NULL;
 
-    if( data_length != 0 )
-    {
-        copy = mbedtls_calloc( 1, data_length );
-        if( copy == NULL )
-            return PSA_ERROR_INSUFFICIENT_MEMORY ;
-        memcpy( copy, data, data_length );
+    if (data_length != 0) {
+        copy = mbedtls_calloc(1, data_length);
+        if (copy == NULL)
+            return PSA_ERROR_INSUFFICIENT_MEMORY;
+        memcpy(copy, data, data_length);
     }
     /* After this point, this function is guaranteed to succeed, so it
      * can start modifying `*attributes`. */
 
-    if( attributes->domain_parameters != NULL )
-    {
-        mbedtls_free( attributes->domain_parameters );
+    if (attributes->domain_parameters != NULL) {
+        mbedtls_free(attributes->domain_parameters);
         attributes->domain_parameters = NULL;
         attributes->domain_parameters_size = 0;
     }
@@ -63,20 +61,22 @@
     attributes->domain_parameters = copy;
     attributes->domain_parameters_size = data_length;
     attributes->core.type = type;
-    return PSA_SUCCESS ;
+    return PSA_SUCCESS;
 }
 
-psa_status_t psa_get_key_domain_parameters(
-    const psa_key_attributes_t *attributes,
-    uint8_t *data, size_t data_size, size_t *data_length )
+psa_status_t
+psa_get_key_domain_parameters(const psa_key_attributes_t *attributes,
+                              uint8_t *data,
+                              size_t data_size,
+                              size_t *data_length)
 {
-    if( attributes->domain_parameters_size > data_size )
-        return PSA_ERROR_BUFFER_TOO_SMALL ;
+    if (attributes->domain_parameters_size > data_size)
+        return PSA_ERROR_BUFFER_TOO_SMALL;
     *data_length = attributes->domain_parameters_size;
-    if( attributes->domain_parameters_size != 0 )
-        memcpy( data, attributes->domain_parameters,
-                attributes->domain_parameters_size );
-    return PSA_SUCCESS ;
+    if (attributes->domain_parameters_size != 0)
+        memcpy(data, attributes->domain_parameters,
+               attributes->domain_parameters_size);
+    return PSA_SUCCESS;
 }
 
 #endif /* MBEDTLS_PSA_CRYPTO_CLIENT */
