[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 34/37] crypto: Remove AES_shifts, AES_ishifts
From: |
Richard Henderson |
Subject: |
[PULL 34/37] crypto: Remove AES_shifts, AES_ishifts |
Date: |
Sun, 9 Jul 2023 14:59:42 +0100 |
These arrays are no longer used, replaced by AES_SH_*, AES_ISH_*.
Acked-by: Daniel P. Berrangé <berrange@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
include/crypto/aes.h | 4 ----
crypto/aes.c | 14 --------------
2 files changed, 18 deletions(-)
diff --git a/include/crypto/aes.h b/include/crypto/aes.h
index 24b073d569..aa8b54065d 100644
--- a/include/crypto/aes.h
+++ b/include/crypto/aes.h
@@ -30,10 +30,6 @@ void AES_decrypt(const unsigned char *in, unsigned char *out,
extern const uint8_t AES_sbox[256];
extern const uint8_t AES_isbox[256];
-/* AES ShiftRows and InvShiftRows */
-extern const uint8_t AES_shifts[16];
-extern const uint8_t AES_ishifts[16];
-
/* AES MixColumns, for use with rot32. */
extern const uint32_t AES_mc_rot[256];
diff --git a/crypto/aes.c b/crypto/aes.c
index c765f11c1e..00e16d3f92 100644
--- a/crypto/aes.c
+++ b/crypto/aes.c
@@ -114,23 +114,9 @@ const uint8_t AES_isbox[256] = {
/* AES ShiftRows, for complete unrolling. */
#define AES_SH(X) (((X) * 5) & 15)
-const uint8_t AES_shifts[16] = {
- AES_SH(0x0), AES_SH(0x1), AES_SH(0x2), AES_SH(0x3),
- AES_SH(0x4), AES_SH(0x5), AES_SH(0x6), AES_SH(0x7),
- AES_SH(0x8), AES_SH(0x9), AES_SH(0xA), AES_SH(0xB),
- AES_SH(0xC), AES_SH(0xD), AES_SH(0xE), AES_SH(0xF),
-};
-
/* AES InvShiftRows, for complete unrolling. */
#define AES_ISH(X) (((X) * 13) & 15)
-const uint8_t AES_ishifts[16] = {
- AES_ISH(0x0), AES_ISH(0x1), AES_ISH(0x2), AES_ISH(0x3),
- AES_ISH(0x4), AES_ISH(0x5), AES_ISH(0x6), AES_ISH(0x7),
- AES_ISH(0x8), AES_ISH(0x9), AES_ISH(0xA), AES_ISH(0xB),
- AES_ISH(0xC), AES_ISH(0xD), AES_ISH(0xE), AES_ISH(0xF),
-};
-
/*
* MixColumns lookup table, for use with rot32.
*/
--
2.34.1
- [PULL 06/37] crypto: Add aesdec_ISB_ISR_AK, (continued)
- [PULL 06/37] crypto: Add aesdec_ISB_ISR_AK, Richard Henderson, 2023/07/09
- [PULL 12/37] host/include/i386: Implement aes-round.h, Richard Henderson, 2023/07/09
- [PULL 11/37] crypto: Add aesdec_ISB_ISR_AK_IMC, Richard Henderson, 2023/07/09
- [PULL 16/37] target/ppc: Use aesdec_ISB_ISR_AK, Richard Henderson, 2023/07/09
- [PULL 13/37] host/include/aarch64: Implement aes-round.h, Richard Henderson, 2023/07/09
- [PULL 17/37] target/ppc: Use aesenc_SB_SR_MC_AK, Richard Henderson, 2023/07/09
- [PULL 18/37] target/ppc: Use aesdec_ISB_ISR_AK_IMC, Richard Henderson, 2023/07/09
- [PULL 22/37] target/i386: Use aesenc_SB_SR_MC_AK, Richard Henderson, 2023/07/09
- [PULL 24/37] target/arm: Demultiplex AESE and AESMC, Richard Henderson, 2023/07/09
- [PULL 27/37] target/arm: Use aesenc_MC, Richard Henderson, 2023/07/09
- [PULL 34/37] crypto: Remove AES_shifts, AES_ishifts,
Richard Henderson <=
- [PULL 30/37] target/riscv: Use aesdec_ISB_ISR_AK, Richard Henderson, 2023/07/09
- [PULL 35/37] crypto: Implement aesdec_IMC with AES_imc_rot, Richard Henderson, 2023/07/09
- [PULL 31/37] target/riscv: Use aesdec_IMC, Richard Henderson, 2023/07/09
- [PULL 19/37] target/i386: Use aesenc_SB_SR_AK, Richard Henderson, 2023/07/09
- [PULL 21/37] target/i386: Use aesdec_IMC, Richard Henderson, 2023/07/09
- [PULL 23/37] target/i386: Use aesdec_ISB_ISR_IMC_AK, Richard Henderson, 2023/07/09
- [PULL 25/37] target/arm: Use aesenc_SB_SR_AK, Richard Henderson, 2023/07/09
- [PULL 26/37] target/arm: Use aesdec_ISB_ISR_AK, Richard Henderson, 2023/07/09
- [PULL 28/37] target/arm: Use aesdec_IMC, Richard Henderson, 2023/07/09
- [PULL 33/37] target/riscv: Use aesdec_ISB_ISR_IMC_AK, Richard Henderson, 2023/07/09