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

net/quic/crypto/chacha20_poly1305_decrypter_test.cc

 // Copyright 2014 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/chacha20_poly1305_decrypter.h"
 
 #include "net/quic/quic_flags.h"
 #include "net/quic/test_tools/quic_test_utils.h"
 
 using base::StringPiece;
@@ skipping 64 matching lines @@
 QuicData* DecryptWithNonce(ChaCha20Poly1305Decrypter* decrypter,
                            StringPiece nonce,
                            StringPiece associated_data,
                            StringPiece ciphertext) {
   QuicPathId path_id = kDefaultPathId;
   QuicPacketNumber packet_number;
   StringPiece nonce_prefix(nonce.data(), nonce.size() - sizeof(packet_number));
   decrypter->SetNoncePrefix(nonce_prefix);
   memcpy(&packet_number, nonce.data() + nonce_prefix.size(),
          sizeof(packet_number));
-  if (FLAGS_quic_include_path_id_in_iv) {
-    path_id = static_cast<QuicPathId>(
-        packet_number >> 8 * (sizeof(packet_number) - sizeof(path_id)));
-    packet_number &= UINT64_C(0x00FFFFFFFFFFFFFF);
-  }
+  path_id = static_cast<QuicPathId>(
+      packet_number >> 8 * (sizeof(packet_number) - sizeof(path_id)));
+  packet_number &= UINT64_C(0x00FFFFFFFFFFFFFF);
   scoped_ptr<char[]> output(new char[ciphertext.length()]);
   size_t output_length = 0;
   const bool success = decrypter->DecryptPacket(
       path_id, packet_number, associated_data, ciphertext, output.get(),
       &output_length, ciphertext.length());
   if (!success) {
     return nullptr;
   }
   return new QuicData(output.release(), output_length, true);
 }
@@ skipping 31 matching lines @@
     EXPECT_TRUE(has_pt);
 
     ASSERT_EQ(pt.length(), decrypted->length());
     test::CompareCharArraysWithHexError("plaintext", decrypted->data(),
                                         pt.length(), pt.data(), pt.length());
   }
 }
 
 }  // namespace test
 }  // namespace net