tor-browser

commit 68822426fedbea01b315db20808d973a126a7c36
parent 416af930183b5d444532379033b926624960ef6c
Author: Dan Baker <dbaker@mozilla.com>
Date:   Mon,  1 Dec 2025 21:11:37 -0700

Bug 2000941 - Vendor libwebrtc from 54c4cab4f5

Upstream commit: https://webrtc.googlesource.com/src/+/54c4cab4f58283f3fdb4e673e67ab58f5b0295f3
    Restrict platforms for DTLS 1.3 in Chromium

    Leave CrOS and Android disabled by default initially.

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

Diffstat:
M
third_party/libwebrtc/README.mozilla.last-vendor
 | 
4
++--
M
third_party/libwebrtc/rtc_base/openssl_stream_adapter.cc
 | 
12
++++++++----

2 files changed, 10 insertions(+), 6 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 /Users/danielbaker/elm/.moz-fast-forward/moz-libwebrtc --commit mozpatches libwebrtc
-libwebrtc updated from /Users/danielbaker/elm/.moz-fast-forward/moz-libwebrtc commit mozpatches on 2025-12-02T04:09:01.117895+00:00.
+libwebrtc updated from /Users/danielbaker/elm/.moz-fast-forward/moz-libwebrtc commit mozpatches on 2025-12-02T04:11:22.195589+00:00.
 # base of lastest vendoring
-97a5d9f739
+54c4cab4f5
diff --git a/third_party/libwebrtc/rtc_base/openssl_stream_adapter.cc b/third_party/libwebrtc/rtc_base/openssl_stream_adapter.cc
@@ -142,7 +142,8 @@ constexpr int kForceDtls13Only = 2;
 int GetForceDtls13(const FieldTrialsView* field_trials) {
 #ifdef DTLS1_3_VERSION
   if (field_trials) {
-#if defined(WEBRTC_CHROMIUM_BUILD)
+#if defined(WEBRTC_CHROMIUM_BUILD) && !defined(CHROMEOS) && \
+    !defined(WEBRTC_ANDROID)
     if (field_trials->IsDisabled("WebRTC-ForceDtls13")) {
       RTC_LOG(LS_WARNING) << "WebRTC-ForceDtls13 Disabled";
       return kForceDtls13Off;
@@ -152,20 +153,23 @@ int GetForceDtls13(const FieldTrialsView* field_trials) {
       RTC_LOG(LS_WARNING) << "WebRTC-ForceDtls13 Enabled";
       return kForceDtls13Enabled;
     }
-#endif  // defined(WEBRTC_CHROMIUM_BUILD)
+#endif  // defined(WEBRTC_CHROMIUM_BUILD) && !defined(CHROMEOS) &&
+        // !defined(WEBRTC_ANDROID)
     if (field_trials->Lookup("WebRTC-ForceDtls13") == "Only") {
       RTC_LOG(LS_WARNING) << "WebRTC-ForceDtls13 Only";
       return kForceDtls13Only;
     }
   }
   // Default behavior:
-#if defined(WEBRTC_CHROMIUM_BUILD)
+#if defined(WEBRTC_CHROMIUM_BUILD) && !defined(CHROMEOS) && \
+    !defined(WEBRTC_ANDROID)
   RTC_LOG(LS_WARNING) << "WebRTC-ForceDtls13 Enabled";
   return kForceDtls13Enabled;
 #else
   RTC_LOG(LS_WARNING) << "WebRTC-ForceDtls13 Disabled";
   return kForceDtls13Off;
-#endif  // defined(WEBRTC_CHROMIUM_BUILD)
+#endif  // defined(WEBRTC_CHROMIUM_BUILD) && !defined(CHROMEOS) &&
+        // !defined(WEBRTC_ANDROID)
 
 #else
   return kForceDtls13Off;