OSDN Git Service

crypto: ccree - use crypto_shash_tfm_digest()
authorEric Biggers <ebiggers@google.com>
Sat, 2 May 2020 05:31:08 +0000 (22:31 -0700)
committerHerbert Xu <herbert@gondor.apana.org.au>
Fri, 8 May 2020 05:32:13 +0000 (15:32 +1000)
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 <gilad@benyossef.com>
Signed-off-by: Eric Biggers <ebiggers@google.com>
Acked-by: Gilad Ben-Yossef <gilad@benyossef.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
drivers/crypto/ccree/cc_cipher.c

index a843353..872ea3f 100644 (file)
@@ -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;