Skip to content

Commit c58a85f

Browse files
aglCQ bot account: commit-bot@chromium.org
authored and
CQ bot account: [email protected]
committed
Drop use of alignas(64) in aead_test.cc
Reportedly, GCC 8 and 9, on aarch64, rejects this with: crypto/cipher_extra/aead_test.cc:545:54: error: requested alignment 64 is larger than 16 [-Werror=attributes] The only other uses of alignas(x), with x > 16, are in x86-64-only code. Change-Id: I1c93732cb40a783c2ef7271b1df9baae644b4305 Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/39224 Commit-Queue: Adam Langley <[email protected]> Commit-Queue: David Benjamin <[email protected]> Reviewed-by: David Benjamin <[email protected]>
1 parent cfd80a9 commit c58a85f

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

crypto/cipher_extra/aead_test.cc

+7-7
Original file line numberDiff line numberDiff line change
@@ -542,10 +542,10 @@ TEST_P(PerAEADTest, AliasedBuffers) {
542542
}
543543

544544
TEST_P(PerAEADTest, UnalignedInput) {
545-
alignas(64) uint8_t key[EVP_AEAD_MAX_KEY_LENGTH + 1];
546-
alignas(64) uint8_t nonce[EVP_AEAD_MAX_NONCE_LENGTH + 1];
547-
alignas(64) uint8_t plaintext[32 + 1];
548-
alignas(64) uint8_t ad[32 + 1];
545+
alignas(16) uint8_t key[EVP_AEAD_MAX_KEY_LENGTH + 1];
546+
alignas(16) uint8_t nonce[EVP_AEAD_MAX_NONCE_LENGTH + 1];
547+
alignas(16) uint8_t plaintext[32 + 1];
548+
alignas(16) uint8_t ad[32 + 1];
549549
OPENSSL_memset(key, 'K', sizeof(key));
550550
OPENSSL_memset(nonce, 'N', sizeof(nonce));
551551
OPENSSL_memset(plaintext, 'P', sizeof(plaintext));
@@ -563,15 +563,15 @@ TEST_P(PerAEADTest, UnalignedInput) {
563563
ASSERT_TRUE(EVP_AEAD_CTX_init_with_direction(
564564
ctx.get(), aead(), key + 1, key_len, EVP_AEAD_DEFAULT_TAG_LENGTH,
565565
evp_aead_seal));
566-
alignas(64) uint8_t ciphertext[sizeof(plaintext) + EVP_AEAD_MAX_OVERHEAD];
566+
alignas(16) uint8_t ciphertext[sizeof(plaintext) + EVP_AEAD_MAX_OVERHEAD];
567567
size_t ciphertext_len;
568568
ASSERT_TRUE(EVP_AEAD_CTX_seal(ctx.get(), ciphertext + 1, &ciphertext_len,
569569
sizeof(ciphertext) - 1, nonce + 1, nonce_len,
570570
plaintext + 1, sizeof(plaintext) - 1, ad + 1,
571571
ad_len));
572572

573573
// It must successfully decrypt.
574-
alignas(64) uint8_t out[sizeof(ciphertext)];
574+
alignas(16) uint8_t out[sizeof(ciphertext)];
575575
ctx.Reset();
576576
ASSERT_TRUE(EVP_AEAD_CTX_init_with_direction(
577577
ctx.get(), aead(), key + 1, key_len, EVP_AEAD_DEFAULT_TAG_LENGTH,
@@ -585,7 +585,7 @@ TEST_P(PerAEADTest, UnalignedInput) {
585585
}
586586

587587
TEST_P(PerAEADTest, Overflow) {
588-
alignas(64) uint8_t key[EVP_AEAD_MAX_KEY_LENGTH];
588+
uint8_t key[EVP_AEAD_MAX_KEY_LENGTH];
589589
OPENSSL_memset(key, 'K', sizeof(key));
590590

591591
bssl::ScopedEVP_AEAD_CTX ctx;

0 commit comments

Comments
 (0)