summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto/sha
diff options
context:
space:
mode:
authormiod <>2014-05-07 22:05:48 +0000
committermiod <>2014-05-07 22:05:48 +0000
commit93133951820983264b9940472403df1d23e0ccb3 (patch)
treedeb34c5a4686fe5f3219b9c2cc98fdf18af20a2d /src/lib/libcrypto/sha
parent1033579538b02fb6eceb7cca5d8777292e7fe6b4 (diff)
downloadopenbsd-93133951820983264b9940472403df1d23e0ccb3.tar.gz
openbsd-93133951820983264b9940472403df1d23e0ccb3.tar.bz2
openbsd-93133951820983264b9940472403df1d23e0ccb3.zip
Get __STRICT_ALIGNMENT from <machine/endian.h> and decide upon it, rather
than defining it for not (i386 and amd64 (and sometimes s390)) only. Compile-time tests remain compile-time tests, and runtime-test remain runtime-test instead of being converted to compile-time tests, per matthew@'s explicit demand (rationale: this makes sure the compiler checks your code even if you won't run it). No functional change except on s390 (which we don't run on) and vax (which we run on, but noone cares about) ok matthew@
Diffstat (limited to 'src/lib/libcrypto/sha')
-rw-r--r--src/lib/libcrypto/sha/sha512.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/src/lib/libcrypto/sha/sha512.c b/src/lib/libcrypto/sha/sha512.c
index d8fa933cde..e05718d0a8 100644
--- a/src/lib/libcrypto/sha/sha512.c
+++ b/src/lib/libcrypto/sha/sha512.c
@@ -53,10 +53,7 @@
53 53
54const char SHA512_version[]="SHA-512" OPENSSL_VERSION_PTEXT; 54const char SHA512_version[]="SHA-512" OPENSSL_VERSION_PTEXT;
55 55
56#if defined(__i386) || defined(__i386__) || defined(_M_IX86) || \ 56#if !defined(__STRICT_ALIGNMENT) || defined(SHA512_ASM)
57 defined(__x86_64) || defined(_M_AMD64) || defined(_M_X64) || \
58 defined(__s390__) || defined(__s390x__) || \
59 defined(SHA512_ASM)
60#define SHA512_BLOCK_CAN_MANAGE_UNALIGNED_DATA 57#define SHA512_BLOCK_CAN_MANAGE_UNALIGNED_DATA
61#endif 58#endif
62 59