commit d18bfb943b04a23ba6261dcf3843d0460e9d9d1d
author fayang <fayang@google.com> Thu Mar 19 17:24:21 2020 -0700
committer Copybara-Service <copybara-worker@google.com> Thu Mar 19 17:24:58 2020 -0700
tree 0ae13dbcb9623ff0d039f4f8e522fde758eaf1ba
parent f8a9c8c238589206af362f2de843f783b02468a5

gfe-relnote: Stop using SetDefaultEncryptionLevel in TLS handshake. Instead, use OnOneRttKeysAvailable. Refactor only, no functional change expected, not protected.

PiperOrigin-RevId: 301928754
Change-Id: I8751cb610f1454fc2d61646c50a1fbed8dae926c

quic/core/quic_session_test.cc

diff --git a/quic/core/quic_session_test.cc b/quic/core/quic_session_test.cc
index e3289e9..25237c4 100644
--- a/quic/core/quic_session_test.cc
+++ b/quic/core/quic_session_test.cc
@@ -91,7 +91,12 @@
     }
     EXPECT_THAT(error, IsQuicNoError());
     session()->OnConfigNegotiated();
-    session()->SetDefaultEncryptionLevel(ENCRYPTION_FORWARD_SECURE);
+    if (session()->connection()->version().handshake_protocol ==
+        PROTOCOL_TLS1_3) {
+      session()->OnOneRttKeysAvailable();
+    } else {
+      session()->SetDefaultEncryptionLevel(ENCRYPTION_FORWARD_SECURE);
+    }
     session()->DiscardOldEncryptionKey(ENCRYPTION_INITIAL);
   }