Commit ce8e0488 authored by Eric Biggers's avatar Eric Biggers Committed by Herbert Xu

crypto: n2 - use crypto_shash_tfm_digest()

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.
Signed-off-by: default avatarEric Biggers <ebiggers@google.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent e0077ea8
...@@ -462,7 +462,6 @@ static int n2_hmac_async_setkey(struct crypto_ahash *tfm, const u8 *key, ...@@ -462,7 +462,6 @@ static int n2_hmac_async_setkey(struct crypto_ahash *tfm, const u8 *key,
struct n2_hmac_ctx *ctx = crypto_ahash_ctx(tfm); struct n2_hmac_ctx *ctx = crypto_ahash_ctx(tfm);
struct crypto_shash *child_shash = ctx->child_shash; struct crypto_shash *child_shash = ctx->child_shash;
struct crypto_ahash *fallback_tfm; struct crypto_ahash *fallback_tfm;
SHASH_DESC_ON_STACK(shash, child_shash);
int err, bs, ds; int err, bs, ds;
fallback_tfm = ctx->base.fallback_tfm; fallback_tfm = ctx->base.fallback_tfm;
...@@ -470,14 +469,12 @@ static int n2_hmac_async_setkey(struct crypto_ahash *tfm, const u8 *key, ...@@ -470,14 +469,12 @@ static int n2_hmac_async_setkey(struct crypto_ahash *tfm, const u8 *key,
if (err) if (err)
return err; return err;
shash->tfm = child_shash;
bs = crypto_shash_blocksize(child_shash); bs = crypto_shash_blocksize(child_shash);
ds = crypto_shash_digestsize(child_shash); ds = crypto_shash_digestsize(child_shash);
BUG_ON(ds > N2_HASH_KEY_MAX); BUG_ON(ds > N2_HASH_KEY_MAX);
if (keylen > bs) { if (keylen > bs) {
err = crypto_shash_digest(shash, key, keylen, err = crypto_shash_tfm_digest(child_shash, key, keylen,
ctx->hash_key); ctx->hash_key);
if (err) if (err)
return err; return err;
keylen = ds; keylen = ds;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment