Commit 58010fa6 authored Oct 11, 2016 by Ard Biesheuvel Committed by Herbert Xu Oct 21, 2016

crypto: arm/aes-ce - fix for big endian

The AES key schedule generation is mostly endian agnostic, with the
exception of the rotation and the incorporation of the round constant
at the start of each round. So implement a big endian specific version
of that part to make the whole routine big endian compatible.

Fixes: 86464859 ("crypto: arm - AES in ECB/CBC/CTR/XTS modes using ARMv8 Crypto Extensions")
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

parent caf4b9e2

arch/arm/crypto/aes-ce-glue.c

+5 −0

Original line number	Diff line number	Diff line
		@@ -88,8 +88,13 @@ static int ce_aes_expandkey(struct crypto_aes_ctx ctx, const u8 in_key,
		u32 rki = ctx->key_enc + (i kwords);
		u32 *rko = rki + kwords;

		#ifndef CONFIG_CPU_BIG_ENDIAN
		rko[0] = ror32(ce_aes_sub(rki[kwords - 1]), 8);
		rko[0] = rko[0] ^ rki[0] ^ rcon[i];
		#else
		rko[0] = rol32(ce_aes_sub(rki[kwords - 1]), 8);
		rko[0] = rko[0] ^ rki[0] ^ (rcon[i] << 24);
		#endif
		rko[1] = rko[0] ^ rki[1];
		rko[2] = rko[1] ^ rki[2];
		rko[3] = rko[2] ^ rki[3];

Admin message