From: Richard Henderson <richard.henderson@linaro.org>
To: qemu-devel@nongnu.org
Cc: "Daniel P . Berrangé" <berrange@redhat.com>
Subject: [PULL 06/37] crypto: Add aesdec_ISB_ISR_AK
Date: Sun, 9 Jul 2023 14:59:14 +0100 [thread overview]
Message-ID: <20230709135945.250311-7-richard.henderson@linaro.org> (raw)
In-Reply-To: <20230709135945.250311-1-richard.henderson@linaro.org>
Add a primitive for InvSubBytes + InvShiftRows + AddRoundKey.
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
host/include/generic/host/crypto/aes-round.h | 4 ++
include/crypto/aes-round.h | 21 +++++++++
crypto/aes.c | 45 ++++++++++++++++++++
3 files changed, 70 insertions(+)
diff --git a/host/include/generic/host/crypto/aes-round.h b/host/include/generic/host/crypto/aes-round.h
index c5d8066179..c9b9d732f0 100644
--- a/host/include/generic/host/crypto/aes-round.h
+++ b/host/include/generic/host/crypto/aes-round.h
@@ -13,4 +13,8 @@ void aesenc_SB_SR_AK_accel(AESState *, const AESState *,
const AESState *, bool)
QEMU_ERROR("unsupported accel");
+void aesdec_ISB_ISR_AK_accel(AESState *, const AESState *,
+ const AESState *, bool)
+ QEMU_ERROR("unsupported accel");
+
#endif /* GENERIC_HOST_CRYPTO_AES_ROUND_H */
diff --git a/include/crypto/aes-round.h b/include/crypto/aes-round.h
index b85db1a30e..dcf098b97b 100644
--- a/include/crypto/aes-round.h
+++ b/include/crypto/aes-round.h
@@ -41,4 +41,25 @@ static inline void aesenc_SB_SR_AK(AESState *r, const AESState *st,
}
}
+/*
+ * Perform InvSubBytes + InvShiftRows + AddRoundKey.
+ */
+
+void aesdec_ISB_ISR_AK_gen(AESState *ret, const AESState *st,
+ const AESState *rk);
+void aesdec_ISB_ISR_AK_genrev(AESState *ret, const AESState *st,
+ const AESState *rk);
+
+static inline void aesdec_ISB_ISR_AK(AESState *r, const AESState *st,
+ const AESState *rk, bool be)
+{
+ if (HAVE_AES_ACCEL) {
+ aesdec_ISB_ISR_AK_accel(r, st, rk, be);
+ } else if (HOST_BIG_ENDIAN == be) {
+ aesdec_ISB_ISR_AK_gen(r, st, rk);
+ } else {
+ aesdec_ISB_ISR_AK_genrev(r, st, rk);
+ }
+}
+
#endif /* CRYPTO_AES_ROUND_H */
diff --git a/crypto/aes.c b/crypto/aes.c
index 408d92b81f..90274c3706 100644
--- a/crypto/aes.c
+++ b/crypto/aes.c
@@ -1261,6 +1261,51 @@ void aesenc_SB_SR_AK_genrev(AESState *r, const AESState *s, const AESState *k)
aesenc_SB_SR_AK_swap(r, s, k, true);
}
+/*
+ * Perform InvSubBytes + InvShiftRows + AddRoundKey.
+ */
+static inline void
+aesdec_ISB_ISR_AK_swap(AESState *ret, const AESState *st,
+ const AESState *rk, bool swap)
+{
+ const int swap_b = swap ? 15 : 0;
+ AESState t;
+
+ t.b[swap_b ^ 0x0] = AES_isbox[st->b[swap_b ^ AES_ISH(0x0)]];
+ t.b[swap_b ^ 0x1] = AES_isbox[st->b[swap_b ^ AES_ISH(0x1)]];
+ t.b[swap_b ^ 0x2] = AES_isbox[st->b[swap_b ^ AES_ISH(0x2)]];
+ t.b[swap_b ^ 0x3] = AES_isbox[st->b[swap_b ^ AES_ISH(0x3)]];
+ t.b[swap_b ^ 0x4] = AES_isbox[st->b[swap_b ^ AES_ISH(0x4)]];
+ t.b[swap_b ^ 0x5] = AES_isbox[st->b[swap_b ^ AES_ISH(0x5)]];
+ t.b[swap_b ^ 0x6] = AES_isbox[st->b[swap_b ^ AES_ISH(0x6)]];
+ t.b[swap_b ^ 0x7] = AES_isbox[st->b[swap_b ^ AES_ISH(0x7)]];
+ t.b[swap_b ^ 0x8] = AES_isbox[st->b[swap_b ^ AES_ISH(0x8)]];
+ t.b[swap_b ^ 0x9] = AES_isbox[st->b[swap_b ^ AES_ISH(0x9)]];
+ t.b[swap_b ^ 0xa] = AES_isbox[st->b[swap_b ^ AES_ISH(0xA)]];
+ t.b[swap_b ^ 0xb] = AES_isbox[st->b[swap_b ^ AES_ISH(0xB)]];
+ t.b[swap_b ^ 0xc] = AES_isbox[st->b[swap_b ^ AES_ISH(0xC)]];
+ t.b[swap_b ^ 0xd] = AES_isbox[st->b[swap_b ^ AES_ISH(0xD)]];
+ t.b[swap_b ^ 0xe] = AES_isbox[st->b[swap_b ^ AES_ISH(0xE)]];
+ t.b[swap_b ^ 0xf] = AES_isbox[st->b[swap_b ^ AES_ISH(0xF)]];
+
+ /*
+ * Perform the AddRoundKey with generic vectors.
+ * This may be expanded to either host integer or host vector code.
+ * The key and output endianness match, so no bswap required.
+ */
+ ret->v = t.v ^ rk->v;
+}
+
+void aesdec_ISB_ISR_AK_gen(AESState *r, const AESState *s, const AESState *k)
+{
+ aesdec_ISB_ISR_AK_swap(r, s, k, false);
+}
+
+void aesdec_ISB_ISR_AK_genrev(AESState *r, const AESState *s, const AESState *k)
+{
+ aesdec_ISB_ISR_AK_swap(r, s, k, true);
+}
+
/**
* Expand the cipher key into the encryption key schedule.
*/
--
2.34.1
next prev parent reply other threads:[~2023-07-09 14:04 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-07-09 13:59 [PULL 00/37] crypto: Provide aes-round.h and host accel Richard Henderson
2023-07-09 13:59 ` [PULL 01/37] util: Add cpuinfo-ppc.c Richard Henderson
2023-07-09 13:59 ` [PULL 02/37] tests/multiarch: Add test-aes Richard Henderson
2023-07-09 13:59 ` [PULL 03/37] target/arm: Move aesmc and aesimc tables to crypto/aes.c Richard Henderson
2023-07-09 13:59 ` [PULL 04/37] crypto/aes: Add AES_SH, AES_ISH macros Richard Henderson
2023-07-09 13:59 ` [PULL 05/37] crypto: Add aesenc_SB_SR_AK Richard Henderson
2023-07-09 13:59 ` Richard Henderson [this message]
2023-07-09 13:59 ` [PULL 07/37] crypto: Add aesenc_MC Richard Henderson
2023-07-09 13:59 ` [PULL 08/37] crypto: Add aesdec_IMC Richard Henderson
2023-07-09 13:59 ` [PULL 09/37] crypto: Add aesenc_SB_SR_MC_AK Richard Henderson
2023-07-09 13:59 ` [PULL 10/37] crypto: Add aesdec_ISB_ISR_IMC_AK Richard Henderson
2023-07-09 13:59 ` [PULL 11/37] crypto: Add aesdec_ISB_ISR_AK_IMC Richard Henderson
2023-07-09 13:59 ` [PULL 12/37] host/include/i386: Implement aes-round.h Richard Henderson
2023-07-09 13:59 ` [PULL 13/37] host/include/aarch64: " Richard Henderson
2023-07-09 13:59 ` [PULL 14/37] host/include/ppc: " Richard Henderson
2023-07-09 13:59 ` [PULL 15/37] target/ppc: Use aesenc_SB_SR_AK Richard Henderson
2023-07-09 13:59 ` [PULL 16/37] target/ppc: Use aesdec_ISB_ISR_AK Richard Henderson
2023-07-09 13:59 ` [PULL 17/37] target/ppc: Use aesenc_SB_SR_MC_AK Richard Henderson
2023-07-09 13:59 ` [PULL 18/37] target/ppc: Use aesdec_ISB_ISR_AK_IMC Richard Henderson
2023-07-09 13:59 ` [PULL 19/37] target/i386: Use aesenc_SB_SR_AK Richard Henderson
2023-07-09 13:59 ` [PULL 20/37] target/i386: Use aesdec_ISB_ISR_AK Richard Henderson
2023-07-09 13:59 ` [PULL 21/37] target/i386: Use aesdec_IMC Richard Henderson
2023-07-09 13:59 ` [PULL 22/37] target/i386: Use aesenc_SB_SR_MC_AK Richard Henderson
2023-07-09 13:59 ` [PULL 23/37] target/i386: Use aesdec_ISB_ISR_IMC_AK Richard Henderson
2023-07-09 13:59 ` [PULL 24/37] target/arm: Demultiplex AESE and AESMC Richard Henderson
2023-07-09 13:59 ` [PULL 25/37] target/arm: Use aesenc_SB_SR_AK Richard Henderson
2023-07-09 13:59 ` [PULL 26/37] target/arm: Use aesdec_ISB_ISR_AK Richard Henderson
2023-07-09 13:59 ` [PULL 27/37] target/arm: Use aesenc_MC Richard Henderson
2023-07-09 13:59 ` [PULL 28/37] target/arm: Use aesdec_IMC Richard Henderson
2023-07-09 13:59 ` [PULL 29/37] target/riscv: Use aesenc_SB_SR_AK Richard Henderson
2023-07-09 13:59 ` [PULL 30/37] target/riscv: Use aesdec_ISB_ISR_AK Richard Henderson
2023-07-09 13:59 ` [PULL 31/37] target/riscv: Use aesdec_IMC Richard Henderson
2023-07-09 13:59 ` [PULL 32/37] target/riscv: Use aesenc_SB_SR_MC_AK Richard Henderson
2023-07-09 13:59 ` [PULL 33/37] target/riscv: Use aesdec_ISB_ISR_IMC_AK Richard Henderson
2023-07-09 13:59 ` [PULL 34/37] crypto: Remove AES_shifts, AES_ishifts Richard Henderson
2023-07-09 13:59 ` [PULL 35/37] crypto: Implement aesdec_IMC with AES_imc_rot Richard Henderson
2023-07-09 13:59 ` [PULL 36/37] crypto: Remove AES_imc Richard Henderson
2023-07-09 13:59 ` [PULL 37/37] crypto: Unexport AES_*_rot, AES_TeN, AES_TdN Richard Henderson
2023-07-09 17:30 ` [PULL 00/37] crypto: Provide aes-round.h and host accel Richard Henderson
-- strict thread matches above, loose matches on Subject: below --
2023-07-09 18:28 [PATCH 00/45] linux-user: patch roundup Richard Henderson
2023-07-09 18:28 ` [PULL 06/37] crypto: Add aesdec_ISB_ISR_AK Richard Henderson
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=20230709135945.250311-7-richard.henderson@linaro.org \
--to=richard.henderson@linaro.org \
--cc=berrange@redhat.com \
--cc=qemu-devel@nongnu.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).