diff --git a/include/polarssl/cipher_wrap.h b/include/polarssl/cipher_wrap.h
index ffa8c53bd..92dfe4583 100644
--- a/include/polarssl/cipher_wrap.h
+++ b/include/polarssl/cipher_wrap.h
@@ -31,7 +31,7 @@
 #else
 #include POLARSSL_CONFIG_FILE
 #endif
- 
+
 #include "cipher.h"
 
 #ifdef __cplusplus
diff --git a/include/polarssl/md_wrap.h b/include/polarssl/md_wrap.h
index 2cb6e5116..92c3a2ccc 100644
--- a/include/polarssl/md_wrap.h
+++ b/include/polarssl/md_wrap.h
@@ -31,7 +31,7 @@
 #else
 #include POLARSSL_CONFIG_FILE
 #endif
- 
+
 #include "md.h"
 
 #ifdef __cplusplus
diff --git a/programs/aes/crypt_and_hash.c b/programs/aes/crypt_and_hash.c
index dfba7eb16..c76b8dbd3 100644
--- a/programs/aes/crypt_and_hash.c
+++ b/programs/aes/crypt_and_hash.c
@@ -400,7 +400,7 @@ int main( int argc, char *argv[] )
             goto exit;
         }
 
-        if( ( ( filesize - md_get_size( md_info ) ) % 
+        if( ( ( filesize - md_get_size( md_info ) ) %
                 cipher_get_block_size( &cipher_ctx ) ) != 0 )
         {
             polarssl_fprintf( stderr, "File content not a multiple of the block size (%d).\n",
diff --git a/programs/pkey/dh_server.c b/programs/pkey/dh_server.c
index e824902b3..c625d0273 100644
--- a/programs/pkey/dh_server.c
+++ b/programs/pkey/dh_server.c
@@ -134,7 +134,7 @@ int main( void )
     }
 
     rsa.len = ( mpi_msb( &rsa.N ) + 7 ) >> 3;
-    
+
     fclose( f );
 
     /*
diff --git a/programs/pkey/key_app.c b/programs/pkey/key_app.c
index 2ebeb41b4..98f36db1b 100644
--- a/programs/pkey/key_app.c
+++ b/programs/pkey/key_app.c
@@ -51,7 +51,7 @@
 #define DFL_PASSWORD            ""
 #define DFL_PASSWORD_FILE       ""
 #define DFL_DEBUG_LEVEL         0
-    
+
 #define USAGE \
     "\n usage: key_app param=<>...\n"                   \
     "\n acceptable parameters:\n"                       \
diff --git a/programs/pkey/key_app_writer.c b/programs/pkey/key_app_writer.c
index ddd5e19ff..09233ffee 100644
--- a/programs/pkey/key_app_writer.c
+++ b/programs/pkey/key_app_writer.c
@@ -84,7 +84,7 @@
     "    output_mode=private|public default: none\n"    \
     USAGE_OUT                                           \
     "\n"
- 
+
 #if !defined(POLARSSL_PK_WRITE_C) || !defined(POLARSSL_FS_IO)
 int main( void )
 {
diff --git a/programs/pkey/rsa_encrypt.c b/programs/pkey/rsa_encrypt.c
index bbf7678c3..e73ad2ff0 100644
--- a/programs/pkey/rsa_encrypt.c
+++ b/programs/pkey/rsa_encrypt.c
@@ -105,7 +105,7 @@ int main( int argc, char *argv[] )
     }
 
     rsa_init( &rsa, RSA_PKCS_V15, 0 );
-    
+
     if( ( ret = mpi_read_file( &rsa.N, 16, f ) ) != 0 ||
         ( ret = mpi_read_file( &rsa.E, 16, f ) ) != 0 )
     {
diff --git a/programs/pkey/rsa_genkey.c b/programs/pkey/rsa_genkey.c
index f1be5367e..0314d39ee 100644
--- a/programs/pkey/rsa_genkey.c
+++ b/programs/pkey/rsa_genkey.c
@@ -41,7 +41,7 @@
 #include "polarssl/bignum.h"
 #include "polarssl/x509.h"
 #include "polarssl/rsa.h"
-    
+
 #include <stdio.h>
 #include <string.h>
 #endif
@@ -86,7 +86,7 @@ int main( void )
     fflush( stdout );
 
     rsa_init( &rsa, RSA_PKCS_V15, 0 );
-    
+
     if( ( ret = rsa_gen_key( &rsa, ctr_drbg_random, &ctr_drbg, KEY_SIZE,
                              EXPONENT ) ) != 0 )
     {
diff --git a/programs/pkey/rsa_sign.c b/programs/pkey/rsa_sign.c
index f033eab4c..277034d2f 100644
--- a/programs/pkey/rsa_sign.c
+++ b/programs/pkey/rsa_sign.c
@@ -86,7 +86,7 @@ int main( int argc, char *argv[] )
     }
 
     rsa_init( &rsa, RSA_PKCS_V15, 0 );
-    
+
     if( ( ret = mpi_read_file( &rsa.N , 16, f ) ) != 0 ||
         ( ret = mpi_read_file( &rsa.E , 16, f ) ) != 0 ||
         ( ret = mpi_read_file( &rsa.D , 16, f ) ) != 0 ||
diff --git a/programs/ssl/ssl_mail_client.c b/programs/ssl/ssl_mail_client.c
index 226baf578..d39e6c501 100644
--- a/programs/ssl/ssl_mail_client.c
+++ b/programs/ssl/ssl_mail_client.c
@@ -95,7 +95,7 @@
 #define USAGE_AUTH \
     "    authentication=%%d   default: 0 (disabled)\n"      \
     "    user_name=%%s        default: \"user\"\n"          \
-    "    user_pwd=%%s         default: \"password\"\n"      
+    "    user_pwd=%%s         default: \"password\"\n"
 #else
 #define USAGE_AUTH \
     "    authentication options disabled. (Require POLARSSL_BASE64_C)\n"
@@ -349,7 +349,7 @@ static int write_and_get_response( int sock_fd, unsigned char *buf, size_t len )
                 code[3] = '\0';
                 return atoi( code );
             }
-            
+
             idx = 0;
         }
     }
diff --git a/programs/test/benchmark.c b/programs/test/benchmark.c
index 6d8d8e51e..2882ecfc7 100644
--- a/programs/test/benchmark.c
+++ b/programs/test/benchmark.c
@@ -70,7 +70,7 @@
 #define BUFSIZE         1024
 #define HEADER_FORMAT   "  %-24s :  "
 #define TITLE_LEN       25
- 
+
 #define DHM_SIZES 3
 
 #define OPTIONS                                                         \
diff --git a/programs/test/ssl_test.c b/programs/test/ssl_test.c
index 1aa7ee17e..5860683fe 100644
--- a/programs/test/ssl_test.c
+++ b/programs/test/ssl_test.c
@@ -457,7 +457,7 @@ exit:
     "    session_reuse=on/off        default: on (enabled)\n"    \
     "    session_lifetime=%%d (s)     default: 86400\n"          \
     "    force_ciphersuite=<name>    default: all enabled\n"     \
-    " acceptable ciphersuite names:\n" 
+    " acceptable ciphersuite names:\n"
 
 int main( int argc, char *argv[] )
 {
diff --git a/programs/x509/cert_write.c b/programs/x509/cert_write.c
index cbcd3594b..45e2456dc 100644
--- a/programs/x509/cert_write.c
+++ b/programs/x509/cert_write.c
@@ -119,7 +119,7 @@
     "                          email_ca\n"              \
     "                          object_signing_ca\n"     \
     "\n"
-    
+
 #if !defined(POLARSSL_X509_CRT_WRITE_C) ||                                  \
     !defined(POLARSSL_X509_CRT_PARSE_C) || !defined(POLARSSL_FS_IO) ||      \
     !defined(POLARSSL_ENTROPY_C) || !defined(POLARSSL_CTR_DRBG_C) ||        \