sha512ni_is_supported

Author: MarekKnapek

src/hashes/sha2/sha512_desc.c

@@ -7,27 +7,7 @@
    SHA512 by Tom St Denis
 */
 
-#ifdef LTC_SHA512
-
-const struct ltc_hash_descriptor sha512_desc =
-{
-    "sha512",
-    5,
-    64,
-    128,
-
-    /* OID */
-   { 2, 16, 840, 1, 101, 3, 4, 2, 3,  },
-   9,
-
-    &sha512_init,
-    &sha512_process,
-    &sha512_done,
-    &sha512_test,
-    NULL
-};
-
-#if defined LTC_SHA512_X86
+#if defined LTC_ARCH_X86
 
 #if !defined (LTC_S_X86_CPUID)
 #define LTC_S_X86_CPUID
@@ -54,6 +34,7 @@ static LTC_INLINE void s_x86_cpuid(int* regs, int leaf)
 #endif
 }
 #endif /* LTC_S_X86_CPUID */
+
 #if !defined (LTC_S_X86_CPUIDEX)
 #define LTC_S_X86_CPUIDEX
 #if defined _MSC_VER
@@ -109,7 +90,37 @@ static LTC_INLINE int s_sha512_x86_is_supported(void)
     }
     return is_supported;
 }
-#endif /* LTC_SHA512_X86 */
+
+#endif /* LTC_ARCH_X86 */
+
+int sha512ni_is_supported(void)
+{
+#ifdef LTC_ARCH_X86
+   return s_sha512_x86_is_supported();
+#else
+   return 0;
+#endif
+}
+
+#ifdef LTC_SHA512
+
+const struct ltc_hash_descriptor sha512_desc =
+{
+    "sha512",
+    5,
+    64,
+    128,
+
+    /* OID */
+   { 2, 16, 840, 1, 101, 3, 4, 2, 3,  },
+   9,
+
+    &sha512_init,
+    &sha512_process,
+    &sha512_done,
+    &sha512_test,
+    NULL
+};
 
 /**
    Initialize the hash state

src/headers/tomcrypt_hash.h

@@ -433,6 +433,7 @@ extern const struct ltc_hash_descriptor sha512_224_x86_desc;
 #endif /* LTC_SHA512_224 */
 
 int shani_is_supported(void);
+int sha512ni_is_supported(void);
 
 #ifdef LTC_SHA256
 int sha256_init(hash_state * md);

tests/cipher_hash_test.c

@@ -60,6 +60,20 @@ int cipher_hash_test(void)
    }
 
    /* explicit SHA-NI + portable implementations tests */
+   if (sha512ni_is_supported()) {
+#if defined(LTC_SHA512) && defined(LTC_SHA512_X86)
+      DO(sha512_x86_test());
+#endif
+#if defined(LTC_SHA384) && defined(LTC_SHA384_X86)
+      DO(sha384_x86_test());
+#endif
+#if defined(LTC_SHA512_256) && defined(LTC_SHA512_256_X86)
+      DO(sha512_256_x86_test());
+#endif
+#if defined(LTC_SHA512_224) && defined(LTC_SHA512_224_X86)
+      DO(sha512_224_x86_test());
+#endif
+   }
    if (shani_is_supported()) {
 #if defined(LTC_SHA256) && defined(LTC_SHA256_X86)
       DO(sha256_x86_test());

tests/test.c

@@ -366,7 +366,8 @@ int main(int argc, char **argv)
    printf("LTC_VERSION  = %s\n%s\n\n", GIT_VERSION, crypt_build_settings);
 
    printf("AES-NI CPU support = %d\n", aesni_is_supported());
-   printf("SHA-NI CPU support = %d\n\n", shani_is_supported());
+   printf("SHA-NI CPU support = %d\n", shani_is_supported());
+   printf("SHA-512-NI CPU support = %d\n\n", sha512ni_is_supported());
 
 #ifdef USE_LTM
    mpi_provider = "ltm";