104306f587
STRICT_ALIGNMENT is a remnant of OpenSSL code would cast pointers to size_t* and load more than one byte at a time. Not all architectures support unaligned access, so it did an alignment check and only enterred this path if aligned or the underlying architecture didn't care. This is UB. Unaligned casts in C are undefined on all architectures, so we switch these to memcpy some time ago. Compilers can optimize memcpy to the unaligned accesses we wanted. That left our modes logic as: - If STRICT_ALIGNMENT is 1 and things are unaligned, work byte-by-byte. - Otherwise, use the memcpy-based word-by-word code, which now works independent of STRICT_ALIGNMENT. Remove the first check to simplify things. On x86, x86_64, and aarch64, STRICT_ALIGNMENT is zero and this is a no-op. ARM is more complex. Per [0], ARMv7 and up support unaligned access. ARMv5 do not. ARMv6 does, but can run in a mode where it looks more like ARMv5. For ARMv7 and up, STRICT_ALIGNMENT should have been zero, but was one. Thus this change should be an improvement for ARMv7 (right now unaligned inputs lose bsaes-armv7). The Android NDK does not even support the pre-ARMv7 ABI anymore[1]. Nonetheless, Cronet still supports ARMv6 as a library. It builds with -march=armv6 which GCC interprets as supporting unaligned access, so it too did not want this code. For completeness, should anyone still care about ARMv5 or be building with an overly permissive -march flag, GCC does appear unable to inline the memcpy calls. However, GCC also does not interpret (uintptr_t)ptr % sizeof(size_t) as an alignment assertion, so such consumers have already been paying for the memcpy here and throughout the library. In general, C's arcane pointer rules mean we must resort to memcpy often, so, realistically, we must require that the compiler optimize memcpy well. [0] https://medium.com/@iLevex/the-curious-case-of-unaligned-access-on-arm-5dd0ebe24965 [1] https://developer.android.com/ndk/guides/abis#armeabi Change-Id: I3c7dea562adaeb663032e395499e69530dd8e145 Reviewed-on: https://boringssl-review.googlesource.com/c/34873 Reviewed-by: Adam Langley <agl@google.com>
168 lines
5.3 KiB
C
168 lines
5.3 KiB
C
/* ====================================================================
|
|
* Copyright (c) 2008 The OpenSSL Project. All rights reserved.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions
|
|
* are met:
|
|
*
|
|
* 1. Redistributions of source code must retain the above copyright
|
|
* notice, this list of conditions and the following disclaimer.
|
|
*
|
|
* 2. Redistributions in binary form must reproduce the above copyright
|
|
* notice, this list of conditions and the following disclaimer in
|
|
* the documentation and/or other materials provided with the
|
|
* distribution.
|
|
*
|
|
* 3. All advertising materials mentioning features or use of this
|
|
* software must display the following acknowledgment:
|
|
* "This product includes software developed by the OpenSSL Project
|
|
* for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
|
|
*
|
|
* 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
|
|
* endorse or promote products derived from this software without
|
|
* prior written permission. For written permission, please contact
|
|
* openssl-core@openssl.org.
|
|
*
|
|
* 5. Products derived from this software may not be called "OpenSSL"
|
|
* nor may "OpenSSL" appear in their names without prior written
|
|
* permission of the OpenSSL Project.
|
|
*
|
|
* 6. Redistributions of any form whatsoever must retain the following
|
|
* acknowledgment:
|
|
* "This product includes software developed by the OpenSSL Project
|
|
* for use in the OpenSSL Toolkit (http://www.openssl.org/)"
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
|
|
* EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
|
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
|
|
* PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE OpenSSL PROJECT OR
|
|
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
|
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
|
|
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
|
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
|
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
|
|
* STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
|
|
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
|
|
* OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
* ==================================================================== */
|
|
|
|
#include <assert.h>
|
|
#include <string.h>
|
|
|
|
#include <openssl/type_check.h>
|
|
|
|
#include "internal.h"
|
|
|
|
|
|
void CRYPTO_cbc128_encrypt(const uint8_t *in, uint8_t *out, size_t len,
|
|
const AES_KEY *key, uint8_t ivec[16],
|
|
block128_f block) {
|
|
size_t n;
|
|
const uint8_t *iv = ivec;
|
|
|
|
assert(key != NULL && ivec != NULL);
|
|
assert(len == 0 || (in != NULL && out != NULL));
|
|
|
|
while (len >= 16) {
|
|
for (n = 0; n < 16; n += sizeof(size_t)) {
|
|
store_word_le(out + n, load_word_le(in + n) ^ load_word_le(iv + n));
|
|
}
|
|
(*block)(out, out, key);
|
|
iv = out;
|
|
len -= 16;
|
|
in += 16;
|
|
out += 16;
|
|
}
|
|
|
|
while (len) {
|
|
for (n = 0; n < 16 && n < len; ++n) {
|
|
out[n] = in[n] ^ iv[n];
|
|
}
|
|
for (; n < 16; ++n) {
|
|
out[n] = iv[n];
|
|
}
|
|
(*block)(out, out, key);
|
|
iv = out;
|
|
if (len <= 16) {
|
|
break;
|
|
}
|
|
len -= 16;
|
|
in += 16;
|
|
out += 16;
|
|
}
|
|
|
|
OPENSSL_memcpy(ivec, iv, 16);
|
|
}
|
|
|
|
void CRYPTO_cbc128_decrypt(const uint8_t *in, uint8_t *out, size_t len,
|
|
const AES_KEY *key, uint8_t ivec[16],
|
|
block128_f block) {
|
|
size_t n;
|
|
union {
|
|
size_t t[16 / sizeof(size_t)];
|
|
uint8_t c[16];
|
|
} tmp;
|
|
|
|
assert(key != NULL && ivec != NULL);
|
|
assert(len == 0 || (in != NULL && out != NULL));
|
|
|
|
const uintptr_t inptr = (uintptr_t) in;
|
|
const uintptr_t outptr = (uintptr_t) out;
|
|
// If |in| and |out| alias, |in| must be ahead.
|
|
assert(inptr >= outptr || inptr + len <= outptr);
|
|
|
|
if ((inptr >= 32 && outptr <= inptr - 32) || inptr < outptr) {
|
|
// If |out| is at least two blocks behind |in| or completely disjoint, there
|
|
// is no need to decrypt to a temporary block.
|
|
OPENSSL_STATIC_ASSERT(16 % sizeof(size_t) == 0,
|
|
"block cannot be evenly divided into words");
|
|
const uint8_t *iv = ivec;
|
|
while (len >= 16) {
|
|
(*block)(in, out, key);
|
|
for (n = 0; n < 16; n += sizeof(size_t)) {
|
|
store_word_le(out + n, load_word_le(out + n) ^ load_word_le(iv + n));
|
|
}
|
|
iv = in;
|
|
len -= 16;
|
|
in += 16;
|
|
out += 16;
|
|
}
|
|
OPENSSL_memcpy(ivec, iv, 16);
|
|
} else {
|
|
OPENSSL_STATIC_ASSERT(16 % sizeof(size_t) == 0,
|
|
"block cannot be evenly divided into words");
|
|
|
|
while (len >= 16) {
|
|
(*block)(in, tmp.c, key);
|
|
for (n = 0; n < 16; n += sizeof(size_t)) {
|
|
size_t c = load_word_le(in + n);
|
|
store_word_le(out + n,
|
|
tmp.t[n / sizeof(size_t)] ^ load_word_le(ivec + n));
|
|
store_word_le(ivec + n, c);
|
|
}
|
|
len -= 16;
|
|
in += 16;
|
|
out += 16;
|
|
}
|
|
}
|
|
|
|
while (len) {
|
|
uint8_t c;
|
|
(*block)(in, tmp.c, key);
|
|
for (n = 0; n < 16 && n < len; ++n) {
|
|
c = in[n];
|
|
out[n] = tmp.c[n] ^ ivec[n];
|
|
ivec[n] = c;
|
|
}
|
|
if (len <= 16) {
|
|
for (; n < 16; ++n) {
|
|
ivec[n] = in[n];
|
|
}
|
|
break;
|
|
}
|
|
len -= 16;
|
|
in += 16;
|
|
out += 16;
|
|
}
|
|
}
|