From 3905b25018272c8eb3bdfa75df47413506522d87 Mon Sep 17 00:00:00 2001 From: Philipp Hancke Date: Fri, 27 Dec 2024 08:23:07 -0800 Subject: [PATCH] clean up WebRTC-DisableTlsSessionTicketKillswitch which shipped in M131. BUG=webrtc:367181089 Change-Id: I967bafbab99bf211b0e6a4454f6598fd52493b26 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/370080 Reviewed-by: Jonas Oreland Reviewed-by: Harald Alvestrand Commit-Queue: Jonas Oreland Cr-Commit-Position: refs/heads/main@{#43674} --- experiments/field_trials.py | 3 --- rtc_base/openssl_stream_adapter.cc | 10 ++-------- rtc_base/openssl_stream_adapter.h | 3 --- 3 files changed, 2 insertions(+), 14 deletions(-) diff --git a/experiments/field_trials.py b/experiments/field_trials.py index e8df3cb3ea..3c55ff193b 100755 --- a/experiments/field_trials.py +++ b/experiments/field_trials.py @@ -116,9 +116,6 @@ ACTIVE_FIELD_TRIALS: FrozenSet[FieldTrial] = frozenset([ FieldTrial('WebRTC-Pacer-KeyframeFlushing', 42221435, date(2024, 4, 1)), - FieldTrial('WebRTC-DisableTlsSessionTicketKillswitch', - 367181089, - date(2025, 7, 1)), FieldTrial('WebRTC-QCM-Dynamic-AV1', 349860657, date(2025, 7, 1)), diff --git a/rtc_base/openssl_stream_adapter.cc b/rtc_base/openssl_stream_adapter.cc index ae44662a59..e1e367b1ba 100644 --- a/rtc_base/openssl_stream_adapter.cc +++ b/rtc_base/openssl_stream_adapter.cc @@ -28,6 +28,7 @@ #include "absl/functional/any_invocable.h" #include "absl/strings/string_view.h" #include "api/array_view.h" +#include "api/field_trials_view.h" #include "api/sequence_checker.h" #include "api/task_queue/pending_task_safety_flag.h" #include "api/units/time_delta.h" @@ -298,11 +299,6 @@ OpenSSLStreamAdapter::OpenSSLStreamAdapter( ssl_ctx_(nullptr), ssl_mode_(SSL_MODE_DTLS), ssl_max_version_(SSL_PROTOCOL_DTLS_12), - disable_handshake_ticket_( - (field_trials == nullptr) - ? true - : !field_trials->IsDisabled( - "WebRTC-DisableTlsSessionTicketKillswitch")), force_dtls_13_(GetForceDtls13(field_trials)) { stream_->SetEventCallback( [this](int events, int err) { OnEvent(events, err); }); @@ -1083,9 +1079,7 @@ SSL_CTX* OpenSSLStreamAdapter::SetupSSLContext() { SSL_CTX_set_permute_extensions(ctx, true); #endif - if (disable_handshake_ticket_) { - SSL_CTX_set_options(ctx, SSL_OP_NO_TICKET); - } + SSL_CTX_set_options(ctx, SSL_OP_NO_TICKET); return ctx; } diff --git a/rtc_base/openssl_stream_adapter.h b/rtc_base/openssl_stream_adapter.h index 92307ab288..2e7b42789f 100644 --- a/rtc_base/openssl_stream_adapter.h +++ b/rtc_base/openssl_stream_adapter.h @@ -244,9 +244,6 @@ class OpenSSLStreamAdapter final : public SSLStreamAdapter { // be too aggressive for low bandwidth links. int dtls_handshake_timeout_ms_ = 50; - // Rollout killswitch for disabling session tickets. - const bool disable_handshake_ticket_; - // 0 == Disabled // 1 == Max // 2 == Enabled (both min and max)