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

net/quic/crypto/aead_base_decrypter_nss.cc

Index: net/quic/crypto/aead_base_decrypter_nss.cc
diff --git a/net/quic/crypto/aead_base_decrypter_nss.cc b/net/quic/crypto/aead_base_decrypter_nss.cc
index 46228cc056a641ef9e72ddb27316db2a8a851f0b..47878609c0956e29be69da90f84b69c096819cad 100644
--- a/net/quic/crypto/aead_base_decrypter_nss.cc
+++ b/net/quic/crypto/aead_base_decrypter_nss.cc
@@ -62,14 +62,10 @@ bool AeadBaseDecrypter::DecryptPacket(QuicPathId path_id,
   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