1 files changed, 138 insertions, 164 deletions

diff --git a/crypto/hmac.c b/crypto/hmac.c
index 0ad39c374963..15c2eb534541 100644
--- a/crypto/hmac.c
+++ b/crypto/hmac.c
@@ -27,7 +27,7 @@
 #include <linux/string.h>
 
 struct hmac_ctx {
-        struct crypto_hash *child;
+        struct crypto_shash *hash;
 };
 
 static inline void *align_ptr(void *p, unsigned int align)
@@ -35,65 +35,45 @@ static inline void *align_ptr(void *p, unsigned int align)
         return (void *)ALIGN((unsigned long)p, align);
 }
 
-static inline struct hmac_ctx *hmac_ctx(struct crypto_hash *tfm)
+static inline struct hmac_ctx *hmac_ctx(struct crypto_shash *tfm)
 {
-        return align_ptr(crypto_hash_ctx_aligned(tfm) +
-                         crypto_hash_blocksize(tfm) * 2 +
-                         crypto_hash_digestsize(tfm), sizeof(void *));
+        return align_ptr(crypto_shash_ctx_aligned(tfm) +
+                         crypto_shash_statesize(tfm) * 2,
+                         crypto_tfm_ctx_alignment());
 }
 
-static int hmac_setkey(struct crypto_hash *parent,
+static int hmac_setkey(struct crypto_shash *parent,
                        const u8 *inkey, unsigned int keylen)
 {
-        int bs = crypto_hash_blocksize(parent);
-        int ds = crypto_hash_digestsize(parent);
-        char *ipad = crypto_hash_ctx_aligned(parent);
-        char *opad = ipad + bs;
-        char *digest = opad + bs;
-        struct hmac_ctx *ctx = align_ptr(digest + ds, sizeof(void *));
-        struct crypto_hash *tfm = ctx->child;
+        int bs = crypto_shash_blocksize(parent);
+        int ds = crypto_shash_digestsize(parent);
+        int ss = crypto_shash_statesize(parent);
+        char *ipad = crypto_shash_ctx_aligned(parent);
+        char *opad = ipad + ss;
+        struct hmac_ctx *ctx = align_ptr(opad + ss,
+                                         crypto_tfm_ctx_alignment());
+        struct crypto_shash *hash = ctx->hash;
+        struct {
+                struct shash_desc shash;
+                char ctx[crypto_shash_descsize(hash)];
+        } desc;
         unsigned int i;
 
+        desc.shash.tfm = hash;
+        desc.shash.flags = crypto_shash_get_flags(parent) &
+                            CRYPTO_TFM_REQ_MAY_SLEEP;
+
         if (keylen > bs) {
-                struct hash_desc desc;
-                struct scatterlist tmp;
-                int tmplen;
                 int err;
 
-                desc.tfm = tfm;
-                desc.flags = crypto_hash_get_flags(parent);
-                desc.flags &= CRYPTO_TFM_REQ_MAY_SLEEP;
-
-                err = crypto_hash_init(&desc);
+                err = crypto_shash_digest(&desc.shash, inkey, keylen, ipad);
                 if (err)
                         return err;
 
-                tmplen = bs * 2 + ds;
-                sg_init_one(&tmp, ipad, tmplen);
-
-                for (; keylen > tmplen; inkey += tmplen, keylen -= tmplen) {
-                        memcpy(ipad, inkey, tmplen);
-                        err = crypto_hash_update(&desc, &tmp, tmplen);
-                        if (err)
-                                return err;
-                }
-
-                if (keylen) {
-                        memcpy(ipad, inkey, keylen);
-                        err = crypto_hash_update(&desc, &tmp, keylen);
-                        if (err)
-                                return err;
-                }
-
-                err = crypto_hash_final(&desc, digest);
-                if (err)
-                        return err;
-
-                inkey = digest;
                 keylen = ds;
-        }
+        } else
+                memcpy(ipad, inkey, keylen);
 
-        memcpy(ipad, inkey, keylen);
         memset(ipad + keylen, 0, bs - keylen);
         memcpy(opad, ipad, bs);
 
@@ -102,184 +82,178 @@ static int hmac_setkey(struct crypto_hash *parent,
                 opad[i] ^= 0x5c;
         }
 
-        return 0;
+        return crypto_shash_init(&desc.shash) ?:
+               crypto_shash_update(&desc.shash, ipad, bs) ?:
+               crypto_shash_export(&desc.shash, ipad) ?:
+               crypto_shash_init(&desc.shash) ?:
+               crypto_shash_update(&desc.shash, opad, bs) ?:
+               crypto_shash_export(&desc.shash, opad);
 }
 
-static int hmac_init(struct hash_desc *pdesc)
+static int hmac_export(struct shash_desc *pdesc, void *out)
 {
-        struct crypto_hash *parent = pdesc->tfm;
-        int bs = crypto_hash_blocksize(parent);
-        int ds = crypto_hash_digestsize(parent);
-        char *ipad = crypto_hash_ctx_aligned(parent);
-        struct hmac_ctx *ctx = align_ptr(ipad + bs * 2 + ds, sizeof(void *));
-        struct hash_desc desc;
-        struct scatterlist tmp;
-        int err;
+        struct shash_desc *desc = shash_desc_ctx(pdesc);
 
-        desc.tfm = ctx->child;
-        desc.flags = pdesc->flags & CRYPTO_TFM_REQ_MAY_SLEEP;
-        sg_init_one(&tmp, ipad, bs);
+        desc->flags = pdesc->flags & CRYPTO_TFM_REQ_MAY_SLEEP;
 
-        err = crypto_hash_init(&desc);
-        if (unlikely(err))
-                return err;
-
-        return crypto_hash_update(&desc, &tmp, bs);
+        return crypto_shash_export(desc, out);
 }
 
-static int hmac_update(struct hash_desc *pdesc,
-                       struct scatterlist *sg, unsigned int nbytes)
+static int hmac_import(struct shash_desc *pdesc, const void *in)
 {
+        struct shash_desc *desc = shash_desc_ctx(pdesc);
         struct hmac_ctx *ctx = hmac_ctx(pdesc->tfm);
-        struct hash_desc desc;
 
-        desc.tfm = ctx->child;
-        desc.flags = pdesc->flags & CRYPTO_TFM_REQ_MAY_SLEEP;
+        desc->tfm = ctx->hash;
+        desc->flags = pdesc->flags & CRYPTO_TFM_REQ_MAY_SLEEP;
 
-        return crypto_hash_update(&desc, sg, nbytes);
+        return crypto_shash_import(desc, in);
 }
 
-static int hmac_final(struct hash_desc *pdesc, u8 *out)
+static int hmac_init(struct shash_desc *pdesc)
 {
-        struct crypto_hash *parent = pdesc->tfm;
-        int bs = crypto_hash_blocksize(parent);
-        int ds = crypto_hash_digestsize(parent);
-        char *opad = crypto_hash_ctx_aligned(parent) + bs;
-        char *digest = opad + bs;
-        struct hmac_ctx *ctx = align_ptr(digest + ds, sizeof(void *));
-        struct hash_desc desc;
-        struct scatterlist tmp;
-        int err;
+        return hmac_import(pdesc, crypto_shash_ctx_aligned(pdesc->tfm));
+}
 
-        desc.tfm = ctx->child;
-        desc.flags = pdesc->flags & CRYPTO_TFM_REQ_MAY_SLEEP;
-        sg_init_one(&tmp, opad, bs + ds);
+static int hmac_update(struct shash_desc *pdesc,
+                       const u8 *data, unsigned int nbytes)
+{
+        struct shash_desc *desc = shash_desc_ctx(pdesc);
 
-        err = crypto_hash_final(&desc, digest);
-        if (unlikely(err))
-                return err;
+        desc->flags = pdesc->flags & CRYPTO_TFM_REQ_MAY_SLEEP;
 
-        return crypto_hash_digest(&desc, &tmp, bs + ds, out);
+        return crypto_shash_update(desc, data, nbytes);
 }
 
-static int hmac_digest(struct hash_desc *pdesc, struct scatterlist *sg,
-                       unsigned int nbytes, u8 *out)
+static int hmac_final(struct shash_desc *pdesc, u8 *out)
 {
-        struct crypto_hash *parent = pdesc->tfm;
-        int bs = crypto_hash_blocksize(parent);
-        int ds = crypto_hash_digestsize(parent);
-        char *ipad = crypto_hash_ctx_aligned(parent);
-        char *opad = ipad + bs;
-        char *digest = opad + bs;
-        struct hmac_ctx *ctx = align_ptr(digest + ds, sizeof(void *));
-        struct hash_desc desc;
-        struct scatterlist sg1[2];
-        struct scatterlist sg2[1];
-        int err;
+        struct crypto_shash *parent = pdesc->tfm;
+        int ds = crypto_shash_digestsize(parent);
+        int ss = crypto_shash_statesize(parent);
+        char *opad = crypto_shash_ctx_aligned(parent) + ss;
+        struct shash_desc *desc = shash_desc_ctx(pdesc);
 
-        desc.tfm = ctx->child;
-        desc.flags = pdesc->flags & CRYPTO_TFM_REQ_MAY_SLEEP;
+        desc->flags = pdesc->flags & CRYPTO_TFM_REQ_MAY_SLEEP;
 
-        sg_init_table(sg1, 2);
-        sg_set_buf(sg1, ipad, bs);
-        scatterwalk_sg_chain(sg1, 2, sg);
+        return crypto_shash_final(desc, out) ?:
+               crypto_shash_import(desc, opad) ?:
+               crypto_shash_finup(desc, out, ds, out);
+}
 
-        sg_init_table(sg2, 1);
-        sg_set_buf(sg2, opad, bs + ds);
+static int hmac_finup(struct shash_desc *pdesc, const u8 *data,
+                      unsigned int nbytes, u8 *out)
+{
 
-        err = crypto_hash_digest(&desc, sg1, nbytes + bs, digest);
-        if (unlikely(err))
-                return err;
+        struct crypto_shash *parent = pdesc->tfm;
+        int ds = crypto_shash_digestsize(parent);
+        int ss = crypto_shash_statesize(parent);
+        char *opad = crypto_shash_ctx_aligned(parent) + ss;
+        struct shash_desc *desc = shash_desc_ctx(pdesc);
 
-        return crypto_hash_digest(&desc, sg2, bs + ds, out);
+        desc->flags = pdesc->flags & CRYPTO_TFM_REQ_MAY_SLEEP;
+
+        return crypto_shash_finup(desc, data, nbytes, out) ?:
+               crypto_shash_import(desc, opad) ?:
+               crypto_shash_finup(desc, out, ds, out);
 }
 
 static int hmac_init_tfm(struct crypto_tfm *tfm)
 {
-        struct crypto_hash *hash;
+        struct crypto_shash *parent = __crypto_shash_cast(tfm);
+        struct crypto_shash *hash;
         struct crypto_instance *inst = (void *)tfm->__crt_alg;
-        struct crypto_spawn *spawn = crypto_instance_ctx(inst);
-        struct hmac_ctx *ctx = hmac_ctx(__crypto_hash_cast(tfm));
+        struct crypto_shash_spawn *spawn = crypto_instance_ctx(inst);
+        struct hmac_ctx *ctx = hmac_ctx(parent);
 
-        hash = crypto_spawn_hash(spawn);
+        hash = crypto_spawn_shash(spawn);
         if (IS_ERR(hash))
                 return PTR_ERR(hash);
 
-        ctx->child = hash;
+        parent->descsize = sizeof(struct shash_desc) +
+                           crypto_shash_descsize(hash);
+
+        ctx->hash = hash;
         return 0;
 }
 
 static void hmac_exit_tfm(struct crypto_tfm *tfm)
 {
-        struct hmac_ctx *ctx = hmac_ctx(__crypto_hash_cast(tfm));
-        crypto_free_hash(ctx->child);
+        struct hmac_ctx *ctx = hmac_ctx(__crypto_shash_cast(tfm));
+        crypto_free_shash(ctx->hash);
 }
 
-static void hmac_free(struct crypto_instance *inst)
+static int hmac_create(struct crypto_template *tmpl, struct rtattr **tb)
 {
-        crypto_drop_spawn(crypto_instance_ctx(inst));
-        kfree(inst);
-}
-
-static struct crypto_instance *hmac_alloc(struct rtattr **tb)
-{
-        struct crypto_instance *inst;
+        struct shash_instance *inst;
         struct crypto_alg *alg;
+        struct shash_alg *salg;
         int err;
         int ds;
+        int ss;
 
-        err = crypto_check_attr_type(tb, CRYPTO_ALG_TYPE_HASH);
+        err = crypto_check_attr_type(tb, CRYPTO_ALG_TYPE_SHASH);
         if (err)
-                return ERR_PTR(err);
-
-        alg = crypto_get_attr_alg(tb, CRYPTO_ALG_TYPE_HASH,
-                                  CRYPTO_ALG_TYPE_HASH_MASK);
-        if (IS_ERR(alg))
-                return ERR_CAST(alg);
-
-        inst = ERR_PTR(-EINVAL);
-        ds = alg->cra_type == &crypto_hash_type ?
-             alg->cra_hash.digestsize :
-             alg->cra_type ?
-             __crypto_shash_alg(alg)->digestsize :
-             alg->cra_digest.dia_digestsize;
-        if (ds > alg->cra_blocksize)
+                return err;
+
+        salg = shash_attr_alg(tb[1], 0, 0);
+        if (IS_ERR(salg))
+                return PTR_ERR(salg);
+
+        err = -EINVAL;
+        ds = salg->digestsize;
+        ss = salg->statesize;
+        alg = &salg->base;
+        if (ds > alg->cra_blocksize ||
+            ss < alg->cra_blocksize)
                 goto out_put_alg;
 
-        inst = crypto_alloc_instance("hmac", alg);
+        inst = shash_alloc_instance("hmac", alg);
+        err = PTR_ERR(inst);
         if (IS_ERR(inst))
                 goto out_put_alg;
 
-        inst->alg.cra_flags = CRYPTO_ALG_TYPE_HASH;
-        inst->alg.cra_priority = alg->cra_priority;
-        inst->alg.cra_blocksize = alg->cra_blocksize;
-        inst->alg.cra_alignmask = alg->cra_alignmask;
-        inst->alg.cra_type = &crypto_hash_type;
-
-        inst->alg.cra_hash.digestsize = ds;
-
-        inst->alg.cra_ctxsize = sizeof(struct hmac_ctx) +
-                                ALIGN(inst->alg.cra_blocksize * 2 + ds,
-                                      sizeof(void *));
-
-        inst->alg.cra_init = hmac_init_tfm;
-        inst->alg.cra_exit = hmac_exit_tfm;
-
-        inst->alg.cra_hash.init = hmac_init;
-        inst->alg.cra_hash.update = hmac_update;
-        inst->alg.cra_hash.final = hmac_final;
-        inst->alg.cra_hash.digest = hmac_digest;
-        inst->alg.cra_hash.setkey = hmac_setkey;
+        err = crypto_init_shash_spawn(shash_instance_ctx(inst), salg,
+                                      shash_crypto_instance(inst));
+        if (err)
+                goto out_free_inst;
+
+        inst->alg.base.cra_priority = alg->cra_priority;
+        inst->alg.base.cra_blocksize = alg->cra_blocksize;
+        inst->alg.base.cra_alignmask = alg->cra_alignmask;
+
+        ss = ALIGN(ss, alg->cra_alignmask + 1);
+        inst->alg.digestsize = ds;
+        inst->alg.statesize = ss;
+
+        inst->alg.base.cra_ctxsize = sizeof(struct hmac_ctx) +
+                                     ALIGN(ss * 2, crypto_tfm_ctx_alignment());
+
+        inst->alg.base.cra_init = hmac_init_tfm;
+        inst->alg.base.cra_exit = hmac_exit_tfm;
+
+        inst->alg.init = hmac_init;
+        inst->alg.update = hmac_update;
+        inst->alg.final = hmac_final;
+        inst->alg.finup = hmac_finup;
+        inst->alg.export = hmac_export;
+        inst->alg.import = hmac_import;
+        inst->alg.setkey = hmac_setkey;
+
+        err = shash_register_instance(tmpl, inst);
+        if (err) {
+out_free_inst:
+                shash_free_instance(shash_crypto_instance(inst));
+        }
 
 out_put_alg:
         crypto_mod_put(alg);
-        return inst;
+        return err;
 }
 
 static struct crypto_template hmac_tmpl = {
         .name = "hmac",
-        .alloc = hmac_alloc,
-        .free = hmac_free,
+        .create = hmac_create,
+        .free = shash_free_instance,
         .module = THIS_MODULE,
 };