admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

clean up WebRTC-DisableTlsSessionTicketKillswitch

Browse Source 
which shipped in M131.

BUG=webrtc:367181089

Change-Id: I967bafbab99bf211b0e6a4454f6598fd52493b26
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/370080
Reviewed-by: Jonas Oreland <jonaso@webrtc.org>
Reviewed-by: Harald Alvestrand <hta@webrtc.org>
Commit-Queue: Jonas Oreland <jonaso@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#43674}
This commit is contained in:
Philipp Hancke 2024-12-27 08:23:07 -08:00 committed by WebRTC LUCI CQ
parent 105172eaa3
commit 3905b25018
3 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
experiments/field_trials.py
View File

@ -116,9 +116,6 @@ ACTIVE_FIELD_TRIALS: FrozenSet[FieldTrial] = frozenset([
FieldTrial('WebRTC-Pacer-KeyframeFlushing', FieldTrial('WebRTC-Pacer-KeyframeFlushing',
42221435, 42221435,
date(2024, 4, 1)), date(2024, 4, 1)),
FieldTrial('WebRTC-DisableTlsSessionTicketKillswitch',
367181089,
date(2025, 7, 1)),
FieldTrial('WebRTC-QCM-Dynamic-AV1', FieldTrial('WebRTC-QCM-Dynamic-AV1',
349860657, 349860657,
date(2025, 7, 1)), date(2025, 7, 1)),

10
rtc_base/openssl_stream_adapter.cc
View File

@ -28,6 +28,7 @@
#include "absl/functional/any_invocable.h" #include "absl/functional/any_invocable.h"
#include "absl/strings/string_view.h" #include "absl/strings/string_view.h"
#include "api/array_view.h" #include "api/array_view.h"
#include "api/field_trials_view.h"
#include "api/sequence_checker.h" #include "api/sequence_checker.h"
#include "api/task_queue/pending_task_safety_flag.h" #include "api/task_queue/pending_task_safety_flag.h"
#include "api/units/time_delta.h" #include "api/units/time_delta.h"
@ -298,11 +299,6 @@ OpenSSLStreamAdapter::OpenSSLStreamAdapter(
ssl_ctx_(nullptr), ssl_ctx_(nullptr),
ssl_mode_(SSL_MODE_DTLS), ssl_mode_(SSL_MODE_DTLS),
ssl_max_version_(SSL_PROTOCOL_DTLS_12), 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)) { force_dtls_13_(GetForceDtls13(field_trials)) {
stream_->SetEventCallback( stream_->SetEventCallback(
[this](int events, int err) { OnEvent(events, err); }); [this](int events, int err) { OnEvent(events, err); });
@ -1083,9 +1079,7 @@ SSL_CTX* OpenSSLStreamAdapter::SetupSSLContext() {
SSL_CTX_set_permute_extensions(ctx, true); SSL_CTX_set_permute_extensions(ctx, true);
#endif #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; return ctx;
} }

3
rtc_base/openssl_stream_adapter.h
View File

@ -244,9 +244,6 @@ class OpenSSLStreamAdapter final : public SSLStreamAdapter {
// be too aggressive for low bandwidth links. // be too aggressive for low bandwidth links.
int dtls_handshake_timeout_ms_ = 50; int dtls_handshake_timeout_ms_ = 50;
// Rollout killswitch for disabling session tickets.
const bool disable_handshake_ticket_;
// 0 == Disabled // 0 == Disabled
// 1 == Max // 1 == Max
// 2 == Enabled (both min and max) // 2 == Enabled (both min and max)