Merge branch 'hpfs' (patches from Mikulas)

[linux-beck.git] / crypto / cryptd.c

diff --git a/crypto/cryptd.c b/crypto/cryptd.c
index 360ee85543fdb3ea28fd5e8380c63bcdb7350418..c81861b1350b60a1c2def7695dd16d7b0db39ade 100644 (file)
--- a/crypto/cryptd.c
+++ b/crypto/cryptd.c
@@ -177,8 +177,8 @@ static inline void cryptd_check_internal(struct rtattr **tb, u32 *type,
        if (IS_ERR(algt))
                return;
 
-       *type |= algt->type & (CRYPTO_ALG_INTERNAL | CRYPTO_ALG_AEAD_NEW);
-       *mask |= algt->mask & (CRYPTO_ALG_INTERNAL | CRYPTO_ALG_AEAD_NEW);
+       *type |= algt->type & CRYPTO_ALG_INTERNAL;
+       *mask |= algt->mask & CRYPTO_ALG_INTERNAL;
 }
 
 static int cryptd_blkcipher_setkey(struct crypto_ablkcipher *parent,
@@ -709,7 +709,7 @@ static void cryptd_aead_encrypt(struct crypto_async_request *areq, int err)
        struct aead_request *req;
 
        req = container_of(areq, struct aead_request, base);
-       cryptd_aead_crypt(req, child, err, crypto_aead_crt(child)->encrypt);
+       cryptd_aead_crypt(req, child, err, crypto_aead_alg(child)->encrypt);
 }
 
 static void cryptd_aead_decrypt(struct crypto_async_request *areq, int err)
@@ -719,7 +719,7 @@ static void cryptd_aead_decrypt(struct crypto_async_request *areq, int err)
        struct aead_request *req;
 
        req = container_of(areq, struct aead_request, base);
-       cryptd_aead_crypt(req, child, err, crypto_aead_crt(child)->decrypt);
+       cryptd_aead_crypt(req, child, err, crypto_aead_alg(child)->decrypt);
 }
 
 static int cryptd_aead_enqueue(struct aead_request *req,
@@ -805,9 +805,7 @@ static int cryptd_create_aead(struct crypto_template *tmpl,
                goto out_drop_aead;
 
        inst->alg.base.cra_flags = CRYPTO_ALG_ASYNC |
-                                  (alg->base.cra_flags &
-                                   (CRYPTO_ALG_INTERNAL |
-                                    CRYPTO_ALG_AEAD_NEW));
+                                  (alg->base.cra_flags & CRYPTO_ALG_INTERNAL);
        inst->alg.base.cra_ctxsize = sizeof(struct cryptd_aead_ctx);
 
        inst->alg.ivsize = crypto_aead_alg_ivsize(alg);