Landing Recent QUIC changes until 5:30 PM, Feb 3, 2017 UTC-5

net/quic/core/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/core/crypto/chacha20_poly1305_decrypter.h"
 
 #include <memory>
 
 #include "net/quic/core/quic_utils.h"
 #include "net/quic/platform/api/quic_text_utils.h"
@@ skipping 99 matching lines @@
 
 namespace net {
 namespace test {
 
 // DecryptWithNonce wraps the |Decrypt| method of |decrypter| to allow passing
 // in an nonce and also to allocate the buffer needed for the plaintext.
 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));
-  path_id = static_cast<QuicPathId>(
-      packet_number >> 8 * (sizeof(packet_number) - sizeof(path_id)));
-  packet_number &= UINT64_C(0x00FFFFFFFFFFFFFF);
   std::unique_ptr<char[]> output(new char[ciphertext.length()]);
   size_t output_length = 0;
   const bool success = decrypter->DecryptPacket(
-      QuicVersionMax(), path_id, packet_number, associated_data, ciphertext,
+      QuicVersionMax(), packet_number, associated_data, ciphertext,
       output.get(), &output_length, ciphertext.length());
   if (!success) {
     return nullptr;
   }
   return new QuicData(output.release(), output_length, true);
 }
 
 TEST(ChaCha20Poly1305DecrypterTest, Decrypt) {
   for (size_t i = 0; test_vectors[i].key != nullptr; i++) {
     // If not present then decryption is expected to fail.
@@ skipping 25 matching lines @@
 
     EXPECT_EQ(12u, ct.size() - decrypted->length());
     ASSERT_EQ(pt.length(), decrypted->length());
     test::CompareCharArraysWithHexError("plaintext", decrypted->data(),
                                         pt.length(), pt.data(), pt.length());
   }
 }
 
 }  // namespace test
 }  // namespace net