commit 14308731e5446a73ac2258688a9688b524483cb6
author Adam Langley <agl@google.com> Fri Jul 14 16:51:39 2017 -0700
committer Adam Langley <agl@google.com> Fri Jul 14 23:56:12 2017 +0000
tree c65049b8fb9a24fa361e3193a3f5a78bf2263263
parent a3d76d019fcf30f8486192d4c7587f6bcc253b51

Disable record splitting in fuzzer mode.

Record splitting is a send-side only behaviour and supporting it in
fuzzer mode was messy.

Change-Id: I406d2cc77f1d83ed2039a85b95acdfbc815f5a44
Reviewed-on: https://boringssl-review.googlesource.com/17944
Reviewed-by: Adam Langley <agl@google.com>

ssl/tls_record.cc

diff --git a/ssl/tls_record.cc b/ssl/tls_record.cc
index 28ffb4e..4708296 100644
--- a/ssl/tls_record.cc
+++ b/ssl/tls_record.cc
@@ -139,10 +139,14 @@
 /* ssl_needs_record_splitting returns one if |ssl|'s current outgoing cipher
  * state needs record-splitting and zero otherwise. */
 static int ssl_needs_record_splitting(const SSL *ssl) {
+#if !defined(BORINGSSL_UNSAFE_FUZZER_MODE)
   return ssl->s3->aead_write_ctx != NULL &&
          ssl->s3->aead_write_ctx->version < TLS1_1_VERSION &&
          (ssl->mode & SSL_MODE_CBC_RECORD_SPLITTING) != 0 &&
          SSL_CIPHER_is_block_cipher(ssl->s3->aead_write_ctx->cipher);
+#else
+  return 0;
+#endif
 }
 
 int ssl_record_sequence_update(uint8_t *seq, size_t seq_len) {
@@ -467,11 +471,9 @@
 
     size_t split_record_len = prefix_len + 1 + split_suffix_len;
 
-#if !defined(BORINGSSL_UNSAFE_FUZZER_MODE)
     assert(SSL3_RT_HEADER_LENGTH + ssl_cipher_get_record_split_len(
                                        ssl->s3->aead_write_ctx->cipher) ==
            split_record_len);
-#endif
 
     /* Write the n-1-byte fragment. The header gets split between |out_prefix|
      * (header[:-1]) and |out| (header[-1:]). */