Fix: more thorough SHA-NI check

Previously, the runtime check for SHA-NI did not verify SSE 4.1 support.
This led to SIGILL crashes on older CPUs when encountering the PINSRD
instruction during SHA-1/SHA-2 digest calculation.

Author: rhash

librhash/algorithms.c

@@ -143,7 +143,13 @@ rhash_hash_info rhash_hash_info_default[] =
 #if defined(RHASH_SSE4_SHANI) && !defined(RHASH_DISABLE_SHANI)
 static void table_init_sha_ext(void)
 {
-	if (has_cpu_feature(CPU_FEATURE_SHANI))
+	/* SHA-NI Implementation uses SHANI, SSE2, SSSE3, SSE4.1 instructions.
+	 * Checking for SSE4.1 requires to check for SSSE3, SSE3 and SSE2. */
+	if (has_cpu_feature(CPU_FEATURE_SHANI) &&
+		has_cpu_feature(CPU_FEATURE_SSE2) &&
+		has_cpu_feature(CPU_FEATURE_SSE3) &&
+		has_cpu_feature(CPU_FEATURE_SSSE3) &&
+		has_cpu_feature(CPU_FEATURE_SSE4_1))
 	{
 		assert(rhash_hash_info_default[3].init == (pinit_t)rhash_sha1_init);
 		rhash_hash_info_default[3].update = (pupdate_t)rhash_sha1_ni_update;

librhash/byte_order.c

@@ -255,7 +255,7 @@ void rhash_u32_mem_swap(unsigned* arr, int length)
 
 static uint64_t get_cpuid_features(void)
 {
-	uint32_t cpu_info[4] = {0};
+	uint32_t cpu_info[4] = {0}; /* EAX, EBX, EXC, EDX registers */
 	uint64_t result = 0;
 	/* Request basic CPU functions */
 	RHASH_CPUID(1, cpu_info);

librhash/byte_order.h

@@ -214,6 +214,10 @@ static RHASH_INLINE uint64_t bswap_64(uint64_t x)
 #define ROTL64(qword, n) ((qword) << (n) ^ ((qword) >> (64 - (n))))
 #define ROTR64(qword, n) ((qword) >> (n) ^ ((qword) << (64 - (n))))
 
+#define CPU_FEATURE_SSE2 (26)
+#define CPU_FEATURE_SSE3 (32)
+#define CPU_FEATURE_SSSE3 (41)
+#define CPU_FEATURE_SSE4_1 (51)
 #define CPU_FEATURE_SSE4_2 (52)
 #define CPU_FEATURE_SHANI (29)
 

librhash/crc32.c

@@ -612,7 +612,7 @@ unsigned rhash_crc32c_table[8][256] = { {
 	0xe54c35a1, 0xac704886, 0x7734cfef, 0x3e08b2c8, 0xc451b7cc, 0x8d6dcaeb, 0x56294d82, 0x1f1530a5
 } };
 
-#ifdef HAS_INTEL_CPUID
+#ifdef HAS_GCC_INTEL_CPUID
 static unsigned calculate_crc32c_choose_best(unsigned crcinit, unsigned table[8][256], const unsigned char* msg, size_t size);
 static unsigned calculate_crc32c_sse42(unsigned crcinit, unsigned table[8][256], const unsigned char* msg, size_t size);
 static unsigned (*calculate_crc32c_p)(unsigned crcinit, unsigned table[8][256], const unsigned char* msg, size_t size) = calculate_crc32c_choose_best;

librhash/sha_ni.h

@@ -6,7 +6,7 @@
 # if defined(__GNUC__) && defined(__SHA__)
 #  define RHASH_GCC_SHANI
 /* SHA extensions are supported by Visual Studio >= 2015 */
-# elif (_MSC_VER >= 1900)
+# elif (_MSC_VER >= 1900) && (_M_IX86 || _M_AMD64)
 #  define RHASH_MSVC_SHANI
 # else
 #  define RHASH_DISABLE_SHANI

librhash/test_lib.c

@@ -1586,7 +1586,11 @@ static unsigned find_hash(const char* name)
 static void print_cpu_features(void)
 {
 #if !defined(NO_HAS_CPU_FEATURE)
-	printf("CPU Features:%s%s\n",
+	printf("CPU Features:%s%s%s%s%s%s\n",
+		(rhash_has_cpu_feature(CPU_FEATURE_SSE2) ? " SSE2" : ""),
+		(rhash_has_cpu_feature(CPU_FEATURE_SSE3) ? " SSE3" : ""),
+		(rhash_has_cpu_feature(CPU_FEATURE_SSSE3) ? " SSSE3" : ""),
+		(rhash_has_cpu_feature(CPU_FEATURE_SSE4_1) ? " SSE_4.1" : ""),
 		(rhash_has_cpu_feature(CPU_FEATURE_SSE4_2) ? " SSE_4.2" : ""),
 		(rhash_has_cpu_feature(CPU_FEATURE_SHANI) ? " SHANI" : ""));
 #endif