1 files changed, 3 insertions, 6 deletions

diff --git a/crypto/blkcipher.c b/crypto/blkcipher.c
index f6c67f9d4e5c..180d91451476 100644
--- a/crypto/blkcipher.c
+++ b/crypto/blkcipher.c
@@ -433,9 +433,8 @@ static unsigned int crypto_blkcipher_ctxsize(struct crypto_alg *alg, u32 type,
         struct blkcipher_alg *cipher = &alg->cra_blkcipher;
         unsigned int len = alg->cra_ctxsize;
 
-        type ^= CRYPTO_ALG_ASYNC;
-        mask &= CRYPTO_ALG_ASYNC;
-        if ((type & mask) && cipher->ivsize) {
+        if ((mask & CRYPTO_ALG_TYPE_MASK) == CRYPTO_ALG_TYPE_MASK &&
+            cipher->ivsize) {
                 len = ALIGN(len, (unsigned long)alg->cra_alignmask + 1);
                 len += cipher->ivsize;
         }
@@ -482,9 +481,7 @@ static int crypto_init_blkcipher_ops(struct crypto_tfm *tfm, u32 type, u32 mask)
         if (alg->ivsize > PAGE_SIZE / 8)
                 return -EINVAL;
 
-        type ^= CRYPTO_ALG_ASYNC;
-        mask &= CRYPTO_ALG_ASYNC;
-        if (type & mask)
+        if ((mask & CRYPTO_ALG_TYPE_MASK) == CRYPTO_ALG_TYPE_MASK)
                 return crypto_init_blkcipher_ops_sync(tfm);
         else
                 return crypto_init_blkcipher_ops_async(tfm);