diff --git a/experiments/field_trials.py b/experiments/field_trials.py index 8af1d316f7..4c41b7e29e 100755 --- a/experiments/field_trials.py +++ b/experiments/field_trials.py @@ -109,7 +109,7 @@ ACTIVE_FIELD_TRIALS: FrozenSet[FieldTrial] = frozenset([ date(2024, 4, 1)), FieldTrial('WebRTC-PermuteTlsClientHello', 42225803, - date(2024, 7, 1)), + date(2025, 1, 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 46ce8b894e..9075f9a48a 100644 --- a/rtc_base/openssl_stream_adapter.cc +++ b/rtc_base/openssl_stream_adapter.cc @@ -290,7 +290,7 @@ OpenSSLStreamAdapter::OpenSSLStreamAdapter( ssl_ctx_(nullptr), #ifdef OPENSSL_IS_BORINGSSL permute_extension_( - webrtc::field_trial::IsEnabled("WebRTC-PermuteTlsClientHello")), + !webrtc::field_trial::IsDisabled("WebRTC-PermuteTlsClientHello")), #endif ssl_mode_(SSL_MODE_TLS), ssl_max_version_(SSL_PROTOCOL_TLS_12) { diff --git a/rtc_base/ssl_stream_adapter_unittest.cc b/rtc_base/ssl_stream_adapter_unittest.cc index ed96305537..ab47a19148 100644 --- a/rtc_base/ssl_stream_adapter_unittest.cc +++ b/rtc_base/ssl_stream_adapter_unittest.cc @@ -1674,14 +1674,23 @@ TEST_F(SSLStreamAdapterTestDTLSExtensionPermutation, } TEST_F(SSLStreamAdapterTestDTLSExtensionPermutation, - ClientDefaultServerPermute) { - Initialize("", "WebRTC-PermuteTlsClientHello/Enabled/"); + ClientDisabledServerDisabled) { + Initialize("WebRTC-PermuteTlsClientHello/Disabled/", + "WebRTC-PermuteTlsClientHello/Disabled/"); TestHandshake(); } TEST_F(SSLStreamAdapterTestDTLSExtensionPermutation, - ClientPermuteServerDefault) { - Initialize("WebRTC-PermuteTlsClientHello/Enabled/", ""); + ClientDisabledServerPermute) { + Initialize("WebRTC-PermuteTlsClientHello/Disabled/", + "WebRTC-PermuteTlsClientHello/Enabled/"); + TestHandshake(); +} + +TEST_F(SSLStreamAdapterTestDTLSExtensionPermutation, + ClientPermuteServerDisabled) { + Initialize("WebRTC-PermuteTlsClientHello/Enabled/", + "WebRTC-PermuteTlsClientHello/Disabled/"); TestHandshake(); }