commit d86fdbae51fb113091f0f9c55d0fadbe08b557f5
author fayang <fayang@google.com> Mon Aug 03 13:55:04 2020 -0700
committer Copybara-Service <copybara-worker@google.com> Mon Aug 03 13:55:39 2020 -0700
tree 08d3edc5b3c140e74ad5afb94bbca582ee2eeb65
parent bab731c8f00c3a1ac0f44bdb9c39e0140e7dc978

Neuter CRYPTO data in HANDSHAKE level when discarding handshake keys. Protected by gfe2_reloadable_flag_quic_fix_neuter_handshake_data.

This is used to fix a corner case where HANDSHAKE data is marked as lost, but handshake key is discarded before it gets retransmitted.

PiperOrigin-RevId: 324676804
Change-Id: I049458e51bdbb8c36892fafb11ec1ba71ba9dece

quic/core/quic_session.cc

diff --git a/quic/core/quic_session.cc b/quic/core/quic_session.cc
index 5b825ed..6379861 100644
--- a/quic/core/quic_session.cc
+++ b/quic/core/quic_session.cc
@@ -1633,6 +1633,11 @@
 }
 
 void QuicSession::NeuterHandshakeData() {
+  if (GetQuicReloadableFlag(quic_fix_neuter_handshake_data)) {
+    QUIC_RELOADABLE_FLAG_COUNT(quic_fix_neuter_handshake_data);
+    GetMutableCryptoStream()->NeuterStreamDataOfEncryptionLevel(
+        ENCRYPTION_HANDSHAKE);
+  }
   connection()->OnHandshakeComplete();
 }