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

… x86-64."

This reverts commit 1a5ad00.

Not all C compilers for i686 support SSE2 by default.

crypto/fipsmodule/aes/aes_nohw.c

@@ -16,13 +16,6 @@
 
 #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)
 #include <emmintrin.h>
 #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
 // |rcon|, stored in a |aes_word_t|.
 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)
   return _mm_set_epi32(0, 0, 0, rcon);
 #else