commit 010efeb5a24b9e548b6baf8f81d838f2adec0a5b
author Gilles Peskine <Gilles.Peskine@arm.com> Tue Jan 21 15:02:14 2020 +0100
committer Simon Butcher <simon.butcher@arm.com> Fri Mar 13 15:37:54 2020 +0000
tree 1ac08ad7ec25b6783ca4644b43ca2495dfa90d17
parent aa377cf11131f6a546c43e58726600de034e031b

Remove redundant block_size validity check

Check the value only once, as soon as we've obtained it.

library/cipher.c

diff --git a/library/cipher.c b/library/cipher.c
index 20af256..7164741 100644
--- a/library/cipher.c
+++ b/library/cipher.c
@@ -361,6 +361,10 @@
 
     *olen = 0;
     block_size = mbedtls_cipher_get_block_size( ctx );
+    if ( 0 == block_size )
+    {
+        return( MBEDTLS_ERR_CIPHER_INVALID_CONTEXT );
+    }
 
     if( ctx->cipher_info->mode == MBEDTLS_MODE_ECB )
     {
@@ -396,11 +400,6 @@
     }
 #endif
 
-    if ( 0 == block_size )
-    {
-        return( MBEDTLS_ERR_CIPHER_INVALID_CONTEXT );
-    }
-
     if( input == output &&
        ( ctx->unprocessed_len != 0 || ilen % block_size ) )
     {
@@ -459,11 +458,6 @@
          */
         if( 0 != ilen )
         {
-            if( 0 == block_size )
-            {
-                return( MBEDTLS_ERR_CIPHER_INVALID_CONTEXT );
-            }
-
             /* Encryption: only cache partial blocks
              * Decryption w/ padding: always keep at least one whole block
              * Decryption w/o padding: only cache partial blocks