kris/boringssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Drop STRICT_ALIGNMENT code in ofb.c.

Browse Source 
By using memcpy, GCC can already optimise things so that the compiled
code is identical on x86-64. Thus we don't need to worry about having
different versions for platforms with, and without, strict alignment.

(Thanks to Emil Mikulic.)

Change-Id: I08bc5fa9b67aa369be2dd2e29e4229fb5b5ff40c
Reviewed-on: https://boringssl-review.googlesource.com/10381
Commit-Queue: Adam Langley <agl@google.com>
Commit-Queue: David Benjamin <davidben@google.com>
Reviewed-by: David Benjamin <davidben@google.com>
CQ-Verified: CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org>
This commit is contained in:
Adam Langley 2016-08-16 10:56:02 -07:00 committed by CQ bot account: commit-bot@chromium.org
parent 05cad5e00c
commit 7d7afc3b89
1 changed files with 7 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
crypto/modes/ofb.c
View File

@ -49,6 +49,7 @@
#include <openssl/type_check.h>
#include <assert.h>
#include <string.h>
#include "internal.h"
@ -68,27 +69,15 @@ void CRYPTO_ofb128_encrypt(const uint8_t *in, uint8_t *out, size_t len,
n = (n + 1) % 16;
}
#if STRICT_ALIGNMENT
if (((size_t)in | (size_t)out | (size_t)ivec) % sizeof(size_t) != 0) {
size_t l = 0;
while (l < len) {
if (n == 0) {
(*block)(ivec, ivec, key);
}
out[l] = in[l] ^ ivec[n];
++l;
n = (n + 1) % 16;
}
*num = n;
return;
}
#endif
while (len >= 16) {
(*block)(ivec, ivec, key);
for (; n < 16; n += sizeof(size_t)) {
*(size_t *)(out + n) = *(size_t *)(in + n) ^ *(size_t *)(ivec + n);
size_t a, b;
memcpy(&a, in + n, sizeof(size_t));
memcpy(&b, ivec + n, sizeof(size_t));
const size_t c = a ^ b;
memcpy(out + n, &c, sizeof(size_t));
}
len -= 16;
out += 16;