commit 4e1571dc4ef65f3f945843af9e4412f5d70979c2
author David Benjamin <davidben@google.com> Tue Dec 10 21:14:12 2024 -0500
committer Boringssl LUCI CQ <boringssl-scoped@luci-project-accounts.iam.gserviceaccount.com> Wed Dec 11 09:30:07 2024 -0800
tree 3c6f6bd70f6ff80dc72fbd8956cf544db18de594
parent 8e07cc4d884ccd2381938e309cd5c86a0c1b8cc8

Work around issue with GCC 8.5 and earlier

For some reason, GCC 8.5 is unable to recognize this as constructing a
span. Stashing the initializer list into an array first seems to avoid
the issue.

Change-Id: I0a50a732d5ecd370d5eee4e722001d8e198e90d0
Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/74147
Commit-Queue: Adam Langley <agl@google.com>
Auto-Submit: David Benjamin <davidben@google.com>
Reviewed-by: Adam Langley <agl@google.com>

ssl/tls_record.cc

diff --git a/ssl/tls_record.cc b/ssl/tls_record.cc
index 996ca18..7a02883 100644
--- a/ssl/tls_record.cc
+++ b/ssl/tls_record.cc
@@ -246,10 +246,11 @@
   *out_consumed = in.size() - CBS_len(&cbs);
 
   // In TLS 1.3, during the handshake, skip ChangeCipherSpec records.
+  static const uint8_t kChangeCipherSpec[] = {SSL3_MT_CCS};
   if (ssl_has_final_version(ssl) &&
       ssl_protocol_version(ssl) >= TLS1_3_VERSION && SSL_in_init(ssl) &&
       type == SSL3_RT_CHANGE_CIPHER_SPEC &&
-      Span<const uint8_t>(body) == Span<const uint8_t>({SSL3_MT_CCS})) {
+      Span<const uint8_t>(body) == kChangeCipherSpec) {
     ssl->s3->empty_record_count++;
     if (ssl->s3->empty_record_count > kMaxEmptyRecords) {
       OPENSSL_PUT_ERROR(SSL, SSL_R_TOO_MANY_EMPTY_FRAGMENTS);