ich777/linux_media
1
0
Fork 0
mirror of https://github.com/tbsdtv/linux_media.git synced 2025-07-23 12:43:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

crypto: cryptd - Convert hash to use modern init_tfm/exit_tfm

Browse Source 
The cryptd hash template was still using the obsolete cra_init/cra_exit
interface.  Make it use the modern ahash init_tfm/exit_tfm instead.

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Reviewed-by: Simon Horman <simon.horman@corigine.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
This commit is contained in:
Herbert Xu
2023-04-13 14:24:23 +08:00
parent 8538e60d36
commit 0303b7f5df
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
crypto/cryptd.c
View File

@@ -427,12 +427,12 @@ err_free_inst:
return err; return err;
} }
static int cryptd_hash_init_tfm(struct crypto_tfm *tfm) static int cryptd_hash_init_tfm(struct crypto_ahash *tfm)
{ {
struct crypto_instance *inst = crypto_tfm_alg_instance(tfm); struct ahash_instance *inst = ahash_alg_instance(tfm);
struct hashd_instance_ctx *ictx = crypto_instance_ctx(inst); struct hashd_instance_ctx *ictx = ahash_instance_ctx(inst);
struct crypto_shash_spawn *spawn = &ictx->spawn; struct crypto_shash_spawn *spawn = &ictx->spawn;
struct cryptd_hash_ctx *ctx = crypto_tfm_ctx(tfm); struct cryptd_hash_ctx *ctx = crypto_ahash_ctx(tfm);
struct crypto_shash *hash; struct crypto_shash *hash;
hash = crypto_spawn_shash(spawn); hash = crypto_spawn_shash(spawn);
@@ -440,15 +440,15 @@ static int cryptd_hash_init_tfm(struct crypto_tfm *tfm)
return PTR_ERR(hash); return PTR_ERR(hash);
ctx->child = hash; ctx->child = hash;
crypto_ahash_set_reqsize(__crypto_ahash_cast(tfm), crypto_ahash_set_reqsize(tfm,
sizeof(struct cryptd_hash_request_ctx) + sizeof(struct cryptd_hash_request_ctx) +
crypto_shash_descsize(hash)); crypto_shash_descsize(hash));
return 0; return 0;
} }
static void cryptd_hash_exit_tfm(struct crypto_tfm *tfm) static void cryptd_hash_exit_tfm(struct crypto_ahash *tfm)
{ {
struct cryptd_hash_ctx *ctx = crypto_tfm_ctx(tfm); struct cryptd_hash_ctx *ctx = crypto_ahash_ctx(tfm);
crypto_free_shash(ctx->child); crypto_free_shash(ctx->child);
} }
@@ -677,8 +677,8 @@ static int cryptd_create_hash(struct crypto_template *tmpl, struct rtattr **tb,
inst->alg.halg.statesize = alg->statesize; inst->alg.halg.statesize = alg->statesize;
inst->alg.halg.base.cra_ctxsize = sizeof(struct cryptd_hash_ctx); inst->alg.halg.base.cra_ctxsize = sizeof(struct cryptd_hash_ctx);
inst->alg.halg.base.cra_init = cryptd_hash_init_tfm; inst->alg.init_tfm = cryptd_hash_init_tfm;
inst->alg.halg.base.cra_exit = cryptd_hash_exit_tfm; inst->alg.exit_tfm = cryptd_hash_exit_tfm;
inst->alg.init = cryptd_hash_init_enqueue; inst->alg.init = cryptd_hash_init_enqueue;
inst->alg.update = cryptd_hash_update_enqueue; inst->alg.update = cryptd_hash_update_enqueue;