Clean-up SHA256-based.

* we try to keep ifdef's at one place
* the last real x86 was launched in 2007, while the SHA instructions were
  only introduced in 2013, so IMO we can safely assume that there's no
  need to handle non-x86-64 instruction sets.
* some minor fixes

Signed-off-by: Steffen Jaeckel <s@jaeckel.eu>

Author: sjaeckel

src/hashes/sha2/sha224_desc.c

@@ -72,7 +72,7 @@ static LTC_INLINE int s_sha224_x86_is_supported(void)
         if(regs[0] >= 7) {
            s_x86_cpuid(regs, 1);
            sse2  = ((((unsigned int)(regs[3])) >> 26) & 1u) != 0; /* SSE2,   leaf 1, edx, bit 26 */
-           ssse3 = ((((unsigned int)(regs[2])) >>  9) & 1u) != 0; /* SSES3,  leaf 1, ecx, bit  9 */
+           ssse3 = ((((unsigned int)(regs[2])) >>  9) & 1u) != 0; /* SSSE3,  leaf 1, ecx, bit  9 */
            sse41 = ((((unsigned int)(regs[2])) >> 19) & 1u) != 0; /* SSE4.1, leaf 1, ecx, bit 19 */
            s_x86_cpuid(regs, 7);
            sha = ((((unsigned int)(regs[1])) >> 29) & 1u) != 0; /* SHA, leaf 7, ebx, bit 29 */

src/hashes/sha2/sha224_x86.c

@@ -7,7 +7,7 @@
 
 #include "tomcrypt_private.h"
 
-#if defined(LTC_SHA224) && defined(LTC_SHA256)
+#if defined(LTC_SHA224) && defined(LTC_SHA256) && defined(LTC_SHA224_X86)
 
 const struct ltc_hash_descriptor sha224_x86_desc =
 {

src/hashes/sha2/sha256_desc.c

@@ -67,7 +67,7 @@ static LTC_INLINE int s_sha256_x86_is_supported(void)
         if(regs[0] >= 7) {
            s_x86_cpuid(regs, 1);
            sse2  = ((((unsigned int)(regs[3])) >> 26) & 1u) != 0; /* SSE2,   leaf 1, edx, bit 26 */
-           ssse3 = ((((unsigned int)(regs[2])) >>  9) & 1u) != 0; /* SSES3,  leaf 1, ecx, bit  9 */
+           ssse3 = ((((unsigned int)(regs[2])) >>  9) & 1u) != 0; /* SSSE3,  leaf 1, ecx, bit  9 */
            sse41 = ((((unsigned int)(regs[2])) >> 19) & 1u) != 0; /* SSE4.1, leaf 1, ecx, bit 19 */
            s_x86_cpuid(regs, 7);
            sha = ((((unsigned int)(regs[1])) >> 29) & 1u) != 0; /* SHA, leaf 7, ebx, bit 29 */

src/hashes/sha2/sha256_x86.c

@@ -7,7 +7,7 @@
   SHA256 by Marek Knapek
 */
 
-#ifdef LTC_SHA1_X86
+#if defined(LTC_SHA256) && defined(LTC_SHA256_X86)
 
 #if defined __GNUC__
 #pragma GCC diagnostic push

src/headers/tomcrypt_cfg.h

@@ -314,6 +314,12 @@ typedef unsigned long ltc_mp_digit;
    #if !defined(LTC_NO_SHA1_X86)
       #define LTC_SHA1_X86
    #endif
+   #if !defined(LTC_NO_SHA224_X86)
+      #define LTC_SHA224_X86
+   #endif
+   #if !defined(LTC_NO_SHA256_X86)
+      #define LTC_SHA256_X86
+   #endif
 #endif
 
 #if defined(__GNUC__)

src/headers/tomcrypt_custom.h

@@ -95,13 +95,7 @@
    #define LTC_SHA512_224
    #define LTC_SHA384
    #define LTC_SHA256
-   #if defined LTC_ARCH_X86 || defined LTC_ARCH_X64
-      #define LTC_SHA256_X86
-   #endif
    #define LTC_SHA224
-   #if defined LTC_ARCH_X86 || defined LTC_ARCH_X64
-      #define LTC_SHA224_X86
-   #endif
    #define LTC_HASH_HELPERS
 
    #define LTC_NO_MACS
@@ -274,13 +268,7 @@
 #define LTC_SHA512_224
 #define LTC_SHA384
 #define LTC_SHA256
-#if defined LTC_ARCH_X86 || defined LTC_ARCH_X64
-   #define LTC_SHA256_X86
-#endif
 #define LTC_SHA224
-#if defined LTC_ARCH_X86 || defined LTC_ARCH_X64
-   #define LTC_SHA224_X86
-#endif
 #define LTC_TIGER
 #define LTC_SHA1
 #define LTC_MD5

src/headers/tomcrypt_hash.h

@@ -362,7 +362,7 @@ int sha512_256_init(hash_state * md);
 int sha512_256_done(hash_state * md, unsigned char *out);
 int sha512_256_test(void);
 extern const struct ltc_hash_descriptor sha512_256_desc;
-#endif
+#endif /* LTC_SHA512_256 */
 
 #ifdef LTC_SHA512_224
 #ifndef LTC_SHA512
@@ -373,9 +373,15 @@ int sha512_224_init(hash_state * md);
 int sha512_224_done(hash_state * md, unsigned char *out);
 int sha512_224_test(void);
 extern const struct ltc_hash_descriptor sha512_224_desc;
-#endif
+#endif /* LTC_SHA512_224 */
 
 #ifdef LTC_SHA256
+int sha256_init(hash_state * md);
+int sha256_process(hash_state * md, const unsigned char *in, unsigned long inlen);
+int sha256_done(hash_state * md, unsigned char *out);
+int sha256_test(void);
+extern const struct ltc_hash_descriptor sha256_desc;
+
 int sha256_c_init(hash_state * md);
 int sha256_c_process(hash_state * md, const unsigned char *in, unsigned long inlen);
 int sha256_c_done(hash_state * md, unsigned char *out);
@@ -388,18 +394,19 @@ int sha256_x86_process(hash_state * md, const unsigned char *in, unsigned long i
 int sha256_x86_done(hash_state * md, unsigned char *out);
 int sha256_x86_test(void);
 extern const struct ltc_hash_descriptor sha256_x86_desc;
-#endif
-
-int sha256_init(hash_state * md);
-int sha256_process(hash_state * md, const unsigned char *in, unsigned long inlen);
-int sha256_done(hash_state * md, unsigned char *out);
-int sha256_test(void);
-extern const struct ltc_hash_descriptor sha256_desc;
+#endif /* LTC_SHA256_X86 */
+#endif /* LTC_SHA256 */
 
 #ifdef LTC_SHA224
 #ifndef LTC_SHA256
    #error LTC_SHA256 is required for LTC_SHA224
 #endif
+int sha224_init(hash_state * md);
+#define sha224_process sha256_process
+int sha224_done(hash_state * md, unsigned char *out);
+int sha224_test(void);
+extern const struct ltc_hash_descriptor sha224_desc;
+
 int sha224_c_init(hash_state * md);
 #define sha224_c_process sha256_c_process
 int sha224_c_done(hash_state * md, unsigned char *out);
@@ -412,15 +419,8 @@ int sha224_x86_init(hash_state * md);
 int sha224_x86_done(hash_state * md, unsigned char *out);
 int sha224_x86_test(void);
 extern const struct ltc_hash_descriptor sha224_x86_desc;
-#endif
-
-int sha224_init(hash_state * md);
-#define sha224_process sha256_process
-int sha224_done(hash_state * md, unsigned char *out);
-int sha224_test(void);
-extern const struct ltc_hash_descriptor sha224_desc;
-#endif
-#endif
+#endif /* LTC_SHA224_X86 */
+#endif /* LTC_SHA224 */
 
 #ifdef LTC_SHA1
 int sha1_init(hash_state * md);