diff options
| author | Elena Petrova | 2019-05-28 16:35:06 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2019-07-26 09:14:19 +0200 |
| commit | eb99c084da2801d35108d6f80b8ac666f141c56b (patch) | |
| tree | 8549c7935ba7c70f7d8b9feb1df301e64187aeda /arch/arm64/crypto | |
| parent | crypto: arm64/sha1-ce - correct digest for empty data in finup (diff) | |
| download | kernel-qcow2-linux-eb99c084da2801d35108d6f80b8ac666f141c56b.tar.gz kernel-qcow2-linux-eb99c084da2801d35108d6f80b8ac666f141c56b.tar.xz kernel-qcow2-linux-eb99c084da2801d35108d6f80b8ac666f141c56b.zip | |
crypto: arm64/sha2-ce - correct digest for empty data in finup
commit 6bd934de1e393466b319d29c4427598fda096c57 upstream.
The sha256-ce finup implementation for ARM64 produces wrong digest
for empty input (len=0). Expected: the actual digest, result: initial
value of SHA internal state. The error is in sha256_ce_finup:
for empty data `finalize` will be 1, so the code is relying on
sha2_ce_transform to make the final round. However, in
sha256_base_do_update, the block function will not be called when
len == 0.
Fix it by setting finalize to 0 if data is empty.
Fixes: 03802f6a80b3a ("crypto: arm64/sha2-ce - move SHA-224/256 ARMv8 implementation to base layer")
Cc: stable@vger.kernel.org
Signed-off-by: Elena Petrova <lenaptr@google.com>
Reviewed-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/arm64/crypto')
| -rw-r--r-- | arch/arm64/crypto/sha2-ce-glue.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm64/crypto/sha2-ce-glue.c b/arch/arm64/crypto/sha2-ce-glue.c index 261f5195cab7..c47d1a28ff6b 100644 --- a/arch/arm64/crypto/sha2-ce-glue.c +++ b/arch/arm64/crypto/sha2-ce-glue.c @@ -59,7 +59,7 @@ static int sha256_ce_finup(struct shash_desc *desc, const u8 *data, unsigned int len, u8 *out) { struct sha256_ce_state *sctx = shash_desc_ctx(desc); - bool finalize = !sctx->sst.count && !(len % SHA256_BLOCK_SIZE); + bool finalize = !sctx->sst.count && !(len % SHA256_BLOCK_SIZE) && len; if (!may_use_simd()) { if (len) |