From 3ae613e34fa3f96c77dbd33aaaf7774d23bda7ca Mon Sep 17 00:00:00 2001 From: Andy Polyakov Date: Mon, 20 Dec 2004 13:10:27 +0000 Subject: [PATCH] Backport of http://cvs.openssl.org/chngview?cn=12449, essentially a bug-fix for Win64/ia64. --- fips/aes/fingerprint.sha1 | 2 +- fips/aes/fips_aes_locl.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/fips/aes/fingerprint.sha1 b/fips/aes/fingerprint.sha1 index 969c5b300d..33eafc7820 100644 --- 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 f290946058..4184729e34 100644 --- a/fips/aes/fips_aes_locl.h +++ b/fips/aes/fips_aes_locl.h @@ -62,7 +62,7 @@ #include #include -#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)); } -- 2.25.1