Backport of http://cvs.openssl.org/chngview?cn=12449, essentially

a bug-fix for Win64/ia64.

diff --git a/fips/aes/fingerprint.sha1 b/fips/aes/fingerprint.sha1
index 969c5b300db8f169a99dbcdcf8d4a2b1fc9d5b08..33eafc782021ff1891598c7a8d8f79939d700aad 100644 (file)
--- a/fips/aes/fingerprint.sha1
+++ b/fips/aes/fingerprint.sha1
@@ -1,3 +1,3 @@
 HMAC-SHA1(fips_aes_core.c)= b70bbbd675efe0613da0d57055310926a0104d55
 HMAC-SHA1(fips_aes_selftest.c)= 98b01502221e7fe529fd981222f2cbb52eb4cbe0
-HMAC-SHA1(fips_aes_locl.h)= ded58f0cda8cb967dc5f5f3a860601c0b8744623
+HMAC-SHA1(fips_aes_locl.h)= a98eb0aa449f1d95b8064e261b2ac2b1f328685e

diff --git a/fips/aes/fips_aes_locl.h b/fips/aes/fips_aes_locl.h
index f290946058eb1247800f65aae6c238d1ff0a29a1..4184729e344d9d97c73f8a5102d8fee0ca6c1866 100644 (file)
--- a/fips/aes/fips_aes_locl.h
+++ b/fips/aes/fips_aes_locl.h
@@ -62,7 +62,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#if defined(_MSC_VER) && !defined(OPENSSL_SYS_WINCE)
+#if defined(_MSC_VER) && !defined(_M_IA64) && !defined(OPENSSL_SYS_WINCE)
 # define SWAP(x) (_lrotl(x, 8) & 0x00ff00ff | _lrotr(x, 8) & 0xff00ff00)
 # define GETU32(p) SWAP(*((u32 *)(p)))
 # define PUTU32(ct, st) { *((u32 *)(ct)) = SWAP((st)); }