Merge branch 'async' of macbook:git/btrfs-unstable
[linux-2.6.git] / crypto / authenc.c
index a61dea1..a5a22cf 100644 (file)
  *
  */
 
-#include <crypto/algapi.h>
+#include <crypto/aead.h>
+#include <crypto/internal/hash.h>
+#include <crypto/internal/skcipher.h>
 #include <crypto/authenc.h>
+#include <crypto/scatterwalk.h>
 #include <linux/err.h>
 #include <linux/init.h>
 #include <linux/kernel.h>
 #include <linux/slab.h>
 #include <linux/spinlock.h>
 
-#include "scatterwalk.h"
+typedef u8 *(*authenc_ahash_t)(struct aead_request *req, unsigned int flags);
 
 struct authenc_instance_ctx {
-       struct crypto_spawn auth;
-       struct crypto_spawn enc;
+       struct crypto_ahash_spawn auth;
+       struct crypto_skcipher_spawn enc;
 };
 
 struct crypto_authenc_ctx {
-       spinlock_t auth_lock;
-       struct crypto_hash *auth;
+       unsigned int reqoff;
+       struct crypto_ahash *auth;
        struct crypto_ablkcipher *enc;
 };
 
+struct authenc_request_ctx {
+       unsigned int cryptlen;
+       struct scatterlist *sg;
+       struct scatterlist asg[2];
+       struct scatterlist cipher[2];
+       crypto_completion_t complete;
+       crypto_completion_t update_complete;
+       char tail[];
+};
+
+static void authenc_request_complete(struct aead_request *req, int err)
+{
+       if (err != -EINPROGRESS)
+               aead_request_complete(req, err);
+}
+
 static int crypto_authenc_setkey(struct crypto_aead *authenc, const u8 *key,
                                 unsigned int keylen)
 {
        unsigned int authkeylen;
        unsigned int enckeylen;
        struct crypto_authenc_ctx *ctx = crypto_aead_ctx(authenc);
-       struct crypto_hash *auth = ctx->auth;
+       struct crypto_ahash *auth = ctx->auth;
        struct crypto_ablkcipher *enc = ctx->enc;
        struct rtattr *rta = (void *)key;
        struct crypto_authenc_key_param *param;
        int err = -EINVAL;
 
-       if (keylen < sizeof(*rta))
+       if (!RTA_OK(rta, keylen))
                goto badkey;
        if (rta->rta_type != CRYPTO_AUTHENC_KEYA_PARAM)
                goto badkey;
@@ -63,11 +82,11 @@ static int crypto_authenc_setkey(struct crypto_aead *authenc, const u8 *key,
 
        authkeylen = keylen - enckeylen;
 
-       crypto_hash_clear_flags(auth, CRYPTO_TFM_REQ_MASK);
-       crypto_hash_set_flags(auth, crypto_aead_get_flags(authenc) &
+       crypto_ahash_clear_flags(auth, CRYPTO_TFM_REQ_MASK);
+       crypto_ahash_set_flags(auth, crypto_aead_get_flags(authenc) &
                                    CRYPTO_TFM_REQ_MASK);
-       err = crypto_hash_setkey(auth, key, authkeylen);
-       crypto_aead_set_flags(authenc, crypto_hash_get_flags(auth) &
+       err = crypto_ahash_setkey(auth, key, authkeylen);
+       crypto_aead_set_flags(authenc, crypto_ahash_get_flags(auth) &
                                       CRYPTO_TFM_RES_MASK);
 
        if (err)
@@ -88,41 +107,267 @@ badkey:
        goto out;
 }
 
-static int crypto_authenc_hash(struct aead_request *req)
+static void authenc_chain(struct scatterlist *head, struct scatterlist *sg,
+                         int chain)
 {
+       if (chain) {
+               head->length += sg->length;
+               sg = scatterwalk_sg_next(sg);
+       }
+
+       if (sg)
+               scatterwalk_sg_chain(head, 2, sg);
+       else
+               sg_mark_end(head);
+}
+
+static void authenc_geniv_ahash_update_done(struct crypto_async_request *areq,
+                                           int err)
+{
+       struct aead_request *req = areq->data;
        struct crypto_aead *authenc = crypto_aead_reqtfm(req);
        struct crypto_authenc_ctx *ctx = crypto_aead_ctx(authenc);
-       struct crypto_hash *auth = ctx->auth;
-       struct hash_desc desc = {
-               .tfm = auth,
-       };
-       u8 *hash = aead_request_ctx(req);
-       struct scatterlist *dst = req->dst;
+       struct authenc_request_ctx *areq_ctx = aead_request_ctx(req);
+       struct ahash_request *ahreq = (void *)(areq_ctx->tail + ctx->reqoff);
+
+       if (err)
+               goto out;
+
+       ahash_request_set_crypt(ahreq, areq_ctx->sg, ahreq->result,
+                               areq_ctx->cryptlen);
+       ahash_request_set_callback(ahreq, aead_request_flags(req) &
+                                         CRYPTO_TFM_REQ_MAY_SLEEP,
+                                  areq_ctx->complete, req);
+
+       err = crypto_ahash_finup(ahreq);
+       if (err)
+               goto out;
+
+       scatterwalk_map_and_copy(ahreq->result, areq_ctx->sg,
+                                areq_ctx->cryptlen,
+                                crypto_aead_authsize(authenc), 1);
+
+out:
+       authenc_request_complete(req, err);
+}
+
+static void authenc_geniv_ahash_done(struct crypto_async_request *areq, int err)
+{
+       struct aead_request *req = areq->data;
+       struct crypto_aead *authenc = crypto_aead_reqtfm(req);
+       struct crypto_authenc_ctx *ctx = crypto_aead_ctx(authenc);
+       struct authenc_request_ctx *areq_ctx = aead_request_ctx(req);
+       struct ahash_request *ahreq = (void *)(areq_ctx->tail + ctx->reqoff);
+
+       if (err)
+               goto out;
+
+       scatterwalk_map_and_copy(ahreq->result, areq_ctx->sg,
+                                areq_ctx->cryptlen,
+                                crypto_aead_authsize(authenc), 1);
+
+out:
+       aead_request_complete(req, err);
+}
+
+static void authenc_verify_ahash_update_done(struct crypto_async_request *areq,
+                                            int err)
+{
+       u8 *ihash;
+       unsigned int authsize;
+       struct ablkcipher_request *abreq;
+       struct aead_request *req = areq->data;
+       struct crypto_aead *authenc = crypto_aead_reqtfm(req);
+       struct crypto_authenc_ctx *ctx = crypto_aead_ctx(authenc);
+       struct authenc_request_ctx *areq_ctx = aead_request_ctx(req);
+       struct ahash_request *ahreq = (void *)(areq_ctx->tail + ctx->reqoff);
        unsigned int cryptlen = req->cryptlen;
+
+       if (err)
+               goto out;
+
+       ahash_request_set_crypt(ahreq, areq_ctx->sg, ahreq->result,
+                               areq_ctx->cryptlen);
+       ahash_request_set_callback(ahreq, aead_request_flags(req) &
+                                         CRYPTO_TFM_REQ_MAY_SLEEP,
+                                  areq_ctx->complete, req);
+
+       err = crypto_ahash_finup(ahreq);
+       if (err)
+               goto out;
+
+       authsize = crypto_aead_authsize(authenc);
+       cryptlen -= authsize;
+       ihash = ahreq->result + authsize;
+       scatterwalk_map_and_copy(ihash, areq_ctx->sg, areq_ctx->cryptlen,
+                                authsize, 0);
+
+       err = memcmp(ihash, ahreq->result, authsize) ? -EBADMSG : 0;
+       if (err)
+               goto out;
+
+       abreq = aead_request_ctx(req);
+       ablkcipher_request_set_tfm(abreq, ctx->enc);
+       ablkcipher_request_set_callback(abreq, aead_request_flags(req),
+                                       req->base.complete, req->base.data);
+       ablkcipher_request_set_crypt(abreq, req->src, req->dst,
+                                    cryptlen, req->iv);
+
+       err = crypto_ablkcipher_decrypt(abreq);
+
+out:
+       authenc_request_complete(req, err);
+}
+
+static void authenc_verify_ahash_done(struct crypto_async_request *areq,
+                                     int err)
+{
+       u8 *ihash;
+       unsigned int authsize;
+       struct ablkcipher_request *abreq;
+       struct aead_request *req = areq->data;
+       struct crypto_aead *authenc = crypto_aead_reqtfm(req);
+       struct crypto_authenc_ctx *ctx = crypto_aead_ctx(authenc);
+       struct authenc_request_ctx *areq_ctx = aead_request_ctx(req);
+       struct ahash_request *ahreq = (void *)(areq_ctx->tail + ctx->reqoff);
+       unsigned int cryptlen = req->cryptlen;
+
+       if (err)
+               goto out;
+
+       authsize = crypto_aead_authsize(authenc);
+       cryptlen -= authsize;
+       ihash = ahreq->result + authsize;
+       scatterwalk_map_and_copy(ihash, areq_ctx->sg, areq_ctx->cryptlen,
+                                authsize, 0);
+
+       err = memcmp(ihash, ahreq->result, authsize) ? -EBADMSG : 0;
+       if (err)
+               goto out;
+
+       abreq = aead_request_ctx(req);
+       ablkcipher_request_set_tfm(abreq, ctx->enc);
+       ablkcipher_request_set_callback(abreq, aead_request_flags(req),
+                                       req->base.complete, req->base.data);
+       ablkcipher_request_set_crypt(abreq, req->src, req->dst,
+                                    cryptlen, req->iv);
+
+       err = crypto_ablkcipher_decrypt(abreq);
+
+out:
+       authenc_request_complete(req, err);
+}
+
+static u8 *crypto_authenc_ahash_fb(struct aead_request *req, unsigned int flags)
+{
+       struct crypto_aead *authenc = crypto_aead_reqtfm(req);
+       struct crypto_authenc_ctx *ctx = crypto_aead_ctx(authenc);
+       struct crypto_ahash *auth = ctx->auth;
+       struct authenc_request_ctx *areq_ctx = aead_request_ctx(req);
+       struct ahash_request *ahreq = (void *)(areq_ctx->tail + ctx->reqoff);
+       u8 *hash = areq_ctx->tail;
        int err;
 
-       hash = (u8 *)ALIGN((unsigned long)hash + crypto_hash_alignmask(auth), 
-                          crypto_hash_alignmask(auth) + 1);
+       hash = (u8 *)ALIGN((unsigned long)hash + crypto_ahash_alignmask(auth),
+                           crypto_ahash_alignmask(auth) + 1);
+
+       ahash_request_set_tfm(ahreq, auth);
 
-       spin_lock_bh(&ctx->auth_lock);
-       err = crypto_hash_init(&desc);
+       err = crypto_ahash_init(ahreq);
        if (err)
-               goto auth_unlock;
+               return ERR_PTR(err);
 
-       err = crypto_hash_update(&desc, req->assoc, req->assoclen);
+       ahash_request_set_crypt(ahreq, req->assoc, hash, req->assoclen);
+       ahash_request_set_callback(ahreq, aead_request_flags(req) & flags,
+                                  areq_ctx->update_complete, req);
+
+       err = crypto_ahash_update(ahreq);
        if (err)
-               goto auth_unlock;
+               return ERR_PTR(err);
+
+       ahash_request_set_crypt(ahreq, areq_ctx->sg, hash,
+                               areq_ctx->cryptlen);
+       ahash_request_set_callback(ahreq, aead_request_flags(req) & flags,
+                                  areq_ctx->complete, req);
 
-       err = crypto_hash_update(&desc, dst, cryptlen);
+       err = crypto_ahash_finup(ahreq);
        if (err)
-               goto auth_unlock;
+               return ERR_PTR(err);
 
-       err = crypto_hash_final(&desc, hash);
-auth_unlock:
-       spin_unlock_bh(&ctx->auth_lock);
+       return hash;
+}
 
+static u8 *crypto_authenc_ahash(struct aead_request *req, unsigned int flags)
+{
+       struct crypto_aead *authenc = crypto_aead_reqtfm(req);
+       struct crypto_authenc_ctx *ctx = crypto_aead_ctx(authenc);
+       struct crypto_ahash *auth = ctx->auth;
+       struct authenc_request_ctx *areq_ctx = aead_request_ctx(req);
+       struct ahash_request *ahreq = (void *)(areq_ctx->tail + ctx->reqoff);
+       u8 *hash = areq_ctx->tail;
+       int err;
+
+       hash = (u8 *)ALIGN((unsigned long)hash + crypto_ahash_alignmask(auth),
+                          crypto_ahash_alignmask(auth) + 1);
+
+       ahash_request_set_tfm(ahreq, auth);
+       ahash_request_set_crypt(ahreq, areq_ctx->sg, hash,
+                               areq_ctx->cryptlen);
+       ahash_request_set_callback(ahreq, aead_request_flags(req) & flags,
+                                  areq_ctx->complete, req);
+
+       err = crypto_ahash_digest(ahreq);
        if (err)
-               return err;
+               return ERR_PTR(err);
+
+       return hash;
+}
+
+static int crypto_authenc_genicv(struct aead_request *req, u8 *iv,
+                                unsigned int flags)
+{
+       struct crypto_aead *authenc = crypto_aead_reqtfm(req);
+       struct authenc_request_ctx *areq_ctx = aead_request_ctx(req);
+       struct scatterlist *dst = req->dst;
+       struct scatterlist *assoc = req->assoc;
+       struct scatterlist *cipher = areq_ctx->cipher;
+       struct scatterlist *asg = areq_ctx->asg;
+       unsigned int ivsize = crypto_aead_ivsize(authenc);
+       unsigned int cryptlen = req->cryptlen;
+       authenc_ahash_t authenc_ahash_fn = crypto_authenc_ahash_fb;
+       struct page *dstp;
+       u8 *vdst;
+       u8 *hash;
+
+       dstp = sg_page(dst);
+       vdst = PageHighMem(dstp) ? NULL : page_address(dstp) + dst->offset;
+
+       if (ivsize) {
+               sg_init_table(cipher, 2);
+               sg_set_buf(cipher, iv, ivsize);
+               authenc_chain(cipher, dst, vdst == iv + ivsize);
+               dst = cipher;
+               cryptlen += ivsize;
+       }
+
+       if (sg_is_last(assoc)) {
+               authenc_ahash_fn = crypto_authenc_ahash;
+               sg_init_table(asg, 2);
+               sg_set_page(asg, sg_page(assoc), assoc->length, assoc->offset);
+               authenc_chain(asg, dst, 0);
+               dst = asg;
+               cryptlen += req->assoclen;
+       }
+
+       areq_ctx->cryptlen = cryptlen;
+       areq_ctx->sg = dst;
+
+       areq_ctx->complete = authenc_geniv_ahash_done;
+       areq_ctx->update_complete = authenc_geniv_ahash_update_done;
+
+       hash = authenc_ahash_fn(req, flags);
+       if (IS_ERR(hash))
+               return PTR_ERR(hash);
 
        scatterwalk_map_and_copy(hash, dst, cryptlen,
                                 crypto_aead_authsize(authenc), 1);
@@ -132,81 +377,146 @@ auth_unlock:
 static void crypto_authenc_encrypt_done(struct crypto_async_request *req,
                                        int err)
 {
-       if (!err)
-               err = crypto_authenc_hash(req->data);
+       struct aead_request *areq = req->data;
 
-       aead_request_complete(req->data, err);
+       if (!err) {
+               struct crypto_aead *authenc = crypto_aead_reqtfm(areq);
+               struct crypto_authenc_ctx *ctx = crypto_aead_ctx(authenc);
+               struct ablkcipher_request *abreq = aead_request_ctx(areq);
+               u8 *iv = (u8 *)(abreq + 1) +
+                        crypto_ablkcipher_reqsize(ctx->enc);
+
+               err = crypto_authenc_genicv(areq, iv, 0);
+       }
+
+       authenc_request_complete(areq, err);
 }
 
 static int crypto_authenc_encrypt(struct aead_request *req)
 {
        struct crypto_aead *authenc = crypto_aead_reqtfm(req);
        struct crypto_authenc_ctx *ctx = crypto_aead_ctx(authenc);
-       struct ablkcipher_request *abreq = aead_request_ctx(req);
+       struct authenc_request_ctx *areq_ctx = aead_request_ctx(req);
+       struct crypto_ablkcipher *enc = ctx->enc;
+       struct scatterlist *dst = req->dst;
+       unsigned int cryptlen = req->cryptlen;
+       struct ablkcipher_request *abreq = (void *)(areq_ctx->tail
+                                                   + ctx->reqoff);
+       u8 *iv = (u8 *)abreq - crypto_ablkcipher_ivsize(enc);
        int err;
 
-       ablkcipher_request_set_tfm(abreq, ctx->enc);
+       ablkcipher_request_set_tfm(abreq, enc);
        ablkcipher_request_set_callback(abreq, aead_request_flags(req),
                                        crypto_authenc_encrypt_done, req);
-       ablkcipher_request_set_crypt(abreq, req->src, req->dst, req->cryptlen,
-                                    req->iv);
+       ablkcipher_request_set_crypt(abreq, req->src, dst, cryptlen, req->iv);
+
+       memcpy(iv, req->iv, crypto_aead_ivsize(authenc));
 
        err = crypto_ablkcipher_encrypt(abreq);
        if (err)
                return err;
 
-       return crypto_authenc_hash(req);
+       return crypto_authenc_genicv(req, iv, CRYPTO_TFM_REQ_MAY_SLEEP);
 }
 
-static int crypto_authenc_verify(struct aead_request *req)
+static void crypto_authenc_givencrypt_done(struct crypto_async_request *req,
+                                          int err)
 {
-       struct crypto_aead *authenc = crypto_aead_reqtfm(req);
+       struct aead_request *areq = req->data;
+
+       if (!err) {
+               struct skcipher_givcrypt_request *greq = aead_request_ctx(areq);
+
+               err = crypto_authenc_genicv(areq, greq->giv, 0);
+       }
+
+       authenc_request_complete(areq, err);
+}
+
+static int crypto_authenc_givencrypt(struct aead_givcrypt_request *req)
+{
+       struct crypto_aead *authenc = aead_givcrypt_reqtfm(req);
        struct crypto_authenc_ctx *ctx = crypto_aead_ctx(authenc);
-       struct crypto_hash *auth = ctx->auth;
-       struct hash_desc desc = {
-               .tfm = auth,
-               .flags = aead_request_flags(req),
-       };
-       u8 *ohash = aead_request_ctx(req);
-       u8 *ihash;
-       struct scatterlist *src = req->src;
-       unsigned int cryptlen = req->cryptlen;
-       unsigned int authsize;
+       struct aead_request *areq = &req->areq;
+       struct skcipher_givcrypt_request *greq = aead_request_ctx(areq);
+       u8 *iv = req->giv;
        int err;
 
-       ohash = (u8 *)ALIGN((unsigned long)ohash + crypto_hash_alignmask(auth), 
-                           crypto_hash_alignmask(auth) + 1);
-       ihash = ohash + crypto_hash_digestsize(auth);
+       skcipher_givcrypt_set_tfm(greq, ctx->enc);
+       skcipher_givcrypt_set_callback(greq, aead_request_flags(areq),
+                                      crypto_authenc_givencrypt_done, areq);
+       skcipher_givcrypt_set_crypt(greq, areq->src, areq->dst, areq->cryptlen,
+                                   areq->iv);
+       skcipher_givcrypt_set_giv(greq, iv, req->seq);
 
-       spin_lock_bh(&ctx->auth_lock);
-       err = crypto_hash_init(&desc);
+       err = crypto_skcipher_givencrypt(greq);
        if (err)
-               goto auth_unlock;
+               return err;
 
-       err = crypto_hash_update(&desc, req->assoc, req->assoclen);
-       if (err)
-               goto auth_unlock;
+       return crypto_authenc_genicv(areq, iv, CRYPTO_TFM_REQ_MAY_SLEEP);
+}
 
-       err = crypto_hash_update(&desc, src, cryptlen);
-       if (err)
-               goto auth_unlock;
+static int crypto_authenc_verify(struct aead_request *req,
+                                authenc_ahash_t authenc_ahash_fn)
+{
+       struct crypto_aead *authenc = crypto_aead_reqtfm(req);
+       struct authenc_request_ctx *areq_ctx = aead_request_ctx(req);
+       u8 *ohash;
+       u8 *ihash;
+       unsigned int authsize;
 
-       err = crypto_hash_final(&desc, ohash);
-auth_unlock:
-       spin_unlock_bh(&ctx->auth_lock);
+       areq_ctx->complete = authenc_verify_ahash_done;
+       areq_ctx->update_complete = authenc_verify_ahash_update_done;
 
-       if (err)
-               return err;
+       ohash = authenc_ahash_fn(req, CRYPTO_TFM_REQ_MAY_SLEEP);
+       if (IS_ERR(ohash))
+               return PTR_ERR(ohash);
 
        authsize = crypto_aead_authsize(authenc);
-       scatterwalk_map_and_copy(ihash, src, cryptlen, authsize, 0);
-       return memcmp(ihash, ohash, authsize) ? -EINVAL : 0;
+       ihash = ohash + authsize;
+       scatterwalk_map_and_copy(ihash, areq_ctx->sg, areq_ctx->cryptlen,
+                                authsize, 0);
+       return memcmp(ihash, ohash, authsize) ? -EBADMSG : 0;
 }
 
-static void crypto_authenc_decrypt_done(struct crypto_async_request *req,
-                                       int err)
+static int crypto_authenc_iverify(struct aead_request *req, u8 *iv,
+                                 unsigned int cryptlen)
 {
-       aead_request_complete(req->data, err);
+       struct crypto_aead *authenc = crypto_aead_reqtfm(req);
+       struct authenc_request_ctx *areq_ctx = aead_request_ctx(req);
+       struct scatterlist *src = req->src;
+       struct scatterlist *assoc = req->assoc;
+       struct scatterlist *cipher = areq_ctx->cipher;
+       struct scatterlist *asg = areq_ctx->asg;
+       unsigned int ivsize = crypto_aead_ivsize(authenc);
+       authenc_ahash_t authenc_ahash_fn = crypto_authenc_ahash_fb;
+       struct page *srcp;
+       u8 *vsrc;
+
+       srcp = sg_page(src);
+       vsrc = PageHighMem(srcp) ? NULL : page_address(srcp) + src->offset;
+
+       if (ivsize) {
+               sg_init_table(cipher, 2);
+               sg_set_buf(cipher, iv, ivsize);
+               authenc_chain(cipher, src, vsrc == iv + ivsize);
+               src = cipher;
+               cryptlen += ivsize;
+       }
+
+       if (sg_is_last(assoc)) {
+               authenc_ahash_fn = crypto_authenc_ahash;
+               sg_init_table(asg, 2);
+               sg_set_page(asg, sg_page(assoc), assoc->length, assoc->offset);
+               authenc_chain(asg, src, 0);
+               src = asg;
+               cryptlen += req->assoclen;
+       }
+
+       areq_ctx->cryptlen = cryptlen;
+       areq_ctx->sg = src;
+
+       return crypto_authenc_verify(req, authenc_ahash_fn);
 }
 
 static int crypto_authenc_decrypt(struct aead_request *req)
@@ -214,54 +524,65 @@ static int crypto_authenc_decrypt(struct aead_request *req)
        struct crypto_aead *authenc = crypto_aead_reqtfm(req);
        struct crypto_authenc_ctx *ctx = crypto_aead_ctx(authenc);
        struct ablkcipher_request *abreq = aead_request_ctx(req);
+       unsigned int cryptlen = req->cryptlen;
+       unsigned int authsize = crypto_aead_authsize(authenc);
+       u8 *iv = req->iv;
        int err;
 
-       err = crypto_authenc_verify(req);
+       if (cryptlen < authsize)
+               return -EINVAL;
+       cryptlen -= authsize;
+
+       err = crypto_authenc_iverify(req, iv, cryptlen);
        if (err)
                return err;
 
        ablkcipher_request_set_tfm(abreq, ctx->enc);
        ablkcipher_request_set_callback(abreq, aead_request_flags(req),
-                                       crypto_authenc_decrypt_done, req);
-       ablkcipher_request_set_crypt(abreq, req->src, req->dst, req->cryptlen,
-                                    req->iv);
+                                       req->base.complete, req->base.data);
+       ablkcipher_request_set_crypt(abreq, req->src, req->dst, cryptlen, iv);
 
        return crypto_ablkcipher_decrypt(abreq);
 }
 
 static int crypto_authenc_init_tfm(struct crypto_tfm *tfm)
 {
-       struct crypto_instance *inst = (void *)tfm->__crt_alg;
+       struct crypto_instance *inst = crypto_tfm_alg_instance(tfm);
        struct authenc_instance_ctx *ictx = crypto_instance_ctx(inst);
        struct crypto_authenc_ctx *ctx = crypto_tfm_ctx(tfm);
-       struct crypto_hash *auth;
+       struct crypto_ahash *auth;
        struct crypto_ablkcipher *enc;
        int err;
 
-       auth = crypto_spawn_hash(&ictx->auth);
+       auth = crypto_spawn_ahash(&ictx->auth);
        if (IS_ERR(auth))
                return PTR_ERR(auth);
 
-       enc = crypto_spawn_ablkcipher(&ictx->enc);
+       enc = crypto_spawn_skcipher(&ictx->enc);
        err = PTR_ERR(enc);
        if (IS_ERR(enc))
-               goto err_free_hash;
+               goto err_free_ahash;
 
        ctx->auth = auth;
        ctx->enc = enc;
-       tfm->crt_aead.reqsize = max_t(unsigned int,
-                                     (crypto_hash_alignmask(auth) &
-                                      ~(crypto_tfm_ctx_alignment() - 1)) +
-                                     crypto_hash_digestsize(auth) * 2,
-                                     sizeof(struct ablkcipher_request) +
-                                     crypto_ablkcipher_reqsize(enc));
 
-       spin_lock_init(&ctx->auth_lock);
+       ctx->reqoff = ALIGN(2 * crypto_ahash_digestsize(auth) +
+                           crypto_ahash_alignmask(auth),
+                           crypto_ahash_alignmask(auth) + 1) +
+                     crypto_ablkcipher_ivsize(enc);
+
+       tfm->crt_aead.reqsize = sizeof(struct authenc_request_ctx) +
+                               ctx->reqoff +
+                               max_t(unsigned int,
+                               crypto_ahash_reqsize(auth) +
+                               sizeof(struct ahash_request),
+                               sizeof(struct skcipher_givcrypt_request) +
+                               crypto_ablkcipher_reqsize(enc));
 
        return 0;
 
-err_free_hash:
-       crypto_free_hash(auth);
+err_free_ahash:
+       crypto_free_ahash(auth);
        return err;
 }
 
@@ -269,69 +590,82 @@ static void crypto_authenc_exit_tfm(struct crypto_tfm *tfm)
 {
        struct crypto_authenc_ctx *ctx = crypto_tfm_ctx(tfm);
 
-       crypto_free_hash(ctx->auth);
+       crypto_free_ahash(ctx->auth);
        crypto_free_ablkcipher(ctx->enc);
 }
 
 static struct crypto_instance *crypto_authenc_alloc(struct rtattr **tb)
 {
+       struct crypto_attr_type *algt;
        struct crypto_instance *inst;
-       struct crypto_alg *auth;
+       struct hash_alg_common *auth;
+       struct crypto_alg *auth_base;
        struct crypto_alg *enc;
        struct authenc_instance_ctx *ctx;
+       const char *enc_name;
        int err;
 
-       err = crypto_check_attr_type(tb, CRYPTO_ALG_TYPE_AEAD);
-       if (err)
+       algt = crypto_get_attr_type(tb);
+       err = PTR_ERR(algt);
+       if (IS_ERR(algt))
                return ERR_PTR(err);
 
-       auth = crypto_attr_alg(tb[1], CRYPTO_ALG_TYPE_HASH,
-                              CRYPTO_ALG_TYPE_HASH_MASK);
+       if ((algt->type ^ CRYPTO_ALG_TYPE_AEAD) & algt->mask)
+               return ERR_PTR(-EINVAL);
+
+       auth = ahash_attr_alg(tb[1], CRYPTO_ALG_TYPE_HASH,
+                              CRYPTO_ALG_TYPE_AHASH_MASK);
        if (IS_ERR(auth))
-               return ERR_PTR(PTR_ERR(auth));
+               return ERR_CAST(auth);
 
-       enc = crypto_attr_alg(tb[2], CRYPTO_ALG_TYPE_BLKCIPHER,
-                             CRYPTO_ALG_TYPE_BLKCIPHER_MASK);
-       inst = ERR_PTR(PTR_ERR(enc));
-       if (IS_ERR(enc))
+       auth_base = &auth->base;
+
+       enc_name = crypto_attr_alg_name(tb[2]);
+       err = PTR_ERR(enc_name);
+       if (IS_ERR(enc_name))
                goto out_put_auth;
 
        inst = kzalloc(sizeof(*inst) + sizeof(*ctx), GFP_KERNEL);
        err = -ENOMEM;
        if (!inst)
-               goto out_put_enc;
-
-       err = -ENAMETOOLONG;
-       if (snprintf(inst->alg.cra_name, CRYPTO_MAX_ALG_NAME,
-                    "authenc(%s,%s)", auth->cra_name, enc->cra_name) >=
-           CRYPTO_MAX_ALG_NAME)
-               goto err_free_inst;
-
-       if (snprintf(inst->alg.cra_driver_name, CRYPTO_MAX_ALG_NAME,
-                    "authenc(%s,%s)", auth->cra_driver_name,
-                    enc->cra_driver_name) >= CRYPTO_MAX_ALG_NAME)
-               goto err_free_inst;
+               goto out_put_auth;
 
        ctx = crypto_instance_ctx(inst);
 
-       err = crypto_init_spawn(&ctx->auth, auth, inst, CRYPTO_ALG_TYPE_MASK);
+       err = crypto_init_ahash_spawn(&ctx->auth, auth, inst);
        if (err)
                goto err_free_inst;
 
-       err = crypto_init_spawn(&ctx->enc, enc, inst, CRYPTO_ALG_TYPE_MASK);
+       crypto_set_skcipher_spawn(&ctx->enc, inst);
+       err = crypto_grab_skcipher(&ctx->enc, enc_name, 0,
+                                  crypto_requires_sync(algt->type,
+                                                       algt->mask));
        if (err)
                goto err_drop_auth;
 
-       inst->alg.cra_flags = CRYPTO_ALG_TYPE_AEAD | CRYPTO_ALG_ASYNC;
-       inst->alg.cra_priority = enc->cra_priority * 10 + auth->cra_priority;
+       enc = crypto_skcipher_spawn_alg(&ctx->enc);
+
+       err = -ENAMETOOLONG;
+       if (snprintf(inst->alg.cra_name, CRYPTO_MAX_ALG_NAME,
+                    "authenc(%s,%s)", auth_base->cra_name, enc->cra_name) >=
+           CRYPTO_MAX_ALG_NAME)
+               goto err_drop_enc;
+
+       if (snprintf(inst->alg.cra_driver_name, CRYPTO_MAX_ALG_NAME,
+                    "authenc(%s,%s)", auth_base->cra_driver_name,
+                    enc->cra_driver_name) >= CRYPTO_MAX_ALG_NAME)
+               goto err_drop_enc;
+
+       inst->alg.cra_flags = CRYPTO_ALG_TYPE_AEAD;
+       inst->alg.cra_flags |= enc->cra_flags & CRYPTO_ALG_ASYNC;
+       inst->alg.cra_priority = enc->cra_priority *
+                                10 + auth_base->cra_priority;
        inst->alg.cra_blocksize = enc->cra_blocksize;
-       inst->alg.cra_alignmask = auth->cra_alignmask | enc->cra_alignmask;
+       inst->alg.cra_alignmask = auth_base->cra_alignmask | enc->cra_alignmask;
        inst->alg.cra_type = &crypto_aead_type;
 
-       inst->alg.cra_aead.ivsize = enc->cra_blkcipher.ivsize;
-       inst->alg.cra_aead.maxauthsize = auth->cra_type == &crypto_hash_type ?
-                                        auth->cra_hash.digestsize :
-                                        auth->cra_digest.dia_digestsize;
+       inst->alg.cra_aead.ivsize = enc->cra_ablkcipher.ivsize;
+       inst->alg.cra_aead.maxauthsize = auth->digestsize;
 
        inst->alg.cra_ctxsize = sizeof(struct crypto_authenc_ctx);
 
@@ -341,18 +675,19 @@ static struct crypto_instance *crypto_authenc_alloc(struct rtattr **tb)
        inst->alg.cra_aead.setkey = crypto_authenc_setkey;
        inst->alg.cra_aead.encrypt = crypto_authenc_encrypt;
        inst->alg.cra_aead.decrypt = crypto_authenc_decrypt;
+       inst->alg.cra_aead.givencrypt = crypto_authenc_givencrypt;
 
 out:
-       crypto_mod_put(enc);
-out_put_auth:
-       crypto_mod_put(auth);
+       crypto_mod_put(auth_base);
        return inst;
 
+err_drop_enc:
+       crypto_drop_skcipher(&ctx->enc);
 err_drop_auth:
-       crypto_drop_spawn(&ctx->auth);
+       crypto_drop_ahash(&ctx->auth);
 err_free_inst:
        kfree(inst);
-out_put_enc:
+out_put_auth:
        inst = ERR_PTR(err);
        goto out;
 }
@@ -361,8 +696,8 @@ static void crypto_authenc_free(struct crypto_instance *inst)
 {
        struct authenc_instance_ctx *ctx = crypto_instance_ctx(inst);
 
-       crypto_drop_spawn(&ctx->enc);
-       crypto_drop_spawn(&ctx->auth);
+       crypto_drop_skcipher(&ctx->enc);
+       crypto_drop_ahash(&ctx->auth);
        kfree(inst);
 }