]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
crypto: remove a duplicate checks in __cbc_decrypt()
authorDan Carpenter <dan.carpenter@oracle.com>
Thu, 13 Feb 2014 14:58:32 +0000 (17:58 +0300)
committerHerbert Xu <herbert@gondor.apana.org.au>
Wed, 26 Feb 2014 21:56:54 +0000 (05:56 +0800)
We checked "nbytes < bsize" before so it can't happen here.

Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Acked-by: Jussi Kivilinna <jussi.kivilinna@iki.fi>
Acked-by: Johannes Götzfried <johannes.goetzfried@cs.fau.de>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
arch/x86/crypto/blowfish_glue.c
arch/x86/crypto/cast5_avx_glue.c

index 50ec333b70e62437e38d409444213eb94f54614e..8af519ed73d122e316a0a6f1f5a410b7fe432d09 100644 (file)
@@ -223,9 +223,6 @@ static unsigned int __cbc_decrypt(struct blkcipher_desc *desc,
                        src -= 1;
                        dst -= 1;
                } while (nbytes >= bsize * 4);
-
-               if (nbytes < bsize)
-                       goto done;
        }
 
        /* Handle leftovers */
index e6a3700489b94119c514177f4a2a0b52e5423c13..e57e20ab5e0bc49ffa098ec9e86ab396ee2b71ea 100644 (file)
@@ -203,9 +203,6 @@ static unsigned int __cbc_decrypt(struct blkcipher_desc *desc,
                        src -= 1;
                        dst -= 1;
                } while (nbytes >= bsize * CAST5_PARALLEL_BLOCKS);
-
-               if (nbytes < bsize)
-                       goto done;
        }
 
        /* Handle leftovers */