Fix bug in enabling tls resumption in quic, protected by quic_enable_tls_resumption_v2
PiperOrigin-RevId: 318262532
Change-Id: I5a0cce5b4b37675b1cc5862e0fd13c69fbf0a60f
diff --git a/quic/core/crypto/tls_server_connection.cc b/quic/core/crypto/tls_server_connection.cc
index 54db545..dcc4536 100644
--- a/quic/core/crypto/tls_server_connection.cc
+++ b/quic/core/crypto/tls_server_connection.cc
@@ -24,7 +24,7 @@
SSL_CTX_set_alpn_select_cb(ssl_ctx.get(), &SelectAlpnCallback, nullptr);
// We don't actually need the TicketCrypter here, but we need to know
// whether it's set.
- if (GetQuicReloadableFlag(quic_enable_tls_resumption) &&
+ if (GetQuicReloadableFlag(quic_enable_tls_resumption_v2) &&
proof_source->GetTicketCrypter()) {
SSL_CTX_set_ticket_aead_method(ssl_ctx.get(),
&TlsServerConnection::kSessionTicketMethod);
diff --git a/quic/core/http/end_to_end_test.cc b/quic/core/http/end_to_end_test.cc
index 8d274d0..b69f722 100644
--- a/quic/core/http/end_to_end_test.cc
+++ b/quic/core/http/end_to_end_test.cc
@@ -206,7 +206,7 @@
true);
SetQuicReloadableFlag(quic_support_handshake_done_in_t050, true);
- SetQuicReloadableFlag(quic_enable_tls_resumption, true);
+ SetQuicReloadableFlag(quic_enable_tls_resumption_v2, true);
SetQuicReloadableFlag(quic_enable_zero_rtt_for_tls, true);
}
diff --git a/quic/core/http/quic_spdy_client_session_test.cc b/quic/core/http/quic_spdy_client_session_test.cc
index 3464a7e..21e5d96 100644
--- a/quic/core/http/quic_spdy_client_session_test.cc
+++ b/quic/core/http/quic_spdy_client_session_test.cc
@@ -96,7 +96,7 @@
QuicUtils::GetInvalidStreamId(GetParam().transport_version)) {
auto client_cache = std::make_unique<test::SimpleSessionCache>();
client_session_cache_ = client_cache.get();
- SetQuicReloadableFlag(quic_enable_tls_resumption, true);
+ SetQuicReloadableFlag(quic_enable_tls_resumption_v2, true);
SetQuicReloadableFlag(quic_enable_zero_rtt_for_tls, true);
SetQuicReloadableFlag(quic_fix_gquic_stream_type, true);
client_crypto_config_ = std::make_unique<QuicCryptoClientConfig>(
diff --git a/quic/core/quic_versions.cc b/quic/core/quic_versions.cc
index 461a488..5090344 100644
--- a/quic/core/quic_versions.cc
+++ b/quic/core/quic_versions.cc
@@ -693,7 +693,7 @@
void QuicVersionInitializeSupportForIetfDraft() {
// Enable necessary flags.
- SetQuicReloadableFlag(quic_enable_tls_resumption, true);
+ SetQuicReloadableFlag(quic_enable_tls_resumption_v2, true);
SetQuicReloadableFlag(quic_enable_zero_rtt_for_tls, true);
}
diff --git a/quic/core/tls_client_handshaker_test.cc b/quic/core/tls_client_handshaker_test.cc
index 47989a7..f586028 100644
--- a/quic/core/tls_client_handshaker_test.cc
+++ b/quic/core/tls_client_handshaker_test.cc
@@ -174,7 +174,7 @@
server_id_(kServerHostname, kServerPort, false),
server_compressed_certs_cache_(
QuicCompressedCertsCache::kQuicCompressedCertsCacheSize) {
- SetQuicReloadableFlag(quic_enable_tls_resumption, true);
+ SetQuicReloadableFlag(quic_enable_tls_resumption_v2, true);
SetQuicReloadableFlag(quic_enable_zero_rtt_for_tls, true);
crypto_config_ = std::make_unique<QuicCryptoClientConfig>(
std::make_unique<TestProofVerifier>(),
diff --git a/quic/core/tls_server_handshaker.cc b/quic/core/tls_server_handshaker.cc
index 69b5237..3894556 100644
--- a/quic/core/tls_server_handshaker.cc
+++ b/quic/core/tls_server_handshaker.cc
@@ -499,7 +499,7 @@
memcpy(out, decrypted_session_ticket_.data(),
decrypted_session_ticket_.size());
*out_len = decrypted_session_ticket_.size();
- QUIC_RELOADABLE_FLAG_COUNT(quic_enable_tls_resumption);
+ QUIC_RELOADABLE_FLAG_COUNT(quic_enable_tls_resumption_v2);
return ssl_ticket_aead_success;
}
diff --git a/quic/core/tls_server_handshaker_test.cc b/quic/core/tls_server_handshaker_test.cc
index 70550fc..b766dfc 100644
--- a/quic/core/tls_server_handshaker_test.cc
+++ b/quic/core/tls_server_handshaker_test.cc
@@ -48,7 +48,7 @@
: server_compressed_certs_cache_(
QuicCompressedCertsCache::kQuicCompressedCertsCacheSize),
server_id_(kServerHostname, kServerPort, false) {
- SetQuicReloadableFlag(quic_enable_tls_resumption, true);
+ SetQuicReloadableFlag(quic_enable_tls_resumption_v2, true);
SetQuicReloadableFlag(quic_enable_zero_rtt_for_tls, true);
client_crypto_config_ = std::make_unique<QuicCryptoClientConfig>(
crypto_test_utils::ProofVerifierForTesting(),
