commit d8598ce03fe9294a03f90db9a47ca367564bc47f
author David Benjamin <davidben@google.com> Sat Feb 09 21:50:21 2019 +0000
committer Adam Langley <agl@google.com> Thu Feb 14 17:32:11 2019 +0000
tree d1f176d4fc3a463cd22c2a1aa434dd20dc08c63d
parent 4d8e1ce5e946ac8afc8c4ca29ab39ca690044e96

Remove non-STRICT_ALIGNMENT code from xts.c.

Independent of the underlying CPU architecture, casting unaligned
pointers to uint64_t* is undefined. Just use a memcpy. The compiler
should be able to optimize that itself.

Change-Id: I39210871fca3eaf1f4b1d205b2bb0c337116d9cc
Reviewed-on: https://boringssl-review.googlesource.com/c/34872
Reviewed-by: Adam Langley <agl@google.com>

decrepit/xts/xts.c

diff --git a/decrepit/xts/xts.c b/decrepit/xts/xts.c
index bc2a1b2..a433c3b 100644
--- a/decrepit/xts/xts.c
+++ b/decrepit/xts/xts.c
@@ -80,23 +80,13 @@
   if (!enc && (len % 16)) len -= 16;
 
   while (len >= 16) {
-#if STRICT_ALIGNMENT
     OPENSSL_memcpy(scratch.c, inp, 16);
     scratch.u[0] ^= tweak.u[0];
     scratch.u[1] ^= tweak.u[1];
-#else
-    scratch.u[0] = ((uint64_t *)inp)[0] ^ tweak.u[0];
-    scratch.u[1] = ((uint64_t *)inp)[1] ^ tweak.u[1];
-#endif
     (*ctx->block1)(scratch.c, scratch.c, ctx->key1);
-#if STRICT_ALIGNMENT
     scratch.u[0] ^= tweak.u[0];
     scratch.u[1] ^= tweak.u[1];
     OPENSSL_memcpy(out, scratch.c, 16);
-#else
-    ((uint64_t *)out)[0] = scratch.u[0] ^= tweak.u[0];
-    ((uint64_t *)out)[1] = scratch.u[1] ^= tweak.u[1];
-#endif
     inp += 16;
     out += 16;
     len -= 16;
@@ -134,14 +124,9 @@
     carry = (unsigned int)(tweak.u[0] >> 63);
     tweak1.u[0] = (tweak.u[0] << 1) ^ res;
     tweak1.u[1] = (tweak.u[1] << 1) | carry;
-#if STRICT_ALIGNMENT
     OPENSSL_memcpy(scratch.c, inp, 16);
     scratch.u[0] ^= tweak1.u[0];
     scratch.u[1] ^= tweak1.u[1];
-#else
-    scratch.u[0] = ((uint64_t *)inp)[0] ^ tweak1.u[0];
-    scratch.u[1] = ((uint64_t *)inp)[1] ^ tweak1.u[1];
-#endif
     (*ctx->block1)(scratch.c, scratch.c, ctx->key1);
     scratch.u[0] ^= tweak1.u[0];
     scratch.u[1] ^= tweak1.u[1];
@@ -154,14 +139,9 @@
     scratch.u[0] ^= tweak.u[0];
     scratch.u[1] ^= tweak.u[1];
     (*ctx->block1)(scratch.c, scratch.c, ctx->key1);
-#if STRICT_ALIGNMENT
     scratch.u[0] ^= tweak.u[0];
     scratch.u[1] ^= tweak.u[1];
     OPENSSL_memcpy(out, scratch.c, 16);
-#else
-    ((uint64_t *)out)[0] = scratch.u[0] ^ tweak.u[0];
-    ((uint64_t *)out)[1] = scratch.u[1] ^ tweak.u[1];
-#endif
   }
 
   return 1;