Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c013cee9 authored by Ard Biesheuvel's avatar Ard Biesheuvel Committed by Herbert Xu
Browse files

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



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: 53964b9e ("crypto: sha3 - Add SHA-3 hash algorithm")
Signed-off-by: default avatarArd Biesheuvel <ard.biesheuvel@linaro.org>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 9c674e1e

crypto/sha3_generic.c

+3 −2
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
#include <linux/types.h>

#include <crypto/sha3.h>

#include <asm/byteorder.h>

#include <asm/unaligned.h>



#define KECCAK_ROUNDS 24
@@ -149,7 +150,7 @@ static int sha3_update(struct shash_desc *desc, const u8 *data, 
			unsigned int 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);



			done += sctx->rsiz;
@@ -174,7 +175,7 @@ static int sha3_final(struct shash_desc *desc, u8 *out) 
	sctx->buf[sctx->rsiz - 1] |= 0x80;



	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);