From: Eric Biggers <ebiggers@kernel.org>
To: linux-crypto@vger.kernel.org
Cc: keyrings@vger.kernel.org
Subject: [PATCH 19/20] KEYS: encrypted: use crypto_shash_tfm_digest()
Date: Fri, 1 May 2020 22:31:21 -0700 [thread overview]
Message-ID: <20200502053122.995648-20-ebiggers@kernel.org> (raw)
In-Reply-To: <20200502053122.995648-1-ebiggers@kernel.org>
From: Eric Biggers <ebiggers@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: keyrings@vger.kernel.org
Signed-off-by: Eric Biggers <ebiggers@google.com>
---
security/keys/encrypted-keys/encrypted.c | 18 +++---------------
1 file changed, 3 insertions(+), 15 deletions(-)
diff --git a/security/keys/encrypted-keys/encrypted.c b/security/keys/encrypted-keys/encrypted.c
index f6797ba44bf716..14cf81d1a30b14 100644
--- a/security/keys/encrypted-keys/encrypted.c
+++ b/security/keys/encrypted-keys/encrypted.c
@@ -323,19 +323,6 @@ static struct key *request_user_key(const char *master_desc, const u8 **master_k
return ukey;
}
-static int calc_hash(struct crypto_shash *tfm, u8 *digest,
- const u8 *buf, unsigned int buflen)
-{
- SHASH_DESC_ON_STACK(desc, tfm);
- int err;
-
- desc->tfm = tfm;
-
- err = crypto_shash_digest(desc, buf, buflen, digest);
- shash_desc_zero(desc);
- return err;
-}
-
static int calc_hmac(u8 *digest, const u8 *key, unsigned int keylen,
const u8 *buf, unsigned int buflen)
{
@@ -351,7 +338,7 @@ static int calc_hmac(u8 *digest, const u8 *key, unsigned int keylen,
err = crypto_shash_setkey(tfm, key, keylen);
if (!err)
- err = calc_hash(tfm, digest, buf, buflen);
+ err = crypto_shash_tfm_digest(tfm, buf, buflen, digest);
crypto_free_shash(tfm);
return err;
}
@@ -381,7 +368,8 @@ static int get_derived_key(u8 *derived_key, enum derived_key_type key_type,
memcpy(derived_buf + strlen(derived_buf) + 1, master_key,
master_keylen);
- ret = calc_hash(hash_tfm, derived_key, derived_buf, derived_buf_len);
+ ret = crypto_shash_tfm_digest(hash_tfm, derived_buf, derived_buf_len,
+ derived_key);
kzfree(derived_buf);
return ret;
}
--
2.26.2
next prev parent reply other threads:[~2020-05-02 5:33 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-02 5:31 [PATCH 00/20] crypto: introduce crypto_shash_tfm_digest() Eric Biggers
2020-05-02 5:31 ` [PATCH 01/20] crypto: hash - " Eric Biggers
2020-05-02 5:31 ` [PATCH 02/20] crypto: arm64/aes-glue - use crypto_shash_tfm_digest() Eric Biggers
2020-05-02 5:31 ` [PATCH 03/20] crypto: essiv " Eric Biggers
2020-05-02 5:31 ` [PATCH 04/20] crypto: artpec6 " Eric Biggers
2020-05-02 5:31 ` [PATCH 05/20] crypto: ccp " Eric Biggers
2020-05-07 21:23 ` Tom Lendacky
2020-05-02 5:31 ` [PATCH 06/20] crypto: ccree " Eric Biggers
2020-05-03 14:01 ` Gilad Ben-Yossef
2020-05-02 5:31 ` [PATCH 07/20] crypto: hisilicon/sec2 " Eric Biggers
2020-05-02 5:31 ` [PATCH 08/20] crypto: mediatek " Eric Biggers
2020-05-02 5:31 ` [PATCH 09/20] crypto: n2 " Eric Biggers
2020-05-02 5:31 ` [PATCH 10/20] crypto: omap-sham " Eric Biggers
2020-05-02 5:31 ` [PATCH 11/20] crypto: s5p-sss " Eric Biggers
2020-05-05 14:19 ` Krzysztof Kozlowski
2020-05-02 5:31 ` [PATCH 12/20] nfc: s3fwrn5: " Eric Biggers
2020-05-02 5:31 ` [PATCH 13/20] fscrypt: " Eric Biggers
2020-05-02 5:31 ` [PATCH 14/20] ecryptfs: " Eric Biggers
2020-05-02 5:31 ` [PATCH 15/20] nfsd: " Eric Biggers
2020-05-04 19:09 ` J. Bruce Fields
2020-05-02 5:31 ` [PATCH 16/20] ubifs: " Eric Biggers
2020-05-02 5:31 ` [PATCH 17/20] Bluetooth: " Eric Biggers
2020-05-02 5:31 ` [PATCH 18/20] sctp: " Eric Biggers
2020-05-02 5:31 ` Eric Biggers [this message]
2020-05-02 5:31 ` [PATCH 20/20] ASoC: cros_ec_codec: " Eric Biggers
2020-05-02 6:44 ` [PATCH 00/20] crypto: introduce crypto_shash_tfm_digest() Marcel Holtmann
2020-05-03 16:13 ` Ard Biesheuvel
2020-05-08 6:07 ` Herbert Xu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200502053122.995648-20-ebiggers@kernel.org \
--to=ebiggers@kernel.org \
--cc=keyrings@vger.kernel.org \
--cc=linux-crypto@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).