diff --git a/library/cipher.c b/library/cipher.c
index d2c8ab3..d0000b2 100644
--- a/library/cipher.c
+++ b/library/cipher.c
@@ -323,6 +323,11 @@
 
     ctx->cipher_info = cipher_info;
 
+    /*
+     * Ignore possible errors caused by a cipher mode that doesn't use padding
+     */
+    (void) cipher_set_padding_mode( ctx, POLARSSL_PADDING_PKCS7 );
+
     return 0;
 }
 
@@ -368,18 +373,6 @@
     return POLARSSL_ERR_CIPHER_BAD_INPUT_DATA;
 }
 
-int cipher_set_padding_mode( cipher_context_t *ctx, cipher_padding_t mode )
-{
-    if( NULL == ctx ||
-        POLARSSL_MODE_CBC != ctx->cipher_info->mode ||
-        POLARSSL_PADDING_PKCS7 != mode )
-    {
-        return POLARSSL_ERR_CIPHER_BAD_INPUT_DATA;
-    }
-
-    return 0;
-}
-
 int cipher_reset( cipher_context_t *ctx, const unsigned char *iv )
 {
     if( NULL == ctx || NULL == ctx->cipher_info || NULL == iv )
@@ -543,8 +536,8 @@
         output[data_len + i] = (unsigned char) padding_len;
 }
 
-static int get_pkcs_padding( unsigned char *input, unsigned int input_len,
-        size_t *data_len)
+static int get_pkcs_padding( unsigned char *input, size_t input_len,
+        size_t *data_len )
 {
     unsigned int i, padding_len = 0;
 
@@ -585,7 +578,7 @@
     {
         if( POLARSSL_ENCRYPT == ctx->operation )
         {
-            add_pkcs_padding( ctx->unprocessed_data, cipher_get_iv_size( ctx ),
+            ctx->add_padding( ctx->unprocessed_data, cipher_get_iv_size( ctx ),
                     ctx->unprocessed_len );
         }
         else if ( cipher_get_block_size( ctx ) != ctx->unprocessed_len )
@@ -604,7 +597,8 @@
 
         /* Set output size for decryption */
         if( POLARSSL_DECRYPT == ctx->operation )
-            return get_pkcs_padding( output, cipher_get_block_size( ctx ), olen );
+            return ctx->get_padding( output, cipher_get_block_size( ctx ),
+                                     olen );
 
         /* Set output size for encryption */
         *olen = cipher_get_block_size( ctx );
@@ -614,6 +608,24 @@
     return POLARSSL_ERR_CIPHER_FEATURE_UNAVAILABLE;
 }
 
+int cipher_set_padding_mode( cipher_context_t *ctx, cipher_padding_t mode )
+{
+    if( NULL == ctx ||
+        POLARSSL_MODE_CBC != ctx->cipher_info->mode )
+    {
+        return POLARSSL_ERR_CIPHER_BAD_INPUT_DATA;
+    }
+
+    if( POLARSSL_PADDING_PKCS7 == mode )
+    {
+        ctx->add_padding = add_pkcs_padding;
+        ctx->get_padding = get_pkcs_padding;
+        return 0;
+    }
+
+    return POLARSSL_ERR_CIPHER_BAD_INPUT_DATA;
+}
+
 #if defined(POLARSSL_SELF_TEST)
 
 #include <stdio.h>