commit 8373d1729dd36da00a7988f066bd220460f91ba7
author fayang <fayang@google.com> Mon May 04 15:42:30 2020 -0700
committer Copybara-Service <copybara-worker@google.com> Mon May 04 15:43:08 2020 -0700
tree f9f34d63555f0bc20d3755276225f280f92a3a22
parent 6e17074ba23d7356e4fd866b00c9de0e6d03e47c

gfe-relnote: In QUIC + TLS, change connection's default encryption level when new encryption key is available. Protected by gfe2_reloadable_flag_quic_change_default_encryption_level.

PiperOrigin-RevId: 309831825
Change-Id: Ie4439af16ae22f6e27f873cc3f410caa1c81ca74

quic/core/quic_session.cc

diff --git a/quic/core/quic_session.cc b/quic/core/quic_session.cc
index 29dfb93..0f00ff3 100644
--- a/quic/core/quic_session.cc
+++ b/quic/core/quic_session.cc
@@ -1499,6 +1499,16 @@
   connection()->SetEncrypter(level, std::move(encrypter));
 
   if (connection_->version().handshake_protocol == PROTOCOL_TLS1_3 &&
+      (perspective() == Perspective::IS_CLIENT ||
+       GetQuicReloadableFlag(quic_change_default_encryption_level))) {
+    QUIC_DVLOG(1) << ENDPOINT << "Set default encryption level to "
+                  << EncryptionLevelToString(level);
+    QUIC_RELOADABLE_FLAG_COUNT(quic_change_default_encryption_level);
+    connection()->SetDefaultEncryptionLevel(level);
+    return;
+  }
+
+  if (connection_->version().handshake_protocol == PROTOCOL_TLS1_3 &&
       level == ENCRYPTION_FORWARD_SECURE) {
     // Set connection's default encryption level once 1-RTT write key is
     // available.