From: Eric Biggers <ebigg...@google.com>

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 <gi...@benyossef.com>
Signed-off-by: Eric Biggers <ebigg...@google.com>
---
 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

Reply via email to