diff --git a/library/pkcs7.c b/library/pkcs7.c
index 5810506c3..dda15725a 100644
--- a/library/pkcs7.c
+++ b/library/pkcs7.c
@@ -705,8 +705,8 @@ static int mbedtls_pkcs7_data_or_hash_verify(mbedtls_pkcs7 *pkcs7,
      */
     for (signer = &pkcs7->signed_data.signers; signer; signer = signer->next) {
         ret = mbedtls_pk_verify_restartable(&pk_cxt, md_alg, hash,
-                                mbedtls_md_get_size(md_info),
-                                signer->sig.p, signer->sig.len, NULL);
+                                            mbedtls_md_get_size(md_info),
+                                            signer->sig.p, signer->sig.len, NULL);
 
         if (ret == 0) {
             break;
diff --git a/library/ssl_tls12_server.c b/library/ssl_tls12_server.c
index cdbf917f2..a8bd02e53 100644
--- a/library/ssl_tls12_server.c
+++ b/library/ssl_tls12_server.c
@@ -2881,10 +2881,10 @@ curve_matching_done:
          * ssl_write_server_key_exchange also takes care of incrementing
          * ssl->out_msglen. */
         if ((ret = mbedtls_pk_sign_restartable(mbedtls_ssl_own_key(ssl),
-                                   md_alg, hash, hashlen,
-                                   ssl->out_msg + ssl->out_msglen + 2,
-                                   out_buf_len - ssl->out_msglen - 2,
-                                   signature_len, NULL)) != 0) {
+                                               md_alg, hash, hashlen,
+                                               ssl->out_msg + ssl->out_msglen + 2,
+                                               out_buf_len - ssl->out_msglen - 2,
+                                               signature_len, NULL)) != 0) {
             MBEDTLS_SSL_DEBUG_RET(1, "mbedtls_pk_sign", ret);
             return ret;
         }
@@ -3457,8 +3457,8 @@ static int ssl_parse_certificate_verify(mbedtls_ssl_context *ssl)
     }
 
     if ((ret = mbedtls_pk_verify_restartable(peer_pk,
-                                 md_alg, hash_start, hashlen,
-                                 ssl->in_msg + i, sig_len, NULL)) != 0) {
+                                             md_alg, hash_start, hashlen,
+                                             ssl->in_msg + i, sig_len, NULL)) != 0) {
         MBEDTLS_SSL_DEBUG_RET(1, "mbedtls_pk_verify", ret);
         return ret;
     }
diff --git a/library/x509write_crt.c b/library/x509write_crt.c
index e34a4636b..d06e5f523 100644
--- a/library/x509write_crt.c
+++ b/library/x509write_crt.c
@@ -572,7 +572,8 @@ int mbedtls_x509write_crt_der(mbedtls_x509write_cert *ctx,
 
 
     if ((ret = mbedtls_pk_sign_restartable(ctx->issuer_key, ctx->md_alg,
-                               hash, hash_length, sig, sizeof(sig), &sig_len, NULL)) != 0) {
+                                           hash, hash_length, sig, sizeof(sig), &sig_len,
+                                           NULL)) != 0) {
         return ret;
     }
 
diff --git a/library/x509write_csr.c b/library/x509write_csr.c
index a7d0cb513..c50482ddc 100644
--- a/library/x509write_csr.c
+++ b/library/x509write_csr.c
@@ -218,7 +218,7 @@ static int x509write_csr_der_internal(mbedtls_x509write_csr *ctx,
         return MBEDTLS_ERR_PLATFORM_HW_ACCEL_FAILED;
     }
     if ((ret = mbedtls_pk_sign_restartable(ctx->key, ctx->md_alg, hash, 0,
-                               sig, sig_size, &sig_len, NULL)) != 0) {
+                                           sig, sig_size, &sig_len, NULL)) != 0) {
         return ret;
     }
 
diff --git a/programs/ssl/ssl_server2.c b/programs/ssl/ssl_server2.c
index 3db13132d..de27d6eec 100644
--- a/programs/ssl/ssl_server2.c
+++ b/programs/ssl/ssl_server2.c
@@ -1244,9 +1244,9 @@ static int ssl_async_resume(mbedtls_ssl_context *ssl,
     switch (ctx->operation_type) {
         case ASYNC_OP_SIGN:
             ret = mbedtls_pk_sign_restartable(key_slot->pk,
-                                  ctx->md_alg,
-                                  ctx->input, ctx->input_len,
-                                  output, output_size, output_len, NULL);
+                                              ctx->md_alg,
+                                              ctx->input, ctx->input_len,
+                                              output, output_size, output_len, NULL);
             break;
         default:
             mbedtls_printf(