diff --git a/library/pkcs11.c b/library/pkcs11.c
index 409313e..64e7ce3 100644
--- a/library/pkcs11.c
+++ b/library/pkcs11.c
@@ -75,7 +75,7 @@
         goto cleanup;
     }
 
-    if( 0 != x509_crt_parse(cert, cert_blob, cert_blob_size ) )
+    if( 0 != x509_crt_parse( cert, cert_blob, cert_blob_size ) )
     {
         ret = 6;
         goto cleanup;
@@ -105,7 +105,7 @@
     if( 0 != pkcs11_x509_cert_init( &cert, pkcs11_cert ) )
         goto cleanup;
 
-    priv_key->len = pk_get_len(&cert.pk);
+    priv_key->len = pk_get_len( &cert.pk );
     priv_key->pkcs11h_cert = pkcs11_cert;
 
     ret = 0;
@@ -191,13 +191,13 @@
     }
 
     sig_len = ctx->len;
-    if ( hashlen > sig_len || asn_len > sig_len ||
-         hashlen + asn_len > sig_len )
+    if( hashlen > sig_len || asn_len > sig_len ||
+        hashlen + asn_len > sig_len )
     {
         return( POLARSSL_ERR_RSA_BAD_INPUT_DATA );
     }
 
-    if( md_alg != POLARSSL_MD_NONE)
+    if( md_alg != POLARSSL_MD_NONE )
     {
         /*
          * DigestInfo ::= SEQUENCE {
