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

Commit 4f1f9522 authored by Ard Biesheuvel's avatar Ard Biesheuvel Committed by Greg Kroah-Hartman
Browse files

crypto: aegis/generic - fix for big endian systems 



commit 4a34e3c2f2f48f47213702a84a123af0fe21ad60 upstream.

Use the correct __le32 annotation and accessors to perform the
single round of AES encryption performed inside the AEGIS transform.
Otherwise, tcrypt reports:

  alg: aead: Test 1 failed on encryption for aegis128-generic
  00000000: 6c 25 25 4a 3c 10 1d 27 2b c1 d4 84 9a ef 7f 6e
  alg: aead: Test 1 failed on encryption for aegis128l-generic
  00000000: cd c6 e3 b8 a0 70 9d 8e c2 4f 6f fe 71 42 df 28
  alg: aead: Test 1 failed on encryption for aegis256-generic
  00000000: aa ed 07 b1 96 1d e9 e6 f2 ed b5 8e 1c 5f dc 1c

Fixes: f606a88e ("crypto: aegis - Add generic AEGIS AEAD implementations")
Cc: <stable@vger.kernel.org> # v4.18+
Signed-off-by: default avatarArd Biesheuvel <ard.biesheuvel@linaro.org>
Reviewed-by: default avatarOndrej Mosnacek <omosnace@redhat.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 964f374b

crypto/aegis.h

+9 −11
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 


union aegis_block {

	__le64 words64[AEGIS_BLOCK_SIZE / sizeof(__le64)];

	u32 words32[AEGIS_BLOCK_SIZE / sizeof(u32)];

	__le32 words32[AEGIS_BLOCK_SIZE / sizeof(__le32)];

	u8 bytes[AEGIS_BLOCK_SIZE];

};
@@ -57,24 +57,22 @@ static void crypto_aegis_aesenc(union aegis_block *dst, 
				const union aegis_block *src,

				const union aegis_block *key)

{

	u32 *d = dst->words32;

	const u8  *s  = src->bytes;

	const u32 *k  = key->words32;

	const u32 *t0 = crypto_ft_tab[0];

	const u32 *t1 = crypto_ft_tab[1];

	const u32 *t2 = crypto_ft_tab[2];

	const u32 *t3 = crypto_ft_tab[3];

	u32 d0, d1, d2, d3;



	d0 = t0[s[ 0]] ^ t1[s[ 5]] ^ t2[s[10]] ^ t3[s[15]] ^ k[0];

	d1 = t0[s[ 4]] ^ t1[s[ 9]] ^ t2[s[14]] ^ t3[s[ 3]] ^ k[1];

	d2 = t0[s[ 8]] ^ t1[s[13]] ^ t2[s[ 2]] ^ t3[s[ 7]] ^ k[2];

	d3 = t0[s[12]] ^ t1[s[ 1]] ^ t2[s[ 6]] ^ t3[s[11]] ^ k[3];

	d0 = t0[s[ 0]] ^ t1[s[ 5]] ^ t2[s[10]] ^ t3[s[15]];

	d1 = t0[s[ 4]] ^ t1[s[ 9]] ^ t2[s[14]] ^ t3[s[ 3]];

	d2 = t0[s[ 8]] ^ t1[s[13]] ^ t2[s[ 2]] ^ t3[s[ 7]];

	d3 = t0[s[12]] ^ t1[s[ 1]] ^ t2[s[ 6]] ^ t3[s[11]];



	d[0] = d0;

	d[1] = d1;

	d[2] = d2;

	d[3] = d3;

	dst->words32[0] = cpu_to_le32(d0) ^ key->words32[0];

	dst->words32[1] = cpu_to_le32(d1) ^ key->words32[1];

	dst->words32[2] = cpu_to_le32(d2) ^ key->words32[2];

	dst->words32[3] = cpu_to_le32(d3) ^ key->words32[3];

}



#endif /* _CRYPTO_AEGIS_H */