superrob1500
/
mirror-linux
mirror of https://github.com/torvalds/linux
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

crypto: padlock-sha - Use core import and export for fallback 

As padlock-sha is block-only, it needs to use core import and
export on the fallback.

Also call sha256_block_init instead of sha256_init although this
is harmless as sha256_init doesn't write into the partial block
area.

Fixes: 63dc06cd12 ("crypto: padlock-sha - Use API partial block handling")
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
pull/1250/head
Herbert Xu 2025-05-04 21:33:25 +08:00
parent 88bca957e8
commit 870c1f0dc2
1 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
drivers/crypto/padlock-sha.c
View File

@ -42,27 +42,33 @@ static int padlock_sha1_init(struct shash_desc *desc)
static int padlock_sha256_init(struct shash_desc *desc) static int padlock_sha256_init(struct shash_desc *desc)
{ {
struct sha256_state *sctx = padlock_shash_desc_ctx(desc); struct crypto_sha256_state *sctx = padlock_shash_desc_ctx(desc);
sha256_init(sctx); sha256_block_init(sctx);
return 0; return 0;
} }
static int padlock_sha_update(struct shash_desc *desc, static int padlock_sha_update(struct shash_desc *desc,
const u8 *data, unsigned int length) const u8 *data, unsigned int length)
{ {
struct padlock_sha_ctx *ctx = crypto_shash_ctx(desc->tfm);
u8 *state = padlock_shash_desc_ctx(desc); u8 *state = padlock_shash_desc_ctx(desc);
HASH_REQUEST_ON_STACK(req, ctx->fallback); struct crypto_shash *tfm = desc->tfm;
int remain; int err, remain;
ahash_request_set_callback(req, 0, NULL, NULL); remain = length - round_down(length, crypto_shash_blocksize(tfm));
ahash_request_set_virt(req, data, NULL, length); {
remain = crypto_ahash_import(req, state) ?: struct padlock_sha_ctx *ctx = crypto_shash_ctx(tfm);
crypto_ahash_update(req); HASH_REQUEST_ON_STACK(req, ctx->fallback);
if (remain < 0)
return remain; ahash_request_set_callback(req, 0, NULL, NULL);
return crypto_ahash_export(req, state) ?: remain; ahash_request_set_virt(req, data, NULL, length - remain);
err = crypto_ahash_import_core(req, state) ?:
crypto_ahash_update(req) ?:
crypto_ahash_export_core(req, state);
HASH_REQUEST_ZERO(req);
}
return err ?: remain;
} }
static int padlock_sha_export(struct shash_desc *desc, void *out) static int padlock_sha_export(struct shash_desc *desc, void *out)
@ -101,7 +107,7 @@ static int padlock_sha_finup(struct shash_desc *desc, const u8 *in,
ahash_request_set_callback(req, 0, NULL, NULL); ahash_request_set_callback(req, 0, NULL, NULL);
ahash_request_set_virt(req, in, out, count); ahash_request_set_virt(req, in, out, count);
return crypto_ahash_import(req, padlock_shash_desc_ctx(desc)) ?: return crypto_ahash_import_core(req, padlock_shash_desc_ctx(desc)) ?:
crypto_ahash_finup(req); crypto_ahash_finup(req);
} }
@ -165,7 +171,7 @@ static int padlock_init_tfm(struct crypto_shash *hash)
return PTR_ERR(fallback_tfm); return PTR_ERR(fallback_tfm);
} }
if (crypto_shash_statesize(hash) < if (crypto_shash_statesize(hash) !=
crypto_ahash_statesize(fallback_tfm)) { crypto_ahash_statesize(fallback_tfm)) {
crypto_free_ahash(fallback_tfm); crypto_free_ahash(fallback_tfm);
return -EINVAL; return -EINVAL;