feedc0de/wolfssl
1
0
Fork 0
forked from wolfSSL/wolfssl
Code Pull Requests Activity

Merge pull request #3526 from SparkiDev/aes_prefetch

Browse Source 
AES: When not X86_64, PreFetch*() not used
This commit is contained in:
toddouska
2020-12-02 13:28:58 -08:00
committed by GitHub
parent d75a983766 3d9b4f10f0
commit 36b73b738b
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
wolfcrypt/src/aes.c
View File

@ -1648,6 +1648,7 @@ static word32 inv_col_mul(word32 t, int i9, int ib, int id, int ie)
#endif #endif
#ifndef WC_NO_CACHE_RESISTANT
#ifndef WOLFSSL_AES_SMALL_TABLES #ifndef WOLFSSL_AES_SMALL_TABLES
/* load 4 Te Tables into cache by cache line stride */ /* load 4 Te Tables into cache by cache line stride */
static WC_INLINE word32 PreFetchTe(void) static WC_INLINE word32 PreFetchTe(void)
@ -1676,6 +1677,7 @@ static WC_INLINE word32 PreFetchSBox(void)
return x; return x;
} }
#endif #endif
#endif
/* Software AES - ECB Encrypt */ /* Software AES - ECB Encrypt */
static void wc_AesEncrypt(Aes* aes, const byte* inBlock, byte* outBlock) static void wc_AesEncrypt(Aes* aes, const byte* inBlock, byte* outBlock)
@ -1775,7 +1777,7 @@ static void wc_AesEncrypt(Aes* aes, const byte* inBlock, byte* outBlock)
s3 ^= rk[3]; s3 ^= rk[3];
#ifndef WOLFSSL_AES_SMALL_TABLES #ifndef WOLFSSL_AES_SMALL_TABLES
#ifdef WOLFSSL_X86_64_BUILD #ifndef WC_NO_CACHE_RESISTANT
s0 |= PreFetchTe(); s0 |= PreFetchTe();
#endif #endif
@ -1905,7 +1907,7 @@ static void wc_AesEncrypt(Aes* aes, const byte* inBlock, byte* outBlock)
(Te[1][GETBYTE(t2, 0)] & 0x000000ff) ^ (Te[1][GETBYTE(t2, 0)] & 0x000000ff) ^
rk[3]; rk[3];
#else #else
#ifdef WOLFSSL_X86_64_BUILD #ifndef WC_NO_CACHE_RESISTANT
s0 |= PreFetchSBox(); s0 |= PreFetchSBox();
#endif #endif
@ -2005,6 +2007,7 @@ static void wc_AesEncrypt(Aes* aes, const byte* inBlock, byte* outBlock)
#if (defined(HAVE_AES_CBC) && !defined(WOLFSSL_DEVCRYPTO_CBC)) || \ #if (defined(HAVE_AES_CBC) && !defined(WOLFSSL_DEVCRYPTO_CBC)) || \
defined(WOLFSSL_AES_DIRECT) defined(WOLFSSL_AES_DIRECT)
#ifndef WC_NO_CACHE_RESISTANT
#ifndef WOLFSSL_AES_SMALL_TABLES #ifndef WOLFSSL_AES_SMALL_TABLES
/* load 4 Td Tables into cache by cache line stride */ /* load 4 Td Tables into cache by cache line stride */
static WC_INLINE word32 PreFetchTd(void) static WC_INLINE word32 PreFetchTd(void)
@ -2033,6 +2036,7 @@ static WC_INLINE word32 PreFetchTd4(void)
} }
return x; return x;
} }
#endif
/* Software AES - ECB Decrypt */ /* Software AES - ECB Decrypt */
static void wc_AesDecrypt(Aes* aes, const byte* inBlock, byte* outBlock) static void wc_AesDecrypt(Aes* aes, const byte* inBlock, byte* outBlock)
@ -2107,7 +2111,7 @@ static void wc_AesDecrypt(Aes* aes, const byte* inBlock, byte* outBlock)
s3 ^= rk[3]; s3 ^= rk[3];
#ifndef WOLFSSL_AES_SMALL_TABLES #ifndef WOLFSSL_AES_SMALL_TABLES
#ifdef WOLFSSL_X86_64_BUILD #ifndef WC_NO_CACHE_RESISTANT
s0 |= PreFetchTd(); s0 |= PreFetchTd();
#endif #endif
@ -2212,7 +2216,7 @@ static void wc_AesDecrypt(Aes* aes, const byte* inBlock, byte* outBlock)
* map cipher state to byte array block: * map cipher state to byte array block:
*/ */
#ifdef WOLFSSL_X86_64_BUILD #ifndef WC_NO_CACHE_RESISTANT
t0 |= PreFetchTd4(); t0 |= PreFetchTd4();
#endif #endif
@ -2241,7 +2245,7 @@ static void wc_AesDecrypt(Aes* aes, const byte* inBlock, byte* outBlock)
((word32)Td4[GETBYTE(t0, 0)]) ^ ((word32)Td4[GETBYTE(t0, 0)]) ^
rk[3]; rk[3];
#else #else
#ifdef WOLFSSL_X86_64_BUILD #ifndef WC_NO_CACHE_RESISTANT
s0 |= PreFetchTd4(); s0 |= PreFetchTd4();
#endif #endif