Update from https://crrev.com/316786

net/quic/crypto/aead_base_decrypter_nss.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/crypto/aead_base_decrypter.h"
 
 #include <pk11pub.h>
 
 #include "base/memory/scoped_ptr.h"
 #include "crypto/scoped_nss_types.h"
@@ skipping 30 matching lines @@
 bool AeadBaseDecrypter::SetNoncePrefix(StringPiece 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 AeadBaseDecrypter::Decrypt(StringPiece nonce,
-                                StringPiece associated_data,
-                                StringPiece ciphertext,
+                                const StringPiece& associated_data,
+                                const StringPiece& ciphertext,
                                 uint8* output,
-                                size_t* output_length) {
+                                size_t* output_length,
+                                size_t max_output_length) {
   if (ciphertext.length() < auth_tag_size_ ||
       nonce.size() != nonce_prefix_size_ + sizeof(QuicPacketSequenceNumber)) {
     return false;
   }
   // NSS 3.14.x incorrectly requires an output buffer at least as long as
   // the ciphertext (NSS bug
   // https://bugzilla.mozilla.org/show_bug.cgi?id= 853674). Fortunately
   // QuicDecrypter::Decrypt() specifies that |output| must be as long as
   // |ciphertext| on entry.
   size_t plaintext_size = ciphertext.length() - auth_tag_size_;
@@ skipping 28 matching lines @@
 
   AeadParams aead_params = {0};
   FillAeadParams(nonce, associated_data, auth_tag_size_, &aead_params);
 
   SECItem param;
   param.type = siBuffer;
   param.data = reinterpret_cast<unsigned char*>(&aead_params.data);
   param.len = aead_params.len;
 
   unsigned int output_len;
-  if (pk11_decrypt_(aead_key.get(), aead_mechanism_, &param,
-                    output, &output_len, ciphertext.length(),
+  if (pk11_decrypt_(aead_key.get(), aead_mechanism_, &param, output,
+                    &output_len, max_output_length,
                     reinterpret_cast<const unsigned char*>(ciphertext.data()),
                     ciphertext.length()) != SECSuccess) {
     return false;
   }
 
   if (output_len != plaintext_size) {
     DVLOG(1) << "Wrong output length";
     return false;
   }
   *output_length = output_len;
   return true;
 }
 
-QuicData* AeadBaseDecrypter::DecryptPacket(
-    QuicPacketSequenceNumber sequence_number,
-    StringPiece associated_data,
-    StringPiece ciphertext) {
+bool AeadBaseDecrypter::DecryptPacket(QuicPacketSequenceNumber sequence_number,
+                                      const StringPiece& associated_data,
+                                      const StringPiece& ciphertext,
+                                      char* output,
+                                      size_t* output_length,
+                                      size_t max_output_length) {
   if (ciphertext.length() < auth_tag_size_) {
-    return nullptr;
+    return false;
   }
-  size_t plaintext_size;
-  scoped_ptr<char[]> plaintext(new char[ciphertext.length()]);
 
   uint8 nonce[sizeof(nonce_prefix_) + sizeof(sequence_number)];
   const size_t nonce_size = nonce_prefix_size_ + sizeof(sequence_number);
   DCHECK_LE(nonce_size, sizeof(nonce));
   memcpy(nonce, nonce_prefix_, nonce_prefix_size_);
   memcpy(nonce + nonce_prefix_size_, &sequence_number, sizeof(sequence_number));
-  if (!Decrypt(StringPiece(reinterpret_cast<char*>(nonce), nonce_size),
-               associated_data, ciphertext,
-               reinterpret_cast<uint8*>(plaintext.get()),
-               &plaintext_size)) {
-    return nullptr;
-  }
-  return new QuicData(plaintext.release(), plaintext_size, true);
+  return Decrypt(StringPiece(reinterpret_cast<char*>(nonce), nonce_size),
+                 associated_data, ciphertext, reinterpret_cast<uint8*>(output),
+                 output_length, max_output_length);
 }
 
 StringPiece AeadBaseDecrypter::GetKey() const {
   return StringPiece(reinterpret_cast<const char*>(key_), key_size_);
 }
 
 StringPiece AeadBaseDecrypter::GetNoncePrefix() const {
   if (nonce_prefix_size_ == 0) {
     return StringPiece();
   }
   return StringPiece(reinterpret_cast<const char*>(nonce_prefix_),
                      nonce_prefix_size_);
 }
 
 }  // namespace net