Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
crypto/aes: Add AES_SH, AES_ISH macros
These macros will constant fold and avoid the indirection through
memory when fully unrolling some new primitives.

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>
  • Loading branch information
rth7680 committed Jul 8, 2023
1 parent fb250c5 commit e20e14d
Showing 1 changed file with 14 additions and 2 deletions.
16 changes: 14 additions & 2 deletions crypto/aes.c
Expand Up @@ -108,12 +108,24 @@ const uint8_t AES_isbox[256] = {
0xE1, 0x69, 0x14, 0x63, 0x55, 0x21, 0x0C, 0x7D,
};

/* AES ShiftRows, for complete unrolling. */
#define AES_SH(X) (((X) * 5) & 15)

const uint8_t AES_shifts[16] = {
0, 5, 10, 15, 4, 9, 14, 3, 8, 13, 2, 7, 12, 1, 6, 11
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] = {
0, 13, 10, 7, 4, 1, 14, 11, 8, 5, 2, 15, 12, 9, 6, 3
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),
};

/*
Expand Down

0 comments on commit e20e14d

Please sign in to comment.