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

net/quic/core/crypto/quic_decrypter.h

 // Copyright (c) 2012 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.
 
 #ifndef NET_QUIC_CORE_CRYPTO_QUIC_DECRYPTER_H_
 #define NET_QUIC_CORE_CRYPTO_QUIC_DECRYPTER_H_
 
 #include <cstddef>
 #include <cstdint>
 
@@ skipping 49 matching lines @@
 
   // Populates |output| with the decrypted |ciphertext| and populates
   // |output_length| with the length.  Returns 0 if there is an error.
   // |output| size is specified by |max_output_length| and must be
   // at least as large as the ciphertext.  |packet_number| is
   // appended to the |nonce_prefix| value provided in SetNoncePrefix()
   // to form the nonce.
   // TODO(wtc): add a way for DecryptPacket to report decryption failure due
   // to non-authentic inputs, as opposed to other reasons for failure.
   virtual bool DecryptPacket(QuicVersion version,
-                             QuicPathId path_id,
                              QuicPacketNumber packet_number,
                              base::StringPiece associated_data,
                              base::StringPiece ciphertext,
                              char* output,
                              size_t* output_length,
                              size_t max_output_length) = 0;
 
   // The name of the cipher.
   virtual const char* cipher_name() const = 0;
   // The ID of the cipher. Return 0x03000000 ORed with the 'cryptographic suite
   // selector'.
   virtual uint32_t cipher_id() const = 0;
 
   // For use by unit tests only.
   virtual base::StringPiece GetKey() const = 0;
   virtual base::StringPiece GetNoncePrefix() const = 0;
 
   static void DiversifyPreliminaryKey(base::StringPiece preliminary_key,
                                       base::StringPiece nonce_prefix,
                                       const DiversificationNonce& nonce,
                                       size_t key_size,
                                       size_t nonce_prefix_size,
                                       std::string* out_key,
                                       std::string* out_nonce_prefix);
 };
 
 }  // namespace net
 
 #endif  // NET_QUIC_CORE_CRYPTO_QUIC_DECRYPTER_H_