From: ard.biesheuvel@linaro.org (Ard Biesheuvel)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v2 8/8] crypto: arm/aes-ce - fix for big endian
Date: Tue, 11 Oct 2016 19:15:20 +0100 [thread overview]
Message-ID: <1476209720-21114-9-git-send-email-ard.biesheuvel@linaro.org> (raw)
In-Reply-To: <1476209720-21114-1-git-send-email-ard.biesheuvel@linaro.org>
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: 86464859cc77 ("crypto: arm - AES in ECB/CBC/CTR/XTS modes using ARMv8 Crypto Extensions")
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
---
arch/arm/crypto/aes-ce-glue.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/arch/arm/crypto/aes-ce-glue.c b/arch/arm/crypto/aes-ce-glue.c
index aef022a87c53..04410d9f5e72 100644
--- a/arch/arm/crypto/aes-ce-glue.c
+++ b/arch/arm/crypto/aes-ce-glue.c
@@ -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];
--
2.7.4
next prev parent reply other threads:[~2016-10-11 18:15 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-10-11 18:15 [PATCH v2 0/8] crypto: ARM/arm64 - big endian fixes Ard Biesheuvel
2016-10-11 18:15 ` [PATCH v2 1/8] crypto: arm64/aes-ce - fix for big endian Ard Biesheuvel
2016-10-11 18:15 ` [PATCH v2 2/8] crypto: arm64/ghash-ce " Ard Biesheuvel
2016-10-11 18:15 ` [PATCH v2 3/8] crypto: arm64/sha1-ce " Ard Biesheuvel
2016-10-11 18:15 ` [PATCH v2 4/8] crypto: arm64/sha2-ce " Ard Biesheuvel
2016-10-11 18:15 ` [PATCH v2 5/8] crypto: arm64/aes-ccm-ce: " Ard Biesheuvel
2016-10-11 18:15 ` [PATCH v2 6/8] crypto: arm64/aes-neon - " Ard Biesheuvel
2016-10-11 18:15 ` [PATCH v2 7/8] crypto: arm64/aes-xts-ce: " Ard Biesheuvel
2016-10-11 18:15 ` Ard Biesheuvel [this message]
2016-10-18 10:55 ` [PATCH v2 0/8] crypto: ARM/arm64 - big endian fixes Ard Biesheuvel
2016-10-18 11:49 ` Catalin Marinas
2016-10-18 12:14 ` Ard Biesheuvel
2016-10-19 3:03 ` Herbert Xu
2016-10-19 8:46 ` Will Deacon
2016-10-19 8:49 ` Ard Biesheuvel
2016-10-19 9:15 ` Will Deacon
2016-10-21 3:16 ` Herbert Xu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1476209720-21114-9-git-send-email-ard.biesheuvel@linaro.org \
--to=ard.biesheuvel@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).