OSDN Git Service

crypto: hisilicon/sec2 - use crypto_shash_tfm_digest()
authorEric Biggers <ebiggers@google.com>
Sat, 2 May 2020 05:31:09 +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: Zaibo Xu <xuzaibo@huawei.com>
Signed-off-by: Eric Biggers <ebiggers@google.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
drivers/crypto/hisilicon/sec2/sec_crypto.c

index 7f1c6a3..848ab49 100644 (file)
@@ -832,7 +832,6 @@ static int sec_aead_auth_set_key(struct sec_auth_ctx *ctx,
                                 struct crypto_authenc_keys *keys)
 {
        struct crypto_shash *hash_tfm = ctx->hash_tfm;
-       SHASH_DESC_ON_STACK(shash, hash_tfm);
        int blocksize, ret;
 
        if (!keys->authkeylen) {
@@ -842,8 +841,8 @@ static int sec_aead_auth_set_key(struct sec_auth_ctx *ctx,
 
        blocksize = crypto_shash_blocksize(hash_tfm);
        if (keys->authkeylen > blocksize) {
-               ret = crypto_shash_digest(shash, keys->authkey,
-                                         keys->authkeylen, ctx->a_key);
+               ret = crypto_shash_tfm_digest(hash_tfm, keys->authkey,
+                                             keys->authkeylen, ctx->a_key);
                if (ret) {
                        pr_err("hisi_sec2: aead auth digest error!\n");
                        return -EINVAL;