tor-browser

commit 0e4acc83333872862a8464d54a59412c39a11f93
parent 576743f053b4c2726ed563d93ae6dd4aca99ab80
Author: Michael Froman <mfroman@mozilla.com>
Date:   Wed,  8 Oct 2025 16:11:32 -0500

Bug 1993083 - Vendor libwebrtc from 032f8c223e

Upstream commit: https://webrtc.googlesource.com/src/+/032f8c223e0c1c9165edc35b1832d72ee5adc54a
    pqc: add missing GetName implementation

    CryptoOptions::EphemeralKeyExchangeCipherGroups::GetName was only
    defined in the header but not implemented, leading to link failures

    Bug: webrtc:404763475
    Change-Id: Id987f5d12388f198cf10967525ffff396e9b67f1
    Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/397362
    Reviewed-by: Jonas Oreland <jonaso@webrtc.org>
    Commit-Queue: Philipp Hancke <phancke@meta.com>
    Reviewed-by: Harald Alvestrand <hta@webrtc.org>
    Cr-Commit-Position: refs/heads/main@{#45014}

Diffstat:
M
third_party/libwebrtc/README.mozilla.last-vendor
 | 
4
++--
M
third_party/libwebrtc/api/crypto/crypto_options.cc
 | 
7
+++++++
M
third_party/libwebrtc/api/crypto/crypto_options.h
 | 
2
+-
M
third_party/libwebrtc/moz-patch-stack/s0121.patch
 | 
4
++--
M
third_party/libwebrtc/rtc_base/ssl_stream_adapter.h
 | 
2
+-

5 files changed, 13 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 /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-08T21:10:03.575817+00:00.
+libwebrtc updated from /home/mfroman/mozilla/elm/.moz-fast-forward/moz-libwebrtc commit mozpatches on 2025-10-08T21:11:22.031784+00:00.
 # base of lastest vendoring
-5fa352fa8f
+032f8c223e
diff --git a/third_party/libwebrtc/api/crypto/crypto_options.cc b/third_party/libwebrtc/api/crypto/crypto_options.cc
@@ -12,7 +12,9 @@
 
 #include <algorithm>
 #include <cstdint>
+#include <optional>
 #include <set>
+#include <string>
 #include <utility>
 #include <vector>
 
@@ -105,6 +107,11 @@ CryptoOptions::EphemeralKeyExchangeCipherGroups::GetSupported() {
   return SSLStreamAdapter::GetSupportedEphemeralKeyExchangeCipherGroups();
 }
 
+std::optional<std::string>
+CryptoOptions::EphemeralKeyExchangeCipherGroups::GetName(uint16_t group_id) {
+  return SSLStreamAdapter::GetEphemeralKeyExchangeCipherGroupName(group_id);
+}
+
 void CryptoOptions::EphemeralKeyExchangeCipherGroups::AddFirst(uint16_t group) {
   std::erase(enabled_, group);
   enabled_.insert(enabled_.begin(), group);
diff --git a/third_party/libwebrtc/api/crypto/crypto_options.h b/third_party/libwebrtc/api/crypto/crypto_options.h
@@ -86,7 +86,7 @@ struct RTC_EXPORT CryptoOptions {
     static constexpr uint16_t kX25519_MLKEM768 = 0x11ec;
 
     static std::set<uint16_t> GetSupported();
-    static std::optional<std::string> GetName(uint16_t);
+    static std::optional<std::string> GetName(uint16_t group_id);
 
     EphemeralKeyExchangeCipherGroups();
 
diff --git a/third_party/libwebrtc/moz-patch-stack/s0121.patch b/third_party/libwebrtc/moz-patch-stack/s0121.patch
@@ -9,7 +9,7 @@ Mercurial Revision: https://hg.mozilla.org/mozilla-central/rev/8fee7e6d9736f8d1d
  1 file changed, 3 insertions(+), 2 deletions(-)
 
 diff --git a/rtc_base/ssl_stream_adapter.h b/rtc_base/ssl_stream_adapter.h
-index baa491235e..1177d0ea62 100644
+index ed908dd89c..b19e1916ec 100644
 --- a/rtc_base/ssl_stream_adapter.h
 +++ b/rtc_base/ssl_stream_adapter.h
 @@ -244,11 +244,12 @@ class SSLStreamAdapter : public StreamInterface {
@@ -20,7 +20,7 @@ index baa491235e..1177d0ea62 100644
 +  static std::set<uint16_t> GetSupportedEphemeralKeyExchangeCipherGroups()
 +      { return {}; }
    static std::optional<std::string> GetEphemeralKeyExchangeCipherGroupName(
-       uint16_t);
+       uint16_t group_id);
    static std::vector<uint16_t> GetDefaultEphemeralKeyExchangeCipherGroups(
 -      const FieldTrialsView* field_trials);
 +      const FieldTrialsView* field_trials) { return {}; }
diff --git a/third_party/libwebrtc/rtc_base/ssl_stream_adapter.h b/third_party/libwebrtc/rtc_base/ssl_stream_adapter.h
@@ -247,7 +247,7 @@ class SSLStreamAdapter : public StreamInterface {
   static std::set<uint16_t> GetSupportedEphemeralKeyExchangeCipherGroups()
       { return {}; }
   static std::optional<std::string> GetEphemeralKeyExchangeCipherGroupName(
-      uint16_t);
+      uint16_t group_id);
   static std::vector<uint16_t> GetDefaultEphemeralKeyExchangeCipherGroups(
       const FieldTrialsView* field_trials) { return {}; }