tor-browser

commit 416af930183b5d444532379033b926624960ef6c
parent 79a259f0bc6ec7276b4340f42771e809ec46712e
Author: Dan Baker <dbaker@mozilla.com>
Date:   Mon,  1 Dec 2025 21:09:15 -0700

Bug 2000941 - Vendor libwebrtc from 97a5d9f739

Upstream commit: https://webrtc.googlesource.com/src/+/97a5d9f73906d61c265f5b8862dc8830d754b555
    Enable DTLS 1.3 by default  in Chromium

    Bug: webrtc:383141571
    Change-Id: If0b4f5b9866f39629609291723565f4183db7472
    Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/409562
    Reviewed-by: Harald Alvestrand <hta@webrtc.org>
    Commit-Queue: Harald Alvestrand <hta@webrtc.org>
    Auto-Submit: Guido Urdaneta <guidou@webrtc.org>
    Reviewed-by: Jonas Oreland <jonaso@webrtc.org>
    Cr-Commit-Position: refs/heads/main@{#45662}

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

2 files changed, 28 insertions(+), 13 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:06:43.193505+00:00.
+libwebrtc updated from /Users/danielbaker/elm/.moz-fast-forward/moz-libwebrtc commit mozpatches on 2025-12-02T04:09:01.117895+00:00.
 # base of lastest vendoring
-3391f188be
+97a5d9f739
diff --git a/third_party/libwebrtc/rtc_base/openssl_stream_adapter.cc b/third_party/libwebrtc/rtc_base/openssl_stream_adapter.cc
@@ -140,21 +140,36 @@ constexpr int kForceDtls13Only = 2;
 #endif
 
 int GetForceDtls13(const FieldTrialsView* field_trials) {
-  if (field_trials == nullptr) {
-    return kForceDtls13Off;
-  }
 #ifdef DTLS1_3_VERSION
-  if (field_trials->IsEnabled("WebRTC-ForceDtls13")) {
-    RTC_LOG(LS_WARNING) << "WebRTC-ForceDtls13 Enabled";
-    return kForceDtls13Enabled;
-  }
-  if (field_trials->Lookup("WebRTC-ForceDtls13") == "Only") {
-    RTC_LOG(LS_WARNING) << "WebRTC-ForceDtls13 Only";
-    return kForceDtls13Only;
+  if (field_trials) {
+#if defined(WEBRTC_CHROMIUM_BUILD)
+    if (field_trials->IsDisabled("WebRTC-ForceDtls13")) {
+      RTC_LOG(LS_WARNING) << "WebRTC-ForceDtls13 Disabled";
+      return kForceDtls13Off;
+    }
+#else
+    if (field_trials->IsEnabled("WebRTC-ForceDtls13")) {
+      RTC_LOG(LS_WARNING) << "WebRTC-ForceDtls13 Enabled";
+      return kForceDtls13Enabled;
+    }
+#endif  // defined(WEBRTC_CHROMIUM_BUILD)
+    if (field_trials->Lookup("WebRTC-ForceDtls13") == "Only") {
+      RTC_LOG(LS_WARNING) << "WebRTC-ForceDtls13 Only";
+      return kForceDtls13Only;
+    }
   }
+  // Default behavior:
+#if defined(WEBRTC_CHROMIUM_BUILD)
+  RTC_LOG(LS_WARNING) << "WebRTC-ForceDtls13 Enabled";
+  return kForceDtls13Enabled;
+#else
   RTC_LOG(LS_WARNING) << "WebRTC-ForceDtls13 Disabled";
-#endif
   return kForceDtls13Off;
+#endif  // defined(WEBRTC_CHROMIUM_BUILD)
+
+#else
+  return kForceDtls13Off;
+#endif  // DTLS1_3_VERSION
 }
 
 }  // namespace