gfe-relnote: Deprecate gfe2_reloadable_flag_quic_use_handshaker_delegate2.
PiperOrigin-RevId: 292927832
Change-Id: I2f73ae99e55284c911007609fa989b7e82fb4596
diff --git a/quic/core/quic_crypto_client_handshaker.cc b/quic/core/quic_crypto_client_handshaker.cc
index 982d070..b815dfe 100644
--- a/quic/core/quic_crypto_client_handshaker.cc
+++ b/quic/core/quic_crypto_client_handshaker.cc
@@ -327,36 +327,14 @@
crypto_config_->pad_full_hello());
SendHandshakeMessage(out);
// Be prepared to decrypt with the new server write key.
- if (session()->use_handshake_delegate()) {
- delegate_->OnNewKeysAvailable(
- ENCRYPTION_ZERO_RTT,
- std::move(crypto_negotiated_params_->initial_crypters.decrypter),
- /*set_alternative_decrypter=*/true,
- /*latch_once_used=*/true,
- std::move(crypto_negotiated_params_->initial_crypters.encrypter));
- encryption_established_ = true;
- delegate_->SetDefaultEncryptionLevel(ENCRYPTION_ZERO_RTT);
- return;
- }
- if (session()->connection()->version().KnowsWhichDecrypterToUse()) {
- session()->connection()->InstallDecrypter(
- ENCRYPTION_ZERO_RTT,
- std::move(crypto_negotiated_params_->initial_crypters.decrypter));
- } else {
- session()->connection()->SetAlternativeDecrypter(
- ENCRYPTION_ZERO_RTT,
- std::move(crypto_negotiated_params_->initial_crypters.decrypter),
- true /* latch once used */);
- }
- // Send subsequent packets under encryption on the assumption that the
- // server will accept the handshake.
- session()->connection()->SetEncrypter(
+ delegate_->OnNewKeysAvailable(
ENCRYPTION_ZERO_RTT,
+ std::move(crypto_negotiated_params_->initial_crypters.decrypter),
+ /*set_alternative_decrypter=*/true,
+ /*latch_once_used=*/true,
std::move(crypto_negotiated_params_->initial_crypters.encrypter));
- session()->connection()->SetDefaultEncryptionLevel(ENCRYPTION_ZERO_RTT);
-
encryption_established_ = true;
- session()->OnCryptoHandshakeEvent(QuicSession::ENCRYPTION_ESTABLISHED);
+ delegate_->SetDefaultEncryptionLevel(ENCRYPTION_ZERO_RTT);
}
void QuicCryptoClientHandshaker::DoReceiveREJ(
@@ -397,11 +375,7 @@
// Receipt of a REJ message means that the server received the CHLO
// so we can cancel and retransmissions.
- if (session()->use_handshake_delegate()) {
- delegate_->NeuterUnencryptedData();
- } else {
- session()->NeuterUnencryptedData();
- }
+ delegate_->NeuterUnencryptedData();
std::string error_details;
QuicErrorCode error = crypto_config_->ProcessRejection(
@@ -563,33 +537,14 @@
// has been floated that the server shouldn't send packets encrypted
// with the FORWARD_SECURE key until it receives a FORWARD_SECURE
// packet from the client.
- if (session()->use_handshake_delegate()) {
- delegate_->OnNewKeysAvailable(
- ENCRYPTION_FORWARD_SECURE, std::move(crypters->decrypter),
- /*set_alternative_decrypter=*/true,
- /*latch_once_used=*/false, std::move(crypters->encrypter));
- one_rtt_keys_available_ = true;
- delegate_->SetDefaultEncryptionLevel(ENCRYPTION_FORWARD_SECURE);
- delegate_->DiscardOldEncryptionKey(ENCRYPTION_INITIAL);
- delegate_->NeuterHandshakeData();
- return;
- }
-
- if (session()->connection()->version().KnowsWhichDecrypterToUse()) {
- session()->connection()->InstallDecrypter(ENCRYPTION_FORWARD_SECURE,
- std::move(crypters->decrypter));
- } else {
- session()->connection()->SetAlternativeDecrypter(
- ENCRYPTION_FORWARD_SECURE, std::move(crypters->decrypter),
- false /* don't latch */);
- }
- session()->connection()->SetEncrypter(ENCRYPTION_FORWARD_SECURE,
- std::move(crypters->encrypter));
- session()->connection()->SetDefaultEncryptionLevel(ENCRYPTION_FORWARD_SECURE);
-
+ delegate_->OnNewKeysAvailable(
+ ENCRYPTION_FORWARD_SECURE, std::move(crypters->decrypter),
+ /*set_alternative_decrypter=*/true,
+ /*latch_once_used=*/false, std::move(crypters->encrypter));
one_rtt_keys_available_ = true;
- session()->OnCryptoHandshakeEvent(QuicSession::EVENT_HANDSHAKE_CONFIRMED);
- session()->connection()->OnHandshakeComplete();
+ delegate_->SetDefaultEncryptionLevel(ENCRYPTION_FORWARD_SECURE);
+ delegate_->DiscardOldEncryptionKey(ENCRYPTION_INITIAL);
+ delegate_->NeuterHandshakeData();
}
void QuicCryptoClientHandshaker::DoInitializeServerConfigUpdate(
