Snapshot of all changes to get jumbo in blink and content.

net/quic/core/crypto/aead_base_encrypter.cc

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/quic/core/crypto/aead_base_encrypter.h"
 
 #include <string>
 
 #include "net/quic/core/quic_utils.h"
 #include "net/quic/platform/api/quic_aligned.h"
 #include "net/quic/platform/api/quic_logging.h"
 #include "third_party/boringssl/src/include/openssl/err.h"
 #include "third_party/boringssl/src/include/openssl/evp.h"
 
 namespace net {
 
 namespace {
 
 // The maximum size in bytes of the nonce, including 8 bytes of sequence number.
 // ChaCha20 uses only the 8 byte sequence number and AES-GCM uses 12 bytes.
 const size_t kMaxNonceSize = 12;
 
 // In debug builds only, log OpenSSL error stack. Then clear OpenSSL error
 // stack.
-void DLogOpenSslErrors() {
+void DLogOpenSslErrors2() {
 #ifdef NDEBUG
   while (ERR_get_error()) {
   }
 #else
   while (unsigned long error = ERR_get_error()) {
     char buf[120];
     ERR_error_string_n(error, buf, arraysize(buf));
     QUIC_DLOG(ERROR) << "OpenSSL error: " << buf;
   }
 #endif
@@ skipping 20 matching lines @@
   DCHECK_EQ(key.size(), key_size_);
   if (key.size() != key_size_) {
     return false;
   }
   memcpy(key_, key.data(), key.size());
 
   EVP_AEAD_CTX_cleanup(ctx_.get());
 
   if (!EVP_AEAD_CTX_init(ctx_.get(), aead_alg_, key_, key_size_, auth_tag_size_,
                          nullptr)) {
-    DLogOpenSslErrors();
+    DLogOpenSslErrors2();
     return false;
   }
 
   return true;
 }
 
 bool AeadBaseEncrypter::SetNoncePrefix(QuicStringPiece nonce_prefix) {
   DCHECK_EQ(nonce_prefix.size(), nonce_prefix_size_);
   if (nonce_prefix.size() != nonce_prefix_size_) {
     return false;
   }
   memcpy(nonce_prefix_, nonce_prefix.data(), nonce_prefix.size());
   return true;
 }
 
 bool AeadBaseEncrypter::Encrypt(QuicStringPiece nonce,
                                 QuicStringPiece associated_data,
                                 QuicStringPiece plaintext,
                                 unsigned char* output) {
   DCHECK_EQ(nonce.size(), nonce_prefix_size_ + sizeof(QuicPacketNumber));
 
   size_t ciphertext_len;
   if (!EVP_AEAD_CTX_seal(
           ctx_.get(), output, &ciphertext_len,
           plaintext.size() + auth_tag_size_,
           reinterpret_cast<const uint8_t*>(nonce.data()), nonce.size(),
           reinterpret_cast<const uint8_t*>(plaintext.data()), plaintext.size(),
           reinterpret_cast<const uint8_t*>(associated_data.data()),
           associated_data.size())) {
-    DLogOpenSslErrors();
+    DLogOpenSslErrors2();
     return false;
   }
 
   return true;
 }
 
 bool AeadBaseEncrypter::EncryptPacket(QuicVersion /*version*/,
                                       QuicPacketNumber packet_number,
                                       QuicStringPiece associated_data,
                                       QuicStringPiece plaintext,
@@ skipping 42 matching lines @@
 
 QuicStringPiece AeadBaseEncrypter::GetNoncePrefix() const {
   if (nonce_prefix_size_ == 0) {
     return QuicStringPiece();
   }
   return QuicStringPiece(reinterpret_cast<const char*>(nonce_prefix_),
                          nonce_prefix_size_);
 }
 
 }  // namespace net