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@

1 files changed, 4 insertions, 4 deletions

diff --git a/src/lib/libcrypto/modes/ccm128.c b/src/lib/libcrypto/modes/ccm128.c
index 3ce11d0d98..13bc7adf31 100644
--- a/src/lib/libcrypto/modes/ccm128.c
+++ b/src/lib/libcrypto/modes/ccm128.c
@@ -197,7 +197,7 @@ int CRYPTO_ccm128_encrypt(CCM128_CONTEXT *ctx,
         if (ctx->blocks > (U64(1)<<61)) return -2; /* too much data */
 
         while (len>=16) {
-#if defined(STRICT_ALIGNMENT)
+#ifdef __STRICT_ALIGNMENT
                 union { u64 u[2]; u8 c[16]; } temp;
 
                 memcpy (temp.c,inp,16);
@@ -210,7 +210,7 @@ int CRYPTO_ccm128_encrypt(CCM128_CONTEXT *ctx,
                 (*block)(ctx->cmac.c,ctx->cmac.c,key);
                 (*block)(ctx->nonce.c,scratch.c,key);
                 ctr64_inc(ctx->nonce.c);
-#if defined(STRICT_ALIGNMENT)
+#ifdef __STRICT_ALIGNMENT
                 temp.u[0] ^= scratch.u[0];
                 temp.u[1] ^= scratch.u[1];
                 memcpy(out,temp.c,16);
@@ -268,12 +268,12 @@ int CRYPTO_ccm128_decrypt(CCM128_CONTEXT *ctx,
         if (n!=len) return -1;
 
         while (len>=16) {
-#if defined(STRICT_ALIGNMENT)
+#ifdef __STRICT_ALIGNMENT
                 union { u64 u[2]; u8 c[16]; } temp;
 #endif
                 (*block)(ctx->nonce.c,scratch.c,key);
                 ctr64_inc(ctx->nonce.c);
-#if defined(STRICT_ALIGNMENT)
+#ifdef __STRICT_ALIGNMENT
                 memcpy (temp.c,inp,16);
                 ctx->cmac.u[0] ^= (scratch.u[0] ^= temp.u[0]);
                 ctx->cmac.u[1] ^= (scratch.u[1] ^= temp.u[1]);