summaryrefslogtreecommitdiffstats
path: root/crypto/aes
diff options
context:
space:
mode:
authorAndy Polyakov <appro@openssl.org>2004-07-17 12:55:55 +0000
committerAndy Polyakov <appro@openssl.org>2004-07-17 12:55:55 +0000
commite34794dd1b4899843a45a06f0c7c2249577eea67 (patch)
tree2a7bb0f41f7f053eccfece279ea2cb8538dd8c47 /crypto/aes
parent0210065bbdffe0418c19c9015c984476c1d66d71 (diff)
IA-64 is intolerant to misaligned access. It was a problem on Win64 as
we were mislead by _MSC_VER macro, which is defined by *all* Windows Microsoft compilers.
Diffstat (limited to 'crypto/aes')
-rw-r--r--crypto/aes/aes_locl.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/aes/aes_locl.h b/crypto/aes/aes_locl.h
index f290946058..4184729e34 100644
--- a/crypto/aes/aes_locl.h
+++ b/crypto/aes/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)); }