tor-browser

commit 805a2a3f4fbc940464128991bbfd7a36743c154a
parent 148f17aee6d55717d5a49887a0dedb06df666e90
Author: Michael Froman <mfroman@mozilla.com>
Date:   Thu,  9 Oct 2025 23:19:10 -0500

Bug 1993083 - Vendor libwebrtc from 5ff715d566

We already cherry-picked this when we vendored 23d8e44f84.

Upstream commit: https://webrtc.googlesource.com/src/+/5ff715d5666106e01d27205c1775d1e2d07ea254
    Use FieldTrialsView::IsEnabled for DTLS 1.3

    No behavior changes.

    Bug: webrtc:383141571, chromium:433885045
    Change-Id: Ice5f3e5cbd245ddea407248a6f29c61c646e6a72
    Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/401740
    Reviewed-by: Harald Alvestrand <hta@webrtc.org>
    Commit-Queue: Guido Urdaneta <guidou@webrtc.org>
    Cr-Commit-Position: refs/heads/main@{#45206}

Diffstat:
M
third_party/libwebrtc/README.mozilla.last-vendor
 | 
4
++--
D
third_party/libwebrtc/moz-patch-stack/5ff715d566.no-op-cherry-pick-msg
 | 
1
-
D
third_party/libwebrtc/moz-patch-stack/p0001.patch
 | 
46
----------------------------------------------

3 files changed, 2 insertions(+), 49 deletions(-)
diff --git a/third_party/libwebrtc/README.mozilla.last-vendor b/third_party/libwebrtc/README.mozilla.last-vendor
@@ -1,4 +1,4 @@
 # ./mach python dom/media/webrtc/third_party_build/vendor-libwebrtc.py --from-local /home/mfroman/mozilla/elm/.moz-fast-forward/moz-libwebrtc --commit mozpatches libwebrtc
-libwebrtc updated from /home/mfroman/mozilla/elm/.moz-fast-forward/moz-libwebrtc commit mozpatches on 2025-10-10T04:17:55.335194+00:00.
+libwebrtc updated from /home/mfroman/mozilla/elm/.moz-fast-forward/moz-libwebrtc commit mozpatches on 2025-10-10T04:19:00.768982+00:00.
 # base of lastest vendoring
-8f9fd99b09
+5ff715d566
diff --git a/third_party/libwebrtc/moz-patch-stack/5ff715d566.no-op-cherry-pick-msg b/third_party/libwebrtc/moz-patch-stack/5ff715d566.no-op-cherry-pick-msg
@@ -1 +0,0 @@
-We already cherry-picked this when we vendored 23d8e44f84.
diff --git a/third_party/libwebrtc/moz-patch-stack/p0001.patch b/third_party/libwebrtc/moz-patch-stack/p0001.patch
@@ -1,46 +0,0 @@
-From: Guido Urdaneta <guidou@webrtc.org>
-Date: Thu, 24 Jul 2025 11:01:29 +0200
-Subject: (cherry-pick-branch-heads/7258) Use FieldTrialsView::IsEnabled for
- DTLS 1.3
-
-No behavior changes.
-
-(cherry picked from commit 5ff715d5666106e01d27205c1775d1e2d07ea254)
-
-Bug: webrtc:383141571, chromium:433885045, chromium:434133034
-Change-Id: Ice5f3e5cbd245ddea407248a6f29c61c646e6a72
-Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/401740
-Reviewed-by: Harald Alvestrand <hta@webrtc.org>
-Commit-Queue: Guido Urdaneta <guidou@webrtc.org>
-Cr-Original-Commit-Position: refs/heads/main@{#45206}
-Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/402200
-Cr-Commit-Position: refs/branch-heads/7258@{#3}
-Cr-Branched-From: 74fa937f86ed8432c07676f7a1ce0e5e2812b3d5-refs/heads/main@{#44974}
----
- rtc_base/openssl_stream_adapter.cc | 10 ++++++----
- 1 file changed, 6 insertions(+), 4 deletions(-)
-
-diff --git a/rtc_base/openssl_stream_adapter.cc b/rtc_base/openssl_stream_adapter.cc
-index 7d7466b1cc..604a9465c7 100644
---- a/rtc_base/openssl_stream_adapter.cc
-+++ b/rtc_base/openssl_stream_adapter.cc
-@@ -144,13 +144,15 @@ int GetForceDtls13(const FieldTrialsView* field_trials) {
-     return kForceDtls13Off;
-   }
- #ifdef DTLS1_3_VERSION
--  auto mode = field_trials->Lookup("WebRTC-ForceDtls13");
--  RTC_LOG(LS_WARNING) << "WebRTC-ForceDtls13: " << mode;
--  if (mode == "Enabled") {
-+  if (field_trials->IsEnabled("WebRTC-ForceDtls13")) {
-+    RTC_LOG(LS_WARNING) << "WebRTC-ForceDtls13 Enabled";
-     return kForceDtls13Enabled;
--  } else if (mode == "Only") {
-+  }
-+  if (field_trials->Lookup("WebRTC-ForceDtls13") == "Only") {
-+    RTC_LOG(LS_WARNING) << "WebRTC-ForceDtls13 Only";
-     return kForceDtls13Only;
-   }
-+  RTC_LOG(LS_WARNING) << "WebRTC-ForceDtls13 Disabled";
- #endif
-   return kForceDtls13Off;
- }