commit e7b2cd844e2c95aee078a568e301a8000af26515
author renjietang <renjietang@google.com> Wed Jun 03 16:59:18 2020 -0700
committer Copybara-Service <copybara-worker@google.com> Wed Jun 03 16:59:52 2020 -0700
tree 02552d6204e216f981f1bb535f6626b448e1b950
parent ae6f1a71137c28d00de5e75f7b5089e7ea22f1cc

For IETF QUIC client, Retransmit 0-RTT packets with 1-RTT key when 0-RTT is rejected.

Client side change only. not protected.

PiperOrigin-RevId: 314632009
Change-Id: Ib6fc91aa28a5ea292a8063e7902a6c2ef0d4876d

quic/core/tls_client_handshaker.cc

diff --git a/quic/core/tls_client_handshaker.cc b/quic/core/tls_client_handshaker.cc
index 6ab93e3..a6c713e 100644
--- a/quic/core/tls_client_handshaker.cc
+++ b/quic/core/tls_client_handshaker.cc
@@ -12,6 +12,7 @@
 #include "net/third_party/quiche/src/quic/core/crypto/quic_encrypter.h"
 #include "net/third_party/quiche/src/quic/core/crypto/transport_parameters.h"
 #include "net/third_party/quiche/src/quic/core/quic_session.h"
+#include "net/third_party/quiche/src/quic/core/quic_types.h"
 #include "net/third_party/quiche/src/quic/platform/api/quic_flags.h"
 #include "net/third_party/quiche/src/quic/platform/api/quic_hostname_utils.h"
 #include "net/third_party/quiche/src/common/platform/api/quiche_string_piece.h"
@@ -388,6 +389,9 @@
   if (level == ENCRYPTION_FORWARD_SECURE || level == ENCRYPTION_ZERO_RTT) {
     encryption_established_ = true;
   }
+  if (level == ENCRYPTION_FORWARD_SECURE) {
+    handshaker_delegate()->DiscardOldEncryptionKey(ENCRYPTION_ZERO_RTT);
+  }
   TlsHandshaker::SetWriteSecret(level, cipher, write_secret);
 }