Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

crypto: morus/generic - fix for big endian systems

Browse source 
commit 5a8dedfa3276e88c5865f265195d63d72aec3e72 upstream.

Omit the endian swabbing when folding the lengths of the assoc and
crypt input buffers into the state to finalize the tag. This is not
necessary given that the memory representation of the state is in
machine native endianness already.

This fixes an error reported by tcrypt running on a big endian system:

  alg: aead: Test 2 failed on encryption for morus640-generic
  00000000: a8 30 ef fb e6 26 eb 23 b0 87 dd 98 57 f3 e1 4b
  00000010: 21
  alg: aead: Test 2 failed on encryption for morus1280-generic
  00000000: 88 19 1b fb 1c 29 49 0e ee 82 2f cb 97 a6 a5 ee
  00000010: 5f

Fixes: 396be41f16 ("crypto: morus - Add generic MORUS AEAD implementations")
Cc: <stable@vger.kernel.org> # v4.18+
Reviewed-by: Ondrej Mosnacek <omosnace@redhat.com>
Signed-off-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>
This commit is contained in:
Ard Biesheuvel 2018-10-01 10:36:37 +02:00 committed by Greg Kroah-Hartman
parent 0b5fdbbe55
commit 964f374b3b
2 changed files with 6 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
crypto/morus1280.c
View file

@ -385,14 +385,11 @@ static void crypto_morus1280_final(struct morus1280_state *state,
struct morus1280_block *tag_xor, struct morus1280_block *tag_xor,
u64 assoclen, u64 cryptlen) u64 assoclen, u64 cryptlen)
{ {
u64 assocbits = assoclen * 8;
u64 cryptbits = cryptlen * 8;
struct morus1280_block tmp; struct morus1280_block tmp;
unsigned int i; unsigned int i;
tmp.words[0] = cpu_to_le64(assocbits); tmp.words[0] = assoclen * 8;
tmp.words[1] = cpu_to_le64(cryptbits); tmp.words[1] = cryptlen * 8;
tmp.words[2] = 0; tmp.words[2] = 0;
tmp.words[3] = 0; tmp.words[3] = 0;

16
crypto/morus640.c
View file

@ -384,21 +384,13 @@ static void crypto_morus640_final(struct morus640_state *state,
struct morus640_block *tag_xor, struct morus640_block *tag_xor,
u64 assoclen, u64 cryptlen) u64 assoclen, u64 cryptlen)
{ {
u64 assocbits = assoclen * 8;
u64 cryptbits = cryptlen * 8;
u32 assocbits_lo = (u32)assocbits;
u32 assocbits_hi = (u32)(assocbits >> 32);
u32 cryptbits_lo = (u32)cryptbits;
u32 cryptbits_hi = (u32)(cryptbits >> 32);
struct morus640_block tmp; struct morus640_block tmp;
unsigned int i; unsigned int i;
tmp.words[0] = cpu_to_le32(assocbits_lo); tmp.words[0] = lower_32_bits(assoclen * 8);
tmp.words[1] = cpu_to_le32(assocbits_hi); tmp.words[1] = upper_32_bits(assoclen * 8);
tmp.words[2] = cpu_to_le32(cryptbits_lo); tmp.words[2] = lower_32_bits(cryptlen * 8);
tmp.words[3] = cpu_to_le32(cryptbits_hi); tmp.words[3] = upper_32_bits(cryptlen * 8);
for (i = 0; i < MORUS_BLOCK_WORDS; i++) for (i = 0; i < MORUS_BLOCK_WORDS; i++)
state->s[4].words[i] ^= state->s[0].words[i]; state->s[4].words[i] ^= state->s[0].words[i];