Deprecate --gfe2_reloadable_flag_quic_dont_close_connection_in_tls_alert_callback.
PiperOrigin-RevId: 526645557
diff --git a/quiche/quic/core/quic_flags_list.h b/quiche/quic/core/quic_flags_list.h
index 843414f..e160456 100644
--- a/quiche/quic/core/quic_flags_list.h
+++ b/quiche/quic/core/quic_flags_list.h
@@ -45,8 +45,6 @@
QUIC_FLAG(quic_reloadable_flag_quic_enable_disable_resumption, true)
// If true, discard INITIAL packet if the key has been dropped.
QUIC_FLAG(quic_reloadable_flag_quic_discard_initial_packet_with_key_dropped, true)
-// If true, do not close QUIC connection in SSL_QUIC_METHOD.send_alert, instead close it after SSL_do_handshake failed.
-QUIC_FLAG(quic_reloadable_flag_quic_dont_close_connection_in_tls_alert_callback, true)
// If true, do not issue a new connection ID that has been claimed by another connection.
QUIC_FLAG(quic_reloadable_flag_quic_check_cid_collision_when_issue_new_cid, true)
// If true, enable server retransmittable on wire PING.
diff --git a/quiche/quic/core/tls_handshaker.cc b/quiche/quic/core/tls_handshaker.cc
index 486457d..1a1c335 100644
--- a/quiche/quic/core/tls_handshaker.cc
+++ b/quiche/quic/core/tls_handshaker.cc
@@ -152,10 +152,7 @@
QUIC_VLOG(1) << "SSL_do_handshake failed; SSL_get_error returns "
<< ssl_error;
ERR_print_errors_fp(stderr);
- if (dont_close_connection_in_tls_alert_callback_ &&
- last_tls_alert_.has_value()) {
- QUIC_RELOADABLE_FLAG_COUNT_N(
- quic_dont_close_connection_in_tls_alert_callback, 2, 2);
+ if (last_tls_alert_.has_value()) {
std::string error_details =
absl::StrCat("TLS handshake failure (",
EncryptionLevelToString(last_tls_alert_->level), ") ",
@@ -384,23 +381,10 @@
void TlsHandshaker::FlushFlight() {}
void TlsHandshaker::SendAlert(EncryptionLevel level, uint8_t desc) {
- if (dont_close_connection_in_tls_alert_callback_) {
- QUIC_RELOADABLE_FLAG_COUNT_N(
- quic_dont_close_connection_in_tls_alert_callback, 1, 2);
- TlsAlert tls_alert;
- tls_alert.level = level;
- tls_alert.desc = desc;
- last_tls_alert_ = tls_alert;
- } else {
- std::string error_details = absl::StrCat(
- "TLS handshake failure (", EncryptionLevelToString(level), ") ",
- static_cast<int>(desc), ": ", SSL_alert_desc_string_long(desc));
- QUIC_DLOG(ERROR) << error_details;
- CloseConnection(
- TlsAlertToQuicErrorCode(desc),
- static_cast<QuicIetfTransportErrorCodes>(CRYPTO_ERROR_FIRST + desc),
- error_details);
- }
+ TlsAlert tls_alert;
+ tls_alert.level = level;
+ tls_alert.desc = desc;
+ last_tls_alert_ = tls_alert;
}
} // namespace quic
diff --git a/quiche/quic/core/tls_handshaker.h b/quiche/quic/core/tls_handshaker.h
index 03b6b9e..72f1776 100644
--- a/quiche/quic/core/tls_handshaker.h
+++ b/quiche/quic/core/tls_handshaker.h
@@ -221,8 +221,6 @@
uint8_t desc;
};
absl::optional<TlsAlert> last_tls_alert_;
- const bool dont_close_connection_in_tls_alert_callback_ =
- GetQuicReloadableFlag(quic_dont_close_connection_in_tls_alert_callback);
};
} // namespace quic
