moonjuice/kernel_arpi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

crypto: sha3-generic - fixes for alignment and big endian operation

Browse Source 
Ensure that the input is byte swabbed before injecting it into the
SHA3 transform. Use the get_unaligned() accessor for this so that
we don't perform unaligned access inadvertently on architectures
that do not support that.

Cc: <stable@vger.kernel.org>
Fixes: 53964b9ee6 ("crypto: sha3 - Add SHA-3 hash algorithm")
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
This commit is contained in:
Ard Biesheuvel
2018-01-19 12:04:33 +00:00
committed by Herbert Xu
parent 9c674e1e2f
commit c013cee99d
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
crypto/sha3_generic.c
View File

@@ -18,6 +18,7 @@
#include <linux/types.h> #include <linux/types.h>
#include <crypto/sha3.h> #include <crypto/sha3.h>
#include <asm/byteorder.h> #include <asm/byteorder.h>
#include <asm/unaligned.h>
#define KECCAK_ROUNDS 24 #define KECCAK_ROUNDS 24
@@ -149,7 +150,7 @@ static int sha3_update(struct shash_desc *desc, const u8 *data,
unsigned int i; unsigned int i;
for (i = 0; i < sctx->rsizw; i++) for (i = 0; i < sctx->rsizw; i++)
sctx->st[i] ^= ((u64 *) src)[i]; sctx->st[i] ^= get_unaligned_le64(src + 8 * i);
keccakf(sctx->st); keccakf(sctx->st);
done += sctx->rsiz; done += sctx->rsiz;
@@ -174,7 +175,7 @@ static int sha3_final(struct shash_desc *desc, u8 *out)
sctx->buf[sctx->rsiz - 1] |= 0x80; sctx->buf[sctx->rsiz - 1] |= 0x80;
for (i = 0; i < sctx->rsizw; i++) for (i = 0; i < sctx->rsizw; i++)
sctx->st[i] ^= ((u64 *) sctx->buf)[i]; sctx->st[i] ^= get_unaligned_le64(sctx->buf + 8 * i);
keccakf(sctx->st); keccakf(sctx->st);