Deprecate --gfe2_reloadable_flag_quic_tls_allow_ignore_ticket_open.
PiperOrigin-RevId: 389653192
diff --git a/quic/core/quic_flags_list.h b/quic/core/quic_flags_list.h
index 8a2d0ad..509b14d 100644
--- a/quic/core/quic_flags_list.h
+++ b/quic/core/quic_flags_list.h
@@ -37,8 +37,6 @@
QUIC_FLAG(FLAGS_quic_restart_flag_quic_alarm_add_permanent_cancel, false)
// If true, allow client to enable BBRv2 on server via connection option \'B2ON\'.
QUIC_FLAG(FLAGS_quic_reloadable_flag_quic_allow_client_enabled_bbr_v2, false)
-// If true, allow ticket open to be ignored in TlsServerHandshaker. Also fixes TlsServerHandshaker::ResumptionAttempted when handshake hints is used.
-QUIC_FLAG(FLAGS_quic_reloadable_flag_quic_tls_allow_ignore_ticket_open, true)
// If true, close read side but not write side in QuicSpdyStream::OnStreamReset().
QUIC_FLAG(FLAGS_quic_reloadable_flag_quic_fix_on_stream_reset, true)
// If true, default on PTO which unifies TLP + RTO loss recovery.
diff --git a/quic/core/tls_server_handshaker.cc b/quic/core/tls_server_handshaker.cc
index ef08a40..800d6f8 100644
--- a/quic/core/tls_server_handshaker.cc
+++ b/quic/core/tls_server_handshaker.cc
@@ -713,7 +713,7 @@
absl::string_view in) {
QUICHE_DCHECK(proof_source_->GetTicketCrypter());
- if (allow_ignore_ticket_open_ && ignore_ticket_open_) {
+ if (ignore_ticket_open_) {
// SetIgnoreTicketOpen has been called. Typically this means the caller is
// using handshake hints and expect the hints to contain ticket decryption
// results.
@@ -722,9 +722,6 @@
}
if (!ticket_decryption_callback_) {
- if (!allow_ignore_ticket_open_) {
- ticket_received_ = true;
- }
ticket_decryption_callback_ = new DecryptCallback(this);
proof_source_->GetTicketCrypter()->Decrypt(
in, std::unique_ptr<DecryptCallback>(ticket_decryption_callback_));
@@ -817,8 +814,7 @@
return ssl_select_cert_error;
}
- if (allow_ignore_ticket_open_) {
- QUIC_RELOADABLE_FLAG_COUNT(quic_tls_allow_ignore_ticket_open);
+ {
const uint8_t* unused_extension_bytes;
size_t unused_extension_len;
ticket_received_ = SSL_early_callback_ctx_extension_get(
diff --git a/quic/core/tls_server_handshaker.h b/quic/core/tls_server_handshaker.h
index 515c813..d1a476f 100644
--- a/quic/core/tls_server_handshaker.h
+++ b/quic/core/tls_server_handshaker.h
@@ -188,9 +188,6 @@
void SetIgnoreTicketOpen(bool value) { ignore_ticket_open_ = value; }
- const bool allow_ignore_ticket_open_ =
- GetQuicReloadableFlag(quic_tls_allow_ignore_ticket_open);
-
private:
class QUIC_EXPORT_PRIVATE DecryptCallback
: public ProofSource::DecryptCallback {
