| commit | c9abfe422b3e387555f922dfcc280299b6e92975 | [log] [tgz] |
|---|---|---|
| author | Robert Sloan <varomodt@google.com> | Mon Nov 26 12:19:07 2018 -0800 |
| committer | Rob Sloan <varomodt@google.com> | Mon Nov 26 23:57:37 2018 +0000 |
| tree | d14d7f9ab8183be8607f208257356c192b4773a0 | |
| parent | a51059f202525842fc0d628a408ad5a5e33a54e7 [diff] [blame] |
external/boringssl: Sync to 9113e0996fd445ce187ae9dfeabfc95805b947a2. This includes the following changes: https://boringssl.googlesource.com/boringssl/+log/fa3aadcd40ec4fd27a6e9492ef099b3dcc6eb2af..9113e0996fd445ce187ae9dfeabfc95805b947a2 Test: atest CtsLibcoreTestCases Change-Id: I31ed8a7c9481e7b42f0454f0ee64c26e17a85d52
diff --git a/src/crypto/cipher_extra/e_aesccm.c b/src/crypto/cipher_extra/e_aesccm.c index 37a9add..3e18659 100644 --- a/src/crypto/cipher_extra/e_aesccm.c +++ b/src/crypto/cipher_extra/e_aesccm.c
@@ -33,13 +33,13 @@ CCM128_CONTEXT ccm; }; -OPENSSL_COMPILE_ASSERT(sizeof(((EVP_AEAD_CTX *)NULL)->state) >= - sizeof(struct aead_aes_ccm_ctx), - AEAD_state_too_small); +OPENSSL_STATIC_ASSERT(sizeof(((EVP_AEAD_CTX *)NULL)->state) >= + sizeof(struct aead_aes_ccm_ctx), + "AEAD state is too small"); #if defined(__GNUC__) || defined(__clang__) -OPENSSL_COMPILE_ASSERT(alignof(union evp_aead_ctx_st_state) >= - alignof(struct aead_aes_ccm_ctx), - AEAD_state_insufficient_alignment); +OPENSSL_STATIC_ASSERT(alignof(union evp_aead_ctx_st_state) >= + alignof(struct aead_aes_ccm_ctx), + "AEAD state has insufficient alignment"); #endif static int aead_aes_ccm_init(EVP_AEAD_CTX *ctx, const uint8_t *key,