Replace reloadable quic_enable_tls_resumption flag with restart flag
PiperOrigin-RevId: 323070567
Change-Id: I8da3cd0a6d66ca82ecd2fdf5df57975747ba08cf
diff --git a/quic/core/crypto/tls_server_connection.cc b/quic/core/crypto/tls_server_connection.cc
index 923810e..f9661d4 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_v2) &&
+ if (GetQuicRestartFlag(quic_enable_tls_resumption_v3) &&
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 dd974e7..b6aefef 100644
--- a/quic/core/http/end_to_end_test.cc
+++ b/quic/core/http/end_to_end_test.cc
@@ -203,7 +203,7 @@
SetQuicReloadableFlag(quic_fix_packet_number_length, true);
SetQuicReloadableFlag(quic_support_handshake_done_in_t050, true);
- SetQuicReloadableFlag(quic_enable_tls_resumption_v2, true);
+ SetQuicRestartFlag(quic_enable_tls_resumption_v3, 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 1c0f868..01e4e85 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_v2, true);
+ SetQuicRestartFlag(quic_enable_tls_resumption_v3, 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 28bc61c..149310e 100644
--- a/quic/core/quic_versions.cc
+++ b/quic/core/quic_versions.cc
@@ -704,7 +704,7 @@
void QuicVersionInitializeSupportForIetfDraft() {
// Enable necessary flags.
- SetQuicReloadableFlag(quic_enable_tls_resumption_v2, true);
+ SetQuicRestartFlag(quic_enable_tls_resumption_v3, 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 e89da2c..6fa5aa3 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_v2, true);
+ SetQuicRestartFlag(quic_enable_tls_resumption_v3, 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 cb225a9..f4c4a8a 100644
--- a/quic/core/tls_server_handshaker.cc
+++ b/quic/core/tls_server_handshaker.cc
@@ -502,7 +502,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_v2);
+ QUIC_RESTART_FLAG_COUNT(quic_enable_tls_resumption_v3);
return ssl_ticket_aead_success;
}
diff --git a/quic/core/tls_server_handshaker_test.cc b/quic/core/tls_server_handshaker_test.cc
index 8b60122..752719e 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_v2, true);
+ SetQuicRestartFlag(quic_enable_tls_resumption_v3, true);
SetQuicReloadableFlag(quic_enable_zero_rtt_for_tls, true);
client_crypto_config_ = std::make_unique<QuicCryptoClientConfig>(
crypto_test_utils::ProofVerifierForTesting(),
