Land Recent QUIC changes.

net/quic/crypto/aes_128_gcm_12_encrypter_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/aes_128_gcm_12_encrypter.h"
 
 #include <nss.h>
 #include <pk11pub.h>
 #include <secerr.h>
 
@@ skipping 232 matching lines @@
   for (unsigned int i = 0; i < Aes128Gcm12Encrypter::kAuthTagSize; i++) {
     out[output_len + i] ^= tag_mask[i];
   }
 
   *out_len = output_len + Aes128Gcm12Encrypter::kAuthTagSize;
   return SECSuccess;
 }
 
 }  // namespace
 
-Aes128Gcm12Encrypter::Aes128Gcm12Encrypter() {
+Aes128Gcm12Encrypter::Aes128Gcm12Encrypter() : last_seq_num_(0) {
   ignore_result(g_gcm_support_checker.Get());
 }
 
 Aes128Gcm12Encrypter::~Aes128Gcm12Encrypter() {}
 
 // static
 bool Aes128Gcm12Encrypter::IsSupported() {
   // NSS 3.15 supports CKM_AES_GCM directly.
   // NSS 3.14 supports CKM_AES_CTR, which can be used to emulate CKM_AES_GCM.
   // Versions earlier than NSS 3.14 are not supported.
@@ skipping 79 matching lines @@
   return true;
 }
 
 QuicData* Aes128Gcm12Encrypter::EncryptPacket(
     QuicPacketSequenceNumber sequence_number,
     StringPiece associated_data,
     StringPiece plaintext) {
   size_t ciphertext_size = GetCiphertextSize(plaintext.length());
   scoped_ptr<char[]> ciphertext(new char[ciphertext_size]);
 
+  if (last_seq_num_ != 0 && sequence_number <= last_seq_num_) {
+    DLOG(FATAL) << "Sequence numbers regressed";
+    return NULL;
+  }
+  last_seq_num_ = sequence_number;
+
   uint8 nonce[kNoncePrefixSize + sizeof(sequence_number)];
   COMPILE_ASSERT(sizeof(nonce) == kAESNonceSize, bad_sequence_number_size);
   memcpy(nonce, nonce_prefix_, kNoncePrefixSize);
   memcpy(nonce + kNoncePrefixSize, &sequence_number, sizeof(sequence_number));
   if (!Encrypt(StringPiece(reinterpret_cast<char*>(nonce), sizeof(nonce)),
                associated_data, plaintext,
                reinterpret_cast<unsigned char*>(ciphertext.get()))) {
     return NULL;
   }
 
@@ skipping 19 matching lines @@
 StringPiece Aes128Gcm12Encrypter::GetKey() const {
   return StringPiece(reinterpret_cast<const char*>(key_), sizeof(key_));
 }
 
 StringPiece Aes128Gcm12Encrypter::GetNoncePrefix() const {
   return StringPiece(reinterpret_cast<const char*>(nonce_prefix_),
                      kNoncePrefixSize);
 }
 
 }  // namespace net