Merge tag 'kgdb-5.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/danielt...

[linux-2.6-microblaze.git] / crypto / cipher.c

diff --git a/crypto/cipher.c b/crypto/cipher.c
index aadd51c..fd78150 100644 (file)
--- a/crypto/cipher.c
+++ b/crypto/cipher.c
@@ -45,11 +45,8 @@ int crypto_cipher_setkey(struct crypto_cipher *tfm,
        struct cipher_alg *cia = crypto_cipher_alg(tfm);
        unsigned long alignmask = crypto_cipher_alignmask(tfm);
 
-       crypto_cipher_clear_flags(tfm, CRYPTO_TFM_RES_MASK);
-       if (keylen < cia->cia_min_keysize || keylen > cia->cia_max_keysize) {
-               crypto_cipher_set_flags(tfm, CRYPTO_TFM_RES_BAD_KEY_LEN);
+       if (keylen < cia->cia_min_keysize || keylen > cia->cia_max_keysize)
                return -EINVAL;
-       }
 
        if ((unsigned long)key & alignmask)
                return setkey_unaligned(tfm, key, keylen);