[PATCH 2/8] Disable GCM and AES-NI assembly implementations for WIN64

[Jussi Kivilinna]

* cipher/cipher-internal.h (GCM_USE_INTEL_PCLMUL): Do not enable when
__WIN64__ defined.
* cipher/rijndael-internal.h (USE_AESNI): Ditto.
--

Signed-off-by: Jussi Kivilinna <jussi.kivilinna at iki.fi>
---
 cipher/cipher-internal.h   |    4 +++-
 cipher/rijndael-internal.h |    4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/cipher/cipher-internal.h b/cipher/cipher-internal.h
index e20ea56..693f218 100644
--- a/cipher/cipher-internal.h
+++ b/cipher/cipher-internal.h
@@ -67,7 +67,9 @@
 #if defined(ENABLE_PCLMUL_SUPPORT) && defined(GCM_USE_TABLES)
 # if ((defined(__i386__) && SIZEOF_UNSIGNED_LONG == 4) || defined(__x86_64__))
 #  if __GNUC__ >= 4
-#   define GCM_USE_INTEL_PCLMUL 1
+#   ifndef __WIN64__
+#    define GCM_USE_INTEL_PCLMUL 1
+#   endif
 #  endif
 # endif
 #endif /* GCM_USE_INTEL_PCLMUL */
diff --git a/cipher/rijndael-internal.h b/cipher/rijndael-internal.h
index 854980b..bd247a9 100644
--- a/cipher/rijndael-internal.h
+++ b/cipher/rijndael-internal.h
@@ -75,7 +75,9 @@
 #ifdef ENABLE_AESNI_SUPPORT
 # if ((defined (__i386__) && SIZEOF_UNSIGNED_LONG == 4) || defined(__x86_64__))
 #  if __GNUC__ >= 4
-#   define USE_AESNI 1
+#   ifndef __WIN64__
+#    define USE_AESNI 1
+#   endif
 #  endif
 # endif
 #endif /* ENABLE_AESNI_SUPPORT */