2020-05-02 05:36:31

by Eric Biggers

Subject: [PATCH 06/20] crypto: ccree - use crypto_shash_tfm_digest()

From: Eric Biggers <[email protected]>

Instead of manually allocating a 'struct shash_desc' on the stack and
calling crypto_shash_digest(), switch to using the new helper function
crypto_shash_tfm_digest() which does this for us.

Cc: Gilad Ben-Yossef <[email protected]>
Signed-off-by: Eric Biggers <[email protected]>
---
drivers/crypto/ccree/cc_cipher.c | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/drivers/crypto/ccree/cc_cipher.c b/drivers/crypto/ccree/cc_cipher.c
index a84335328f371c..872ea3ff1c6ba7 100644
--- a/drivers/crypto/ccree/cc_cipher.c
+++ b/drivers/crypto/ccree/cc_cipher.c
@@ -427,12 +427,9 @@ static int cc_cipher_setkey(struct crypto_skcipher *sktfm, const u8 *key,
int key_len = keylen >> 1;
int err;

- SHASH_DESC_ON_STACK(desc, ctx_p->shash_tfm);
-
- desc->tfm = ctx_p->shash_tfm;
-
- err = crypto_shash_digest(desc, ctx_p->user.key, key_len,
- ctx_p->user.key + key_len);
+ err = crypto_shash_tfm_digest(ctx_p->shash_tfm,
+ ctx_p->user.key, key_len,
+ ctx_p->user.key + key_len);
if (err) {
dev_err(dev, "Failed to hash ESSIV key.\n");
return err;
--
2.26.2

2020-05-03 14:02:48

by Gilad Ben-Yossef

Subject: Re: [PATCH 06/20] crypto: ccree - use crypto_shash_tfm_digest()

On Sat, May 2, 2020 at 8:33 AM Eric Biggers <[email protected]> wrote:
>
> From: Eric Biggers <[email protected]>
>
> Instead of manually allocating a 'struct shash_desc' on the stack and
> calling crypto_shash_digest(), switch to using the new helper function
> crypto_shash_tfm_digest() which does this for us.
>
> Cc: Gilad Ben-Yossef <[email protected]>
> Signed-off-by: Eric Biggers <[email protected]>
> ---
> drivers/crypto/ccree/cc_cipher.c | 9 +++------
> 1 file changed, 3 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/crypto/ccree/cc_cipher.c b/drivers/crypto/ccree/cc_cipher.c
> index a84335328f371c..872ea3ff1c6ba7 100644
> --- a/drivers/crypto/ccree/cc_cipher.c
> +++ b/drivers/crypto/ccree/cc_cipher.c
> @@ -427,12 +427,9 @@ static int cc_cipher_setkey(struct crypto_skcipher *sktfm, const u8 *key,
> int key_len = keylen >> 1;
> int err;
>
> - SHASH_DESC_ON_STACK(desc, ctx_p->shash_tfm);
> -
> - desc->tfm = ctx_p->shash_tfm;
> -
> - err = crypto_shash_digest(desc, ctx_p->user.key, key_len,
> - ctx_p->user.key + key_len);
> + err = crypto_shash_tfm_digest(ctx_p->shash_tfm,
> + ctx_p->user.key, key_len,
> + ctx_p->user.key + key_len);
> if (err) {
> dev_err(dev, "Failed to hash ESSIV key.\n");
> return err;
> --
> 2.26.2
>

Acked-by: Gilad Ben-Yossef <[email protected]>

Thanks,
Gilad


--
Gilad Ben-Yossef
Chief Coffee Drinker

values of β will give rise to dom!