mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-29 05:44:11 +00:00
Code Issues Releases Wiki Activity

crypto: cmac - Use modern init_tfm/exit_tfm

Browse source 
Use the modern init_tfm/exit_tfm interface instead of the obsolete
cra_init/cra_exit interface.

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Acked-by: Ard Biesheuvel <ardb@kernel.org>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
This commit is contained in:
Herbert Xu 2023-05-19 16:28:32 +08:00
parent 4e3901fa84
commit cf2eddc931
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
crypto/cmac.c
View file

@ -198,13 +198,14 @@ static int crypto_cmac_digest_final(struct shash_desc *pdesc, u8 *out)
return 0; return 0;
} }
static int cmac_init_tfm(struct crypto_tfm *tfm) static int cmac_init_tfm(struct crypto_shash *tfm)
{ {
struct shash_instance *inst = shash_alg_instance(tfm);
struct cmac_tfm_ctx *ctx = crypto_shash_ctx(tfm);
struct crypto_cipher_spawn *spawn;
struct crypto_cipher *cipher; struct crypto_cipher *cipher;
struct crypto_instance *inst = (void *)tfm->__crt_alg;
struct crypto_cipher_spawn *spawn = crypto_instance_ctx(inst);
struct cmac_tfm_ctx *ctx = crypto_tfm_ctx(tfm);
spawn = shash_instance_ctx(inst);
cipher = crypto_spawn_cipher(spawn); cipher = crypto_spawn_cipher(spawn);
if (IS_ERR(cipher)) if (IS_ERR(cipher))
return PTR_ERR(cipher); return PTR_ERR(cipher);
@ -214,9 +215,9 @@ static int cmac_init_tfm(struct crypto_tfm *tfm)
return 0; return 0;
}; };
static void cmac_exit_tfm(struct crypto_tfm *tfm) static void cmac_exit_tfm(struct crypto_shash *tfm)
{ {
struct cmac_tfm_ctx *ctx = crypto_tfm_ctx(tfm); struct cmac_tfm_ctx *ctx = crypto_shash_ctx(tfm);
crypto_free_cipher(ctx->child); crypto_free_cipher(ctx->child);
} }
@ -274,13 +275,12 @@ static int cmac_create(struct crypto_template *tmpl, struct rtattr **tb)
~(crypto_tfm_ctx_alignment() - 1)) ~(crypto_tfm_ctx_alignment() - 1))
+ alg->cra_blocksize * 2; + alg->cra_blocksize * 2;
inst->alg.base.cra_init = cmac_init_tfm;
inst->alg.base.cra_exit = cmac_exit_tfm;
inst->alg.init = crypto_cmac_digest_init; inst->alg.init = crypto_cmac_digest_init;
inst->alg.update = crypto_cmac_digest_update; inst->alg.update = crypto_cmac_digest_update;
inst->alg.final = crypto_cmac_digest_final; inst->alg.final = crypto_cmac_digest_final;
inst->alg.setkey = crypto_cmac_digest_setkey; inst->alg.setkey = crypto_cmac_digest_setkey;
inst->alg.init_tfm = cmac_init_tfm;
inst->alg.exit_tfm = cmac_exit_tfm;
inst->free = shash_free_singlespawn_instance; inst->free = shash_free_singlespawn_instance;