[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 35/39] crypto: Move SM4_SBOXWORD from target/riscv
From: |
Lawrence Hunter |
Subject: |
[PATCH 35/39] crypto: Move SM4_SBOXWORD from target/riscv |
Date: |
Thu, 2 Feb 2023 12:42:26 +0000 |
From: Max Chou <max.chou@sifive.com>
- Share SM4_SBOXWORD between target/riscv and target/arm.
Signed-off-by: Max Chou <max.chou@sifive.com>
Reviewed-by: Frank Chang <frank.chang@sifive.com>
---
include/crypto/sm4.h | 7 +++++++
target/arm/crypto_helper.c | 10 ++--------
2 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/include/crypto/sm4.h b/include/crypto/sm4.h
index 9bd3ebc62e..33478562a4 100644
--- a/include/crypto/sm4.h
+++ b/include/crypto/sm4.h
@@ -1,6 +1,13 @@
#ifndef QEMU_SM4_H
#define QEMU_SM4_H
+#define SM4_SBOXWORD(WORD) ( \
+ sm4_sbox[((WORD) >> 24) & 0xff] << 24 | \
+ sm4_sbox[((WORD) >> 16) & 0xff] << 16 | \
+ sm4_sbox[((WORD) >> 8) & 0xff] << 8 | \
+ sm4_sbox[((WORD) >> 0) & 0xff] << 0 \
+)
+
extern const uint8_t sm4_sbox[256];
#endif
diff --git a/target/arm/crypto_helper.c b/target/arm/crypto_helper.c
index d28690321f..4e97af9879 100644
--- a/target/arm/crypto_helper.c
+++ b/target/arm/crypto_helper.c
@@ -707,10 +707,7 @@ static void do_crypto_sm4e(uint64_t *rd, uint64_t *rn,
uint64_t *rm)
CR_ST_WORD(d, (i + 3) % 4) ^
CR_ST_WORD(n, i);
- t = sm4_sbox[t & 0xff] |
- sm4_sbox[(t >> 8) & 0xff] << 8 |
- sm4_sbox[(t >> 16) & 0xff] << 16 |
- sm4_sbox[(t >> 24) & 0xff] << 24;
+ t = SM4_SBOXWORD(t);
CR_ST_WORD(d, i) ^= t ^ rol32(t, 2) ^ rol32(t, 10) ^ rol32(t, 18) ^
rol32(t, 24);
@@ -744,10 +741,7 @@ static void do_crypto_sm4ekey(uint64_t *rd, uint64_t *rn,
uint64_t *rm)
CR_ST_WORD(d, (i + 3) % 4) ^
CR_ST_WORD(m, i);
- t = sm4_sbox[t & 0xff] |
- sm4_sbox[(t >> 8) & 0xff] << 8 |
- sm4_sbox[(t >> 16) & 0xff] << 16 |
- sm4_sbox[(t >> 24) & 0xff] << 24;
+ t = SM4_SBOXWORD(t);
CR_ST_WORD(d, i) ^= t ^ rol32(t, 13) ^ rol32(t, 23);
}
--
2.39.1
- Re: [PATCH 02/39] target/riscv: Add vclmul.vv decoding, translation and execution support, (continued)
- [PATCH 13/39] target/riscv: Add vaesef.vs decoding, translation and execution support, Lawrence Hunter, 2023/02/02
- [PATCH 14/39] target/riscv: Add vaesdf.vv decoding, translation and execution support, Lawrence Hunter, 2023/02/02
- [PATCH 18/39] target/riscv: Add vaesz.vs decoding, translation and execution support, Lawrence Hunter, 2023/02/02
- [PATCH 19/39] target/riscv: Add vaesem.vv decoding, translation and execution support, Lawrence Hunter, 2023/02/02
- [PATCH 24/39] target/riscv: add zvknh cpu properties, Lawrence Hunter, 2023/02/02
- [PATCH 39/39] target/riscv: Expose Zvksed property, Lawrence Hunter, 2023/02/02
- [PATCH 34/39] target/riscv: expose zvkg cpu property, Lawrence Hunter, 2023/02/02
- [PATCH 31/39] target/riscv: expose zvksh cpu property, Lawrence Hunter, 2023/02/02
- [PATCH 32/39] target/riscv: add zvkg cpu property, Lawrence Hunter, 2023/02/02
- [PATCH 35/39] crypto: Move SM4_SBOXWORD from target/riscv,
Lawrence Hunter <=
- [PATCH 38/39] target/riscv: Add Zvksed support, Lawrence Hunter, 2023/02/02
- [PATCH 30/39] target/riscv: Add vsm3c.vi decoding, translation and execution support, Lawrence Hunter, 2023/02/02