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

net/quic/core/crypto/crypto_secret_boxer.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/crypto_secret_boxer.h"
 
 #include <memory>
 
 #include "base/logging.h"
 #include "base/strings/string_util.h"
@@ skipping 20 matching lines @@
 
 CryptoSecretBoxer::CryptoSecretBoxer() {}
 
 CryptoSecretBoxer::~CryptoSecretBoxer() {}
 
 // static
 size_t CryptoSecretBoxer::GetKeySize() {
   return kKeySize;
 }
 
-// kAEAD is the AEAD used for boxing: AES-128-GCM-SIV.
-static const EVP_AEAD* (*const kAEAD)() = EVP_aead_aes_128_gcm_siv;
+// kAEAD_fn is the AEAD used for boxing: AES-128-GCM-SIV.
+static const EVP_AEAD* (*const kAEAD_fn)() = EVP_aead_aes_128_gcm_siv;
 
 void CryptoSecretBoxer::SetKeys(const std::vector<string>& keys) {
   DCHECK(!keys.empty());
-  const EVP_AEAD* const aead = kAEAD();
+  const EVP_AEAD* const aead = kAEAD_fn();
   std::unique_ptr<State> new_state(new State);
 
   for (const string& key : keys) {
     DCHECK_EQ(kKeySize, key.size());
     bssl::UniquePtr<EVP_AEAD_CTX> ctx(
         EVP_AEAD_CTX_new(aead, reinterpret_cast<const uint8_t*>(key.data()),
                          key.size(), EVP_AEAD_DEFAULT_TAG_LENGTH));
     if (!ctx) {
       LOG(DFATAL) << "EVP_AEAD_CTX_init failed";
       return;
     }
 
     new_state->ctxs.push_back(std::move(ctx));
   }
 
   QuicWriterMutexLock l(&lock_);
   state_ = std::move(new_state);
 }
 
 string CryptoSecretBoxer::Box(QuicRandom* rand,
                               QuicStringPiece plaintext) const {
   // The box is formatted as:
   //   12 bytes of random nonce
   //   n bytes of ciphertext
   //   16 bytes of authenticator
   size_t out_len =
-      kBoxNonceSize + plaintext.size() + EVP_AEAD_max_overhead(kAEAD());
+      kBoxNonceSize + plaintext.size() + EVP_AEAD_max_overhead(kAEAD_fn());
 
   string ret;
   uint8_t* out = reinterpret_cast<uint8_t*>(base::WriteInto(&ret, out_len + 1));
 
   // Write kBoxNonceSize bytes of random nonce to the beginning of the output
   // buffer.
   rand->RandBytes(out, kBoxNonceSize);
   const uint8_t* const nonce = out;
   out += kBoxNonceSize;
   out_len -= kBoxNonceSize;
@@ skipping 38 matching lines @@
                           nullptr, 0)) {
       *out = QuicStringPiece(out_storage->data(), bytes_written);
       return true;
     }
   }
 
   return false;
 }
 
 }  // namespace net