diff --git a/library/x509write_crt.c b/library/x509write_crt.c
index 0d252636b9..6d1e7b34df 100644
--- a/library/x509write_crt.c
+++ b/library/x509write_crt.c
@@ -172,8 +172,7 @@ int mbedtls_x509write_crt_set_basic_constraints( mbedtls_x509write_cert *ctx,
 }
 
 #if defined(MBEDTLS_SHA1_C)
-static int mbedtls_x509write_crt_set_key_identifier( mbedtls_x509write_cert
-*ctx,
+static int mbedtls_x509write_crt_set_key_identifier( mbedtls_x509write_cert *ctx,
                                               int is_ca,
                                               unsigned char tag )
 {
@@ -230,15 +229,15 @@ static int mbedtls_x509write_crt_set_key_identifier( mbedtls_x509write_cert
     }
 
     if( is_ca )
-        return mbedtls_x509write_crt_set_extension( ctx,
+        return( mbedtls_x509write_crt_set_extension( ctx,
                 MBEDTLS_OID_AUTHORITY_KEY_IDENTIFIER,
                 MBEDTLS_OID_SIZE( MBEDTLS_OID_AUTHORITY_KEY_IDENTIFIER ),
-                0, buf + sizeof(buf) - len, len );
-
-    return mbedtls_x509write_crt_set_extension( ctx,
-            MBEDTLS_OID_SUBJECT_KEY_IDENTIFIER,
-            MBEDTLS_OID_SIZE( MBEDTLS_OID_SUBJECT_KEY_IDENTIFIER ),
-            0, buf + sizeof(buf) - len, len );
+                0, buf + sizeof(buf) - len, len ) );
+    else
+        return( mbedtls_x509write_crt_set_extension( ctx,
+                MBEDTLS_OID_SUBJECT_KEY_IDENTIFIER,
+                MBEDTLS_OID_SIZE( MBEDTLS_OID_SUBJECT_KEY_IDENTIFIER ),
+                0, buf + sizeof(buf) - len, len ) );
 }
 
 int mbedtls_x509write_crt_set_subject_key_identifier( mbedtls_x509write_cert *ctx )
diff --git a/library/x509write_csr.c b/library/x509write_csr.c
index 591fb6d04d..1cee318f9a 100644
--- a/library/x509write_csr.c
+++ b/library/x509write_csr.c
@@ -225,7 +225,7 @@ static int x509write_csr_der_internal( mbedtls_x509write_csr *ctx,
                           sizeof( hash ),
                           &hash_len ) != PSA_SUCCESS )
     {
-        return ( MBEDTLS_ERR_PLATFORM_HW_ACCEL_FAILED );
+        return( MBEDTLS_ERR_PLATFORM_HW_ACCEL_FAILED );
     }
 #else /* MBEDTLS_USE_PSA_CRYPTO */
     ret = mbedtls_md( mbedtls_md_info_from_type( ctx->md_alg ), c, len, hash );