commit 546cc453efd0b1f1aa63687fddd7c8f9a2218fce
author zhongyi <zhongyi@google.com> Fri Apr 12 15:27:49 2019 -0700
committer Copybara-Service <copybara-worker@google.com> Fri Apr 12 15:28:24 2019 -0700
tree a95ba671478294b776f69f0a04e89f009e2da92e
parent 9e84364c1893473f994688884920e9a32d7e02df

Add new methods to QuicFramer for controlling decrypters

This CL is a roll forward of cl/243273832. David had to make test-only changes to fix the broken test //third_party/quic/core:tls_handshaker_test. And the chromium patch is ready.

gfe-relnote: Protected behind QUIC_VERSION_99 and quic_supports_tls_handshake
PiperOrigin-RevId: 243344023
Change-Id: Ia845325b55557d4d8811d6641ae5b50bdf2aed45

quic/core/quic_connection.h

diff --git a/quic/core/quic_connection.h b/quic/core/quic_connection.h
index 602361e..d13458d 100644
--- a/quic/core/quic_connection.h
+++ b/quic/core/quic_connection.h
@@ -672,6 +672,10 @@
                                std::unique_ptr<QuicDecrypter> decrypter,
                                bool latch_once_used);
 
+  void InstallDecrypter(EncryptionLevel level,
+                        std::unique_ptr<QuicDecrypter> decrypter);
+  void RemoveDecrypter(EncryptionLevel level);
+
   const QuicDecrypter* decrypter() const;
   const QuicDecrypter* alternative_decrypter() const;
 
@@ -765,8 +769,8 @@
   // connection ID lengths do not change.
   QuicPacketLength GetGuaranteedLargestMessagePayload() const;
 
-  // Return the id of the cipher of the primary decrypter of the framer.
-  uint32_t cipher_id() const { return framer_.decrypter()->cipher_id(); }
+  // Returns the id of the cipher last used for decrypting packets.
+  uint32_t cipher_id() const;
 
   std::vector<std::unique_ptr<QuicEncryptedPacket>>* termination_packets() {
     return termination_packets_.get();