| Message ID | E1pzvTZ-00AnMQ-5M@formenos.hmeau.com (mailing list archive) |
|---|---|
| State | Not Applicable |
| Headers | show |
| Series | [1/3] crypto: cmac - Use modern init_tfm/exit_tfm | expand |
| Context | Check | Description |
|---|---|---|
| netdev/tree_selection | success | Not a local patch |
Hi Herbert, On Fri, 19 May 2023 at 10:29, Herbert Xu <herbert@gondor.apana.org.au> wrote: > > Allow hmac to be cloned. The underlying cipher needs to support > cloning by not having a cra_init function (all implementations of > aes that do not require a fallback can be cloned). > > Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> Does this imply that the cmac-aes-ce and cmac-aes-neon implementations for arm64 need a similar treatment? > --- > > crypto/cmac.c | 18 +++++++++++++++++- > 1 file changed, 17 insertions(+), 1 deletion(-) > > diff --git a/crypto/cmac.c b/crypto/cmac.c > index bcc6f19a4f64..fce6b0f58e88 100644 > --- a/crypto/cmac.c > +++ b/crypto/cmac.c > @@ -213,7 +213,22 @@ static int cmac_init_tfm(struct crypto_shash *tfm) > ctx->child = cipher; > > return 0; > -}; > +} > + > +static int cmac_clone_tfm(struct crypto_shash *tfm, struct crypto_shash *otfm) > +{ > + struct cmac_tfm_ctx *octx = crypto_shash_ctx(otfm); > + struct cmac_tfm_ctx *ctx = crypto_shash_ctx(tfm); > + struct crypto_cipher *cipher; > + > + cipher = crypto_clone_cipher(octx->child); > + if (IS_ERR(cipher)) > + return PTR_ERR(cipher); > + > + ctx->child = cipher; > + > + return 0; > +} > > static void cmac_exit_tfm(struct crypto_shash *tfm) > { > @@ -280,6 +295,7 @@ 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->alg.init_tfm = cmac_init_tfm; > + inst->alg.clone_tfm = cmac_clone_tfm; > inst->alg.exit_tfm = cmac_exit_tfm; > > inst->free = shash_free_singlespawn_instance;
Hi Herbert, Thanks for the patches! On 5/19/23 09:28, Herbert Xu wrote: > Allow hmac to be cloned. The underlying cipher needs to support Small nit ^cmac > cloning by not having a cra_init function (all implementations of > aes that do not require a fallback can be cloned). > > Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> I'll remove per-CPU request allocations and base version7 on this. Thanks, Dmitry
diff --git a/crypto/cmac.c b/crypto/cmac.c index bcc6f19a4f64..fce6b0f58e88 100644 --- a/crypto/cmac.c +++ b/crypto/cmac.c @@ -213,7 +213,22 @@ static int cmac_init_tfm(struct crypto_shash *tfm) ctx->child = cipher; return 0; -}; +} + +static int cmac_clone_tfm(struct crypto_shash *tfm, struct crypto_shash *otfm) +{ + struct cmac_tfm_ctx *octx = crypto_shash_ctx(otfm); + struct cmac_tfm_ctx *ctx = crypto_shash_ctx(tfm); + struct crypto_cipher *cipher; + + cipher = crypto_clone_cipher(octx->child); + if (IS_ERR(cipher)) + return PTR_ERR(cipher); + + ctx->child = cipher; + + return 0; +} static void cmac_exit_tfm(struct crypto_shash *tfm) { @@ -280,6 +295,7 @@ 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->alg.init_tfm = cmac_init_tfm; + inst->alg.clone_tfm = cmac_clone_tfm; inst->alg.exit_tfm = cmac_exit_tfm; inst->free = shash_free_singlespawn_instance;
Allow hmac to be cloned. The underlying cipher needs to support cloning by not having a cra_init function (all implementations of aes that do not require a fallback can be cloned). Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> --- crypto/cmac.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-)