Landing Recent QUIC changes until 2016-03-15 16:26 UTC

net/quic/crypto/aead_base_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/aead_base_encrypter.h"
 
 #include <pk11pub.h>
 
 #include "base/memory/scoped_ptr.h"
 #include "crypto/scoped_nss_types.h"
@@ skipping 117 matching lines @@
                                       size_t max_output_length) {
   size_t ciphertext_size = GetCiphertextSize(plaintext.length());
   if (max_output_length < ciphertext_size) {
     return false;
   }
   // TODO(ianswett): Introduce a check to ensure that we don't encrypt with the
   // same packet number twice.
   const size_t nonce_size = nonce_prefix_size_ + sizeof(packet_number);
   ALIGNAS(4) char nonce_buffer[kMaxNonceSize];
   memcpy(nonce_buffer, nonce_prefix_, nonce_prefix_size_);
-  if (FLAGS_quic_include_path_id_in_iv) {
-    uint64_t path_id_packet_number =
-        QuicUtils::PackPathIdAndPacketNumber(path_id, packet_number);
-    memcpy(nonce_buffer + nonce_prefix_size_, &path_id_packet_number,
-           sizeof(path_id_packet_number));
-  } else {
-    memcpy(nonce_buffer + nonce_prefix_size_, &packet_number,
-           sizeof(packet_number));
-  }
+  uint64_t path_id_packet_number =
+      QuicUtils::PackPathIdAndPacketNumber(path_id, packet_number);
+  memcpy(nonce_buffer + nonce_prefix_size_, &path_id_packet_number,
+         sizeof(path_id_packet_number));
   if (!Encrypt(StringPiece(nonce_buffer, nonce_size), associated_data,
                plaintext, reinterpret_cast<unsigned char*>(output))) {
     return false;
   }
   *output_length = ciphertext_size;
   return true;
 }
 
 size_t AeadBaseEncrypter::GetKeySize() const {
   return key_size_;
@@ skipping 17 matching lines @@
 
 StringPiece AeadBaseEncrypter::GetNoncePrefix() const {
   if (nonce_prefix_size_ == 0) {
     return StringPiece();
   }
   return StringPiece(reinterpret_cast<const char*>(nonce_prefix_),
                      nonce_prefix_size_);
 }
 
 }  // namespace net