3 files changed, 6 insertions, 9 deletions

diff --git a/crypto/authenc.c b/crypto/authenc.c
index 126a529b496d..bc4e608ca841 100644
--- a/crypto/authenc.c
+++ b/crypto/authenc.c
@@ -292,7 +292,7 @@ static struct crypto_instance *crypto_authenc_alloc(struct rtattr **tb)
                 goto out_put_auth;
 
         enc = crypto_attr_alg(tb[3], CRYPTO_ALG_TYPE_BLKCIPHER,
-                              CRYPTO_ALG_TYPE_MASK);
+                              CRYPTO_ALG_TYPE_BLKCIPHER_MASK);
         inst = ERR_PTR(PTR_ERR(enc));
         if (IS_ERR(enc))
                 goto out_put_auth;
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);
diff --git a/crypto/cryptd.c b/crypto/cryptd.c
index 8bf2da835f7b..1a5c45b96852 100644
--- a/crypto/cryptd.c
+++ b/crypto/cryptd.c
@@ -228,7 +228,7 @@ static struct crypto_instance *cryptd_alloc_blkcipher(
         struct crypto_alg *alg;
 
         alg = crypto_get_attr_alg(tb, CRYPTO_ALG_TYPE_BLKCIPHER,
-                                  CRYPTO_ALG_TYPE_MASK | CRYPTO_ALG_ASYNC);
+                                  CRYPTO_ALG_TYPE_MASK);
         if (IS_ERR(alg))
                 return ERR_PTR(PTR_ERR(alg));
 
@@ -236,7 +236,7 @@ static struct crypto_instance *cryptd_alloc_blkcipher(
         if (IS_ERR(inst))
                 goto out_put_alg;
 
-        inst->alg.cra_flags = CRYPTO_ALG_TYPE_BLKCIPHER | CRYPTO_ALG_ASYNC;
+        inst->alg.cra_flags = CRYPTO_ALG_TYPE_ABLKCIPHER | CRYPTO_ALG_ASYNC;
         inst->alg.cra_type = &crypto_ablkcipher_type;
 
         inst->alg.cra_ablkcipher.ivsize = alg->cra_blkcipher.ivsize;