commit 18d5d244521083e25f21a17afc5e5aa4722fe9b3
author nharper <nharper@google.com> Thu Oct 31 17:05:16 2019 -0700
committer Copybara-Service <copybara-worker@google.com> Thu Oct 31 17:05:51 2019 -0700
tree 4bbd1573db96d6c2cfe42c1d070a7b0d43e32b85
parent 73d0ac4e6bc01af007e2a11030c20ce913e8a210

gfe-relnote: Swap order of operations in TlsClientHandshaker::FinishHandshake. Protected by --quic_supports_tls_handshake

PiperOrigin-RevId: 277831865
Change-Id: I7f67f5184fb45308ac1d33e97a70bed15c0b8e65

quic/core/tls_client_handshaker.cc

diff --git a/quic/core/tls_client_handshaker.cc b/quic/core/tls_client_handshaker.cc
index 4e10479..749d15f 100644
--- a/quic/core/tls_client_handshaker.cc
+++ b/quic/core/tls_client_handshaker.cc
@@ -320,8 +320,6 @@
   session()->connection()->SetDefaultEncryptionLevel(ENCRYPTION_FORWARD_SECURE);
   encryption_established_ = true;
   handshake_confirmed_ = true;
-  session()->OnCryptoHandshakeEvent(QuicSession::ENCRYPTION_ESTABLISHED);
-  session()->OnCryptoHandshakeEvent(QuicSession::HANDSHAKE_CONFIRMED);
 
   // Fill crypto_negotiated_params_:
   const SSL_CIPHER* cipher = SSL_get_current_cipher(ssl());
@@ -332,6 +330,8 @@
   crypto_negotiated_params_->peer_signature_algorithm =
       SSL_get_peer_signature_algorithm(ssl());
 
+  session()->OnCryptoHandshakeEvent(QuicSession::ENCRYPTION_ESTABLISHED);
+  session()->OnCryptoHandshakeEvent(QuicSession::HANDSHAKE_CONFIRMED);
   session()->connection()->OnHandshakeComplete();
 }