In QUIC, change OnOneRttKeysAvailable() to OnTlsHandshakeFinished().
There are 2 advantages:
1. The new name explicitly tells applications that the handshake is finished, which is what they care about.
2. Subclass overrides will know clearly this method is only in TLS QUIC.
No behavior change. not protected.
PiperOrigin-RevId: 327141938
Change-Id: Ieb43c32486f625116cad8246af91ba28c41b41ac
diff --git a/quic/core/handshaker_delegate_interface.h b/quic/core/handshaker_delegate_interface.h
index bfc8761..d72471f 100644
--- a/quic/core/handshaker_delegate_interface.h
+++ b/quic/core/handshaker_delegate_interface.h
@@ -37,7 +37,7 @@
// Called when both 1-RTT read and write keys are available. Only used in TLS
// handshake.
- virtual void OnOneRttKeysAvailable() = 0;
+ virtual void OnTlsHandshakeComplete() = 0;
// Called to discard old decryption keys to stop processing packets of
// encryption |level|.
diff --git a/quic/core/http/quic_spdy_session_test.cc b/quic/core/http/quic_spdy_session_test.cc
index 706ee2d..fd0c645 100644
--- a/quic/core/http/quic_spdy_session_test.cc
+++ b/quic/core/http/quic_spdy_session_test.cc
@@ -123,7 +123,7 @@
session()->OnConfigNegotiated();
if (session()->connection()->version().handshake_protocol ==
PROTOCOL_TLS1_3) {
- session()->OnOneRttKeysAvailable();
+ session()->OnTlsHandshakeComplete();
} else {
session()->SetDefaultEncryptionLevel(ENCRYPTION_FORWARD_SECURE);
}
diff --git a/quic/core/http/quic_spdy_stream_test.cc b/quic/core/http/quic_spdy_stream_test.cc
index 81de165..cc0e3ec 100644
--- a/quic/core/http/quic_spdy_stream_test.cc
+++ b/quic/core/http/quic_spdy_stream_test.cc
@@ -108,7 +108,7 @@
std::make_unique<NullEncrypter>(session()->perspective()));
session()->OnConfigNegotiated();
if (session()->version().UsesTls()) {
- session()->OnOneRttKeysAvailable();
+ session()->OnTlsHandshakeComplete();
} else {
session()->SetDefaultEncryptionLevel(ENCRYPTION_FORWARD_SECURE);
}
diff --git a/quic/core/quic_session.cc b/quic/core/quic_session.cc
index 73c371d..4098764 100644
--- a/quic/core/quic_session.cc
+++ b/quic/core/quic_session.cc
@@ -1596,7 +1596,7 @@
}
}
-void QuicSession::OnOneRttKeysAvailable() {
+void QuicSession::OnTlsHandshakeComplete() {
DCHECK_EQ(PROTOCOL_TLS1_3, connection_->version().handshake_protocol);
QUIC_BUG_IF(!GetCryptoStream()->crypto_negotiated_params().cipher_suite)
<< ENDPOINT << "Handshake completes without cipher suite negotiation.";
diff --git a/quic/core/quic_session.h b/quic/core/quic_session.h
index 54c3111..e81375d 100644
--- a/quic/core/quic_session.h
+++ b/quic/core/quic_session.h
@@ -261,7 +261,7 @@
EncryptionLevel level,
std::unique_ptr<QuicEncrypter> encrypter) override;
void SetDefaultEncryptionLevel(EncryptionLevel level) override;
- void OnOneRttKeysAvailable() override;
+ void OnTlsHandshakeComplete() override;
void DiscardOldDecryptionKey(EncryptionLevel level) override;
void DiscardOldEncryptionKey(EncryptionLevel level) override;
void NeuterUnencryptedData() override;
diff --git a/quic/core/quic_session_test.cc b/quic/core/quic_session_test.cc
index f9dd5ac..67cb2be 100644
--- a/quic/core/quic_session_test.cc
+++ b/quic/core/quic_session_test.cc
@@ -107,7 +107,7 @@
session()->OnConfigNegotiated();
if (session()->connection()->version().handshake_protocol ==
PROTOCOL_TLS1_3) {
- session()->OnOneRttKeysAvailable();
+ session()->OnTlsHandshakeComplete();
} else {
session()->SetDefaultEncryptionLevel(ENCRYPTION_FORWARD_SECURE);
}
diff --git a/quic/core/tls_client_handshaker.cc b/quic/core/tls_client_handshaker.cc
index 093e2dc..265496d 100644
--- a/quic/core/tls_client_handshaker.cc
+++ b/quic/core/tls_client_handshaker.cc
@@ -511,7 +511,7 @@
QUIC_DLOG(INFO) << "Client: server selected ALPN: '" << received_alpn_string
<< "'";
one_rtt_keys_available_ = true;
- handshaker_delegate()->OnOneRttKeysAvailable();
+ handshaker_delegate()->OnTlsHandshakeComplete();
}
void TlsClientHandshaker::HandleZeroRttReject() {
diff --git a/quic/core/tls_server_handshaker.cc b/quic/core/tls_server_handshaker.cc
index 66d8cc3..46e4b81 100644
--- a/quic/core/tls_server_handshaker.cc
+++ b/quic/core/tls_server_handshaker.cc
@@ -392,7 +392,7 @@
state_ = STATE_HANDSHAKE_COMPLETE;
one_rtt_keys_available_ = true;
- handshaker_delegate()->OnOneRttKeysAvailable();
+ handshaker_delegate()->OnTlsHandshakeComplete();
handshaker_delegate()->DiscardOldEncryptionKey(ENCRYPTION_HANDSHAKE);
handshaker_delegate()->DiscardOldDecryptionKey(ENCRYPTION_HANDSHAKE);
handshaker_delegate()->DiscardOldDecryptionKey(ENCRYPTION_ZERO_RTT);
diff --git a/quic/quic_transport/quic_transport_client_session.cc b/quic/quic_transport/quic_transport_client_session.cc
index f41b403..4d5da07 100644
--- a/quic/quic_transport/quic_transport_client_session.cc
+++ b/quic/quic_transport/quic_transport_client_session.cc
@@ -88,8 +88,8 @@
}
}
-void QuicTransportClientSession::OnOneRttKeysAvailable() {
- QuicSession::OnOneRttKeysAvailable();
+void QuicTransportClientSession::OnTlsHandshakeComplete() {
+ QuicSession::OnTlsHandshakeComplete();
SendClientIndication();
}
diff --git a/quic/quic_transport/quic_transport_client_session.h b/quic/quic_transport/quic_transport_client_session.h
index a519d04..6fe2619 100644
--- a/quic/quic_transport/quic_transport_client_session.h
+++ b/quic/quic_transport/quic_transport_client_session.h
@@ -96,7 +96,7 @@
}
void SetDefaultEncryptionLevel(EncryptionLevel level) override;
- void OnOneRttKeysAvailable() override;
+ void OnTlsHandshakeComplete() override;
void OnMessageReceived(quiche::QuicheStringPiece message) override;
// Return the earliest incoming stream that has been received by the session
