Merge tag 'kgdb-5.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/danielt...

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

diff --git a/crypto/xcbc.c b/crypto/xcbc.c
index 0bb26e8..598ec88 100644 (file)
--- a/crypto/xcbc.c
+++ b/crypto/xcbc.c
@@ -167,7 +167,7 @@ static int xcbc_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 xcbc_tfm_ctx *ctx = crypto_tfm_ctx(tfm);
 
        cipher = crypto_spawn_cipher(spawn);
@@ -188,6 +188,7 @@ static void xcbc_exit_tfm(struct crypto_tfm *tfm)
 static int xcbc_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;
@@ -196,28 +197,24 @@ static int xcbc_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);
 
-       switch(alg->cra_blocksize) {
-       case XCBC_BLOCKSIZE:
-               break;
-       default:
-               goto out_put_alg;
-       }
+       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);
 
-       inst = shash_alloc_instance("xcbc", alg);
-       err = PTR_ERR(inst);
-       if (IS_ERR(inst))
-               goto out_put_alg;
+       err = -EINVAL;
+       if (alg->cra_blocksize != XCBC_BLOCKSIZE)
+               goto err_free_inst;
 
-       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 | 3;
        inst->alg.base.cra_alignmask = alignmask;
@@ -242,21 +239,19 @@ static int xcbc_create(struct crypto_template *tmpl, struct rtattr **tb)
        inst->alg.final = crypto_xcbc_digest_final;
        inst->alg.setkey = crypto_xcbc_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_xcbc_tmpl = {
        .name = "xcbc",
        .create = xcbc_create,
-       .free = shash_free_instance,
        .module = THIS_MODULE,
 };