diff --git a/library/psa_crypto.c b/library/psa_crypto.c
index 4fe20b47e..fe73fb6f6 100644
--- a/library/psa_crypto.c
+++ b/library/psa_crypto.c
@@ -136,7 +136,8 @@ int psa_can_do_hash(psa_algorithm_t hash_alg)
 #if defined(MBEDTLS_PSA_BUILTIN_KEY_TYPE_DH_KEY_PAIR) ||       \
     defined(MBEDTLS_PSA_BUILTIN_KEY_TYPE_DH_PUBLIC_KEY) ||     \
     defined(PSA_WANT_KEY_TYPE_DH_KEY_PAIR)
-static int psa_is_dh_key_size_valid(size_t bits) {
+static int psa_is_dh_key_size_valid(size_t bits)
+{
     if (bits != 2048 && bits != 3072 && bits != 4096 &&
         bits != 6144 && bits != 8192) {
         return 0;
@@ -1430,48 +1431,48 @@ psa_status_t psa_export_public_key_internal(
     psa_key_type_t type = attributes->core.type;
 
     if (PSA_KEY_TYPE_IS_PUBLIC_KEY(type) &&
-            (PSA_KEY_TYPE_IS_RSA(type) || PSA_KEY_TYPE_IS_ECC(type) ||
-             PSA_KEY_TYPE_IS_DH(type))) {
+        (PSA_KEY_TYPE_IS_RSA(type) || PSA_KEY_TYPE_IS_ECC(type) ||
+         PSA_KEY_TYPE_IS_DH(type))) {
         /* Exporting public -> public */
         return psa_export_key_buffer_internal(
             key_buffer, key_buffer_size,
             data, data_size, data_length);
     } else if (PSA_KEY_TYPE_IS_RSA(type)) {
 #if defined(MBEDTLS_PSA_BUILTIN_KEY_TYPE_RSA_KEY_PAIR) || \
-            defined(MBEDTLS_PSA_BUILTIN_KEY_TYPE_RSA_PUBLIC_KEY)
-            return mbedtls_psa_rsa_export_public_key(attributes,
-                                                     key_buffer,
-                                                     key_buffer_size,
-                                                     data,
-                                                     data_size,
-                                                     data_length);
+        defined(MBEDTLS_PSA_BUILTIN_KEY_TYPE_RSA_PUBLIC_KEY)
+        return mbedtls_psa_rsa_export_public_key(attributes,
+                                                 key_buffer,
+                                                 key_buffer_size,
+                                                 data,
+                                                 data_size,
+                                                 data_length);
 #else
-            /* We don't know how to convert a private RSA key to public. */
-            return PSA_ERROR_NOT_SUPPORTED;
+        /* We don't know how to convert a private RSA key to public. */
+        return PSA_ERROR_NOT_SUPPORTED;
 #endif /* defined(MBEDTLS_PSA_BUILTIN_KEY_TYPE_RSA_KEY_PAIR) ||
         * defined(MBEDTLS_PSA_BUILTIN_KEY_TYPE_RSA_PUBLIC_KEY) */
     } else if (PSA_KEY_TYPE_IS_ECC(type)) {
 #if defined(MBEDTLS_PSA_BUILTIN_KEY_TYPE_ECC_KEY_PAIR) || \
-            defined(MBEDTLS_PSA_BUILTIN_KEY_TYPE_ECC_PUBLIC_KEY)
-            return mbedtls_psa_ecp_export_public_key(attributes,
-                                                     key_buffer,
-                                                     key_buffer_size,
-                                                     data,
-                                                     data_size,
-                                                     data_length);
+        defined(MBEDTLS_PSA_BUILTIN_KEY_TYPE_ECC_PUBLIC_KEY)
+        return mbedtls_psa_ecp_export_public_key(attributes,
+                                                 key_buffer,
+                                                 key_buffer_size,
+                                                 data,
+                                                 data_size,
+                                                 data_length);
 #else
-            /* We don't know how to convert a private ECC key to public */
-            return PSA_ERROR_NOT_SUPPORTED;
+        /* We don't know how to convert a private ECC key to public */
+        return PSA_ERROR_NOT_SUPPORTED;
 #endif /* defined(MBEDTLS_PSA_BUILTIN_KEY_TYPE_ECC_KEY_PAIR) ||
         * defined(MBEDTLS_PSA_BUILTIN_KEY_TYPE_ECC_PUBLIC_KEY) */
     } else if (PSA_KEY_TYPE_IS_DH(type)) {
 #if defined(MBEDTLS_PSA_BUILTIN_KEY_TYPE_DH_KEY_PAIR) || \
         defined(MBEDTLS_PSA_BUILTIN_KEY_TYPE_DH_PUBLIC_KEY)
-            return mbedtls_psa_export_ffdh_public_key(attributes,
-                                                      key_buffer,
-                                                      key_buffer_size,
-                                                      data, data_size,
-                                                      data_length);
+        return mbedtls_psa_export_ffdh_public_key(attributes,
+                                                  key_buffer,
+                                                  key_buffer_size,
+                                                  data, data_size,
+                                                  data_length);
 #else
         return PSA_ERROR_NOT_SUPPORTED;
 #endif /* defined(MBEDTLS_PSA_BUILTIN_KEY_TYPE_DH_KEY_PAIR) ||
diff --git a/library/psa_crypto_ffdh.c b/library/psa_crypto_ffdh.c
index b0591b836..cf5e36db6 100644
--- a/library/psa_crypto_ffdh.c
+++ b/library/psa_crypto_ffdh.c
@@ -64,7 +64,7 @@ static psa_status_t mbedtls_psa_ffdh_set_prime_generator(size_t key_size,
     static const unsigned char dhm_G_8192[] =
         MBEDTLS_DHM_RFC7919_FFDHE8192_G_BIN;
 
-    switch(key_size) {
+    switch (key_size) {
         case sizeof(dhm_P_2048):
             dhm_P = dhm_P_2048;
             dhm_G = dhm_G_2048;
@@ -148,7 +148,7 @@ psa_status_t mbedtls_psa_key_agreement_ffdh(
     status = mbedtls_psa_ffdh_set_prime_generator(
         PSA_BITS_TO_BYTES(attributes->core.bits), &P, &G);
 
-    if(status != PSA_SUCCESS) {
+    if (status != PSA_SUCCESS) {
         goto cleanup;
     }
 
@@ -162,7 +162,7 @@ psa_status_t mbedtls_psa_key_agreement_ffdh(
     MBEDTLS_MPI_CHK(mbedtls_mpi_exp_mod(&K, &GY, &X, &P, NULL));
 
     MBEDTLS_MPI_CHK(mbedtls_mpi_write_binary(&K, shared_secret,
-                                                calculated_shared_secret_size));
+                                             calculated_shared_secret_size));
 
     *shared_secret_length = calculated_shared_secret_size;
 
@@ -173,7 +173,7 @@ cleanup:
     mbedtls_mpi_free(&X); mbedtls_mpi_free(&GY);
     mbedtls_mpi_free(&K);
 
-    if(status == PSA_SUCCESS && ret != 0) {
+    if (status == PSA_SUCCESS && ret != 0) {
         status = mbedtls_to_psa_error(ret);
     }
 
@@ -199,7 +199,7 @@ psa_status_t mbedtls_psa_export_ffdh_public_key(
     status = mbedtls_psa_ffdh_set_prime_generator(
         PSA_BITS_TO_BYTES(attributes->core.bits), &P, &G);
 
-    if(status != PSA_SUCCESS) {
+    if (status != PSA_SUCCESS) {
         goto cleanup;
     }
 
@@ -243,7 +243,7 @@ psa_status_t mbedtls_psa_ffdh_generate_key(
         secret exponent from the range [2, P-2].
         Select random value in range [3, P-1] and decrease it by 1. */
     MBEDTLS_MPI_CHK(mbedtls_mpi_random(&X, 3, &P, mbedtls_psa_get_random,
-                                        MBEDTLS_PSA_RANDOM_STATE));
+                                       MBEDTLS_PSA_RANDOM_STATE));
     MBEDTLS_MPI_CHK(mbedtls_mpi_sub_int(&X, &X, 1));
     MBEDTLS_MPI_CHK(mbedtls_mpi_write_binary(&X, key_buffer, key_buffer_size));
     *key_buffer_length = key_buffer_size;