| Message ID | 20230202124230.295997-36-lawrence.hunter@codethink.co.uk |
|---|---|
| State | New |
| Headers | show |
| Series | Add RISC-V vector cryptography extensions | expand |
On 2/2/23 02:42, Lawrence Hunter wrote: > 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]; I think this would be better as an inline function, so that the types are clear. r~
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); }