Fix unterminated clang-format off. We should probably ponder what to do about clang-format. That we disagree on chains of && is a little annoying, but peppering the code with clang-format off seems problematic. Change-Id: I0547e4e41817e8c0b585d5fabe759ef25ed00cf7 Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/42264 Reviewed-by: Adam Langley <agl@google.com>
diff --git a/ssl/tls_record.cc b/ssl/tls_record.cc index 464c5c5..acff1ad 100644 --- a/ssl/tls_record.cc +++ b/ssl/tls_record.cc
@@ -447,13 +447,15 @@ // TLS 1.3 adds an extra byte for encrypted record type. extra_in_len = 1; } - if (type == SSL3_RT_APPLICATION_DATA && // clang-format off + // clang-format off + if (type == SSL3_RT_APPLICATION_DATA && in_len > 1 && ssl_needs_record_splitting(ssl)) { // With record splitting enabled, the first byte gets sealed into a separate // record which is written into the prefix. in_len -= 1; } + // clang-format on return ssl->s3->aead_write_ctx->SuffixLen(out_suffix_len, in_len, extra_in_len); } @@ -465,8 +467,8 @@ // |tls_seal_scatter_record| implements TLS 1.0 CBC 1/n-1 record splitting and // may write two records concatenated. static bool tls_seal_scatter_record(SSL *ssl, uint8_t *out_prefix, uint8_t *out, - uint8_t *out_suffix, uint8_t type, - const uint8_t *in, size_t in_len) { + uint8_t *out_suffix, uint8_t type, + const uint8_t *in, size_t in_len) { if (type == SSL3_RT_APPLICATION_DATA && in_len > 1 && ssl_needs_record_splitting(ssl)) { assert(ssl->s3->aead_write_ctx->ExplicitNonceLen() == 0);