yggdrasil/ring
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "AES: Use SSE2-based implementation as the fallback on x86 and x86-64."

Browse Source 
This reverts commit 1a5ad00222405b8e64ee322c61942bdd63cc1e29.

Not all C compilers for i686 support SSE2 by default.
This commit is contained in:
Brian Smith 2023-10-01 23:06:57 -07:00
parent edf5830cb2
commit 3d993da504
1 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
crypto/fipsmodule/aes/aes_nohw.c
View File

@ -16,13 +16,6 @@
#include "../../internal.h" #include "../../internal.h"
#if defined(OPENSSL_X86) || defined(OPENSSL_X86_64)
#define OPENSSL_SSE2
#if defined(__GNUC__) || defined(__clang__)
#pragma GCC diagnostic ignored "-Wsign-conversion"
#endif
#endif
#if defined(OPENSSL_SSE2) #if defined(OPENSSL_SSE2)
#include <emmintrin.h> #include <emmintrin.h>
#endif #endif
@ -790,7 +783,7 @@ static const uint8_t aes_nohw_rcon[10] = {0x01, 0x02, 0x04, 0x08, 0x10,
// aes_nohw_rcon_slice returns the |i|th group of |AES_NOHW_BATCH_SIZE| bits in // aes_nohw_rcon_slice returns the |i|th group of |AES_NOHW_BATCH_SIZE| bits in
// |rcon|, stored in a |aes_word_t|. // |rcon|, stored in a |aes_word_t|.
static inline aes_word_t aes_nohw_rcon_slice(uint8_t rcon, size_t i) { static inline aes_word_t aes_nohw_rcon_slice(uint8_t rcon, size_t i) {
rcon = (uint8_t) ((rcon >> (i * AES_NOHW_BATCH_SIZE)) & ((1 << AES_NOHW_BATCH_SIZE) - 1)); rcon = (rcon >> (i * AES_NOHW_BATCH_SIZE)) & ((1 << AES_NOHW_BATCH_SIZE) - 1);
#if defined(OPENSSL_SSE2) #if defined(OPENSSL_SSE2)
return _mm_set_epi32(0, 0, 0, rcon); return _mm_set_epi32(0, 0, 0, rcon);
#else #else