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

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 44 matching lines @@
                                       size_t* output_length,
                                       size_t max_output_length) {
   if (ciphertext.length() < auth_tag_size_) {
     return false;
   }
 
   uint8_t nonce[sizeof(nonce_prefix_) + sizeof(packet_number)];
   const size_t nonce_size = nonce_prefix_size_ + sizeof(packet_number);
   DCHECK_LE(nonce_size, sizeof(nonce));
   memcpy(nonce, 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 + nonce_prefix_size_, &path_id_packet_number,
-           sizeof(path_id_packet_number));
-  } else {
-    memcpy(nonce + nonce_prefix_size_, &packet_number, sizeof(packet_number));
-  }
+  uint64_t path_id_packet_number =
+      QuicUtils::PackPathIdAndPacketNumber(path_id, packet_number);
+  memcpy(nonce + nonce_prefix_size_, &path_id_packet_number,
+         sizeof(path_id_packet_number));
 
   // 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_;
 
   // Import key_ into NSS.
   SECItem key_item;
@@ skipping 47 matching lines @@
 
 StringPiece AeadBaseDecrypter::GetNoncePrefix() const {
   if (nonce_prefix_size_ == 0) {
     return StringPiece();
   }
   return StringPiece(reinterpret_cast<const char*>(nonce_prefix_),
                      nonce_prefix_size_);
 }
 
 }  // namespace net