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

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

diff --git a/crypto/cmac.c b/crypto/cmac.c
index 0928aeb..143a654 100644 (file)
--- a/crypto/cmac.c
+++ b/crypto/cmac.c
@@ -201,7 +201,7 @@ static int cmac_init_tfm(struct crypto_tfm *tfm)
 {
        struct crypto_cipher *cipher;
        struct crypto_instance *inst = (void *)tfm->__crt_alg;
-       struct crypto_spawn *spawn = crypto_instance_ctx(inst);
+       struct crypto_cipher_spawn *spawn = crypto_instance_ctx(inst);
        struct cmac_tfm_ctx *ctx = crypto_tfm_ctx(tfm);
 
        cipher = crypto_spawn_cipher(spawn);
@@ -222,6 +222,7 @@ static void cmac_exit_tfm(struct crypto_tfm *tfm)
 static int cmac_create(struct crypto_template *tmpl, struct rtattr **tb)
 {
        struct shash_instance *inst;
+       struct crypto_cipher_spawn *spawn;
        struct crypto_alg *alg;
        unsigned long alignmask;
        int err;
@@ -230,10 +231,16 @@ static int cmac_create(struct crypto_template *tmpl, struct rtattr **tb)
        if (err)
                return err;
 
-       alg = crypto_get_attr_alg(tb, CRYPTO_ALG_TYPE_CIPHER,
-                                 CRYPTO_ALG_TYPE_MASK);
-       if (IS_ERR(alg))
-               return PTR_ERR(alg);
+       inst = kzalloc(sizeof(*inst) + sizeof(*spawn), GFP_KERNEL);
+       if (!inst)
+               return -ENOMEM;
+       spawn = shash_instance_ctx(inst);
+
+       err = crypto_grab_cipher(spawn, shash_crypto_instance(inst),
+                                crypto_attr_alg_name(tb[1]), 0, 0);
+       if (err)
+               goto err_free_inst;
+       alg = crypto_spawn_cipher_alg(spawn);
 
        switch (alg->cra_blocksize) {
        case 16:
@@ -241,19 +248,12 @@ static int cmac_create(struct crypto_template *tmpl, struct rtattr **tb)
                break;
        default:
                err = -EINVAL;
-               goto out_put_alg;
+               goto err_free_inst;
        }
 
-       inst = shash_alloc_instance("cmac", alg);
-       err = PTR_ERR(inst);
-       if (IS_ERR(inst))
-               goto out_put_alg;
-
-       err = crypto_init_spawn(shash_instance_ctx(inst), alg,
-                               shash_crypto_instance(inst),
-                               CRYPTO_ALG_TYPE_MASK);
+       err = crypto_inst_setname(shash_crypto_instance(inst), tmpl->name, alg);
        if (err)
-               goto out_free_inst;
+               goto err_free_inst;
 
        alignmask = alg->cra_alignmask;
        inst->alg.base.cra_alignmask = alignmask;
@@ -280,21 +280,19 @@ static int cmac_create(struct crypto_template *tmpl, struct rtattr **tb)
        inst->alg.final = crypto_cmac_digest_final;
        inst->alg.setkey = crypto_cmac_digest_setkey;
 
+       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 crypto_cmac_tmpl = {
        .name = "cmac",
        .create = cmac_create,
-       .free = shash_free_instance,
        .module = THIS_MODULE,
 };