Merge tag 'tomoyo-pr-20200128' of git://git.osdn.net/gitroot/tomoyo/tomoyo-test1

[linux-2.6-microblaze.git] / crypto / hmac.c

diff --git a/crypto/hmac.c b/crypto/hmac.c
index 8b2a212..e38bfb9 100644 (file)
--- a/crypto/hmac.c
+++ b/crypto/hmac.c
@@ -138,12 +138,11 @@ static int hmac_finup(struct shash_desc *pdesc, const u8 *data,
               crypto_shash_finup(desc, out, ds, out);
 }
 
-static int hmac_init_tfm(struct crypto_tfm *tfm)
+static int hmac_init_tfm(struct crypto_shash *parent)
 {
-       struct crypto_shash *parent = __crypto_shash_cast(tfm);
        struct crypto_shash *hash;
-       struct crypto_instance *inst = (void *)tfm->__crt_alg;
-       struct crypto_shash_spawn *spawn = crypto_instance_ctx(inst);
+       struct shash_instance *inst = shash_alg_instance(parent);
+       struct crypto_shash_spawn *spawn = shash_instance_ctx(inst);
        struct hmac_ctx *ctx = hmac_ctx(parent);
 
        hash = crypto_spawn_shash(spawn);
@@ -152,24 +151,21 @@ static int hmac_init_tfm(struct crypto_tfm *tfm)
 
        parent->descsize = sizeof(struct shash_desc) +
                           crypto_shash_descsize(hash);
-       if (WARN_ON(parent->descsize > HASH_MAX_DESCSIZE)) {
-               crypto_free_shash(hash);
-               return -EINVAL;
-       }
 
        ctx->hash = hash;
        return 0;
 }
 
-static void hmac_exit_tfm(struct crypto_tfm *tfm)
+static void hmac_exit_tfm(struct crypto_shash *parent)
 {
-       struct hmac_ctx *ctx = hmac_ctx(__crypto_shash_cast(tfm));
+       struct hmac_ctx *ctx = hmac_ctx(parent);
        crypto_free_shash(ctx->hash);
 }
 
 static int hmac_create(struct crypto_template *tmpl, struct rtattr **tb)
 {
        struct shash_instance *inst;
+       struct crypto_shash_spawn *spawn;
        struct crypto_alg *alg;
        struct shash_alg *salg;
        int err;
@@ -180,31 +176,32 @@ static int hmac_create(struct crypto_template *tmpl, struct rtattr **tb)
        if (err)
                return err;
 
-       salg = shash_attr_alg(tb[1], 0, 0);
-       if (IS_ERR(salg))
-               return PTR_ERR(salg);
+       inst = kzalloc(sizeof(*inst) + sizeof(*spawn), GFP_KERNEL);
+       if (!inst)
+               return -ENOMEM;
+       spawn = shash_instance_ctx(inst);
+
+       err = crypto_grab_shash(spawn, shash_crypto_instance(inst),
+                               crypto_attr_alg_name(tb[1]), 0, 0);
+       if (err)
+               goto err_free_inst;
+       salg = crypto_spawn_shash_alg(spawn);
        alg = &salg->base;
 
-       /* The underlying hash algorithm must be unkeyed */
+       /* The underlying hash algorithm must not require a key */
        err = -EINVAL;
-       if (crypto_shash_alg_has_setkey(salg))
-               goto out_put_alg;
+       if (crypto_shash_alg_needs_key(salg))
+               goto err_free_inst;
 
        ds = salg->digestsize;
        ss = salg->statesize;
        if (ds > alg->cra_blocksize ||
            ss < alg->cra_blocksize)
-               goto out_put_alg;
+               goto err_free_inst;
 
-       inst = shash_alloc_instance("hmac", alg);
-       err = PTR_ERR(inst);
-       if (IS_ERR(inst))
-               goto out_put_alg;
-
-       err = crypto_init_shash_spawn(shash_instance_ctx(inst), salg,
-                                     shash_crypto_instance(inst));
+       err = crypto_inst_setname(shash_crypto_instance(inst), tmpl->name, alg);
        if (err)
-               goto out_free_inst;
+               goto err_free_inst;
 
        inst->alg.base.cra_priority = alg->cra_priority;
        inst->alg.base.cra_blocksize = alg->cra_blocksize;
@@ -217,9 +214,6 @@ static int hmac_create(struct crypto_template *tmpl, struct rtattr **tb)
        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;
@@ -227,22 +221,22 @@ static int hmac_create(struct crypto_template *tmpl, struct rtattr **tb)
        inst->alg.export = hmac_export;
        inst->alg.import = hmac_import;
        inst->alg.setkey = hmac_setkey;
+       inst->alg.init_tfm = hmac_init_tfm;
+       inst->alg.exit_tfm = hmac_exit_tfm;
+
+       inst->free = shash_free_singlespawn_instance;
 
        err = shash_register_instance(tmpl, inst);
        if (err) {
-out_free_inst:
-               shash_free_instance(shash_crypto_instance(inst));
+err_free_inst:
+               shash_free_singlespawn_instance(inst);
        }
-
-out_put_alg:
-       crypto_mod_put(alg);
        return err;
 }
 
 static struct crypto_template hmac_tmpl = {
        .name = "hmac",
        .create = hmac_create,
-       .free = shash_free_instance,
        .module = THIS_MODULE,
 };