corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1918268 - Vendor libwebrtc from 53c424eba7

Browse Source 
Upstream commit: https://webrtc.googlesource.com/src/+/53c424eba79013dc993208cdd33aaa16a11189eb
    Apply include-cleaner to the SSL files

    Bug: webrtc:42226242
    Change-Id: I04acc5aa4c76af4e900d7a7b50129cee9c9c3137
    Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/358180
    Commit-Queue: Harald Alvestrand <hta@webrtc.org>
    Reviewed-by: Harald Alvestrand <hta@webrtc.org>
    Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
    Cr-Commit-Position: refs/heads/main@{#42723}
This commit is contained in:
Michael Froman
2024-09-17 14:17:16 -05:00
parent 38a893e415
commit a7e95c8f70
16 changed files with 102 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
third_party/libwebrtc/README.moz-ff-commit vendored
View File

@@ -31953,3 +31953,6 @@ b2ce406053
# MOZ_LIBWEBRTC_SRC=/home/mfroman/mozilla/elm/.moz-fast-forward/moz-libwebrtc MOZ_LIBWEBRTC_BRANCH=mozpatches bash dom/media/webrtc/third_party_build/fast-forward-libwebrtc.sh
# base of lastest vendoring
4da4b48a8e
# MOZ_LIBWEBRTC_SRC=/home/mfroman/mozilla/elm/.moz-fast-forward/moz-libwebrtc MOZ_LIBWEBRTC_BRANCH=mozpatches bash dom/media/webrtc/third_party_build/fast-forward-libwebrtc.sh
# base of lastest vendoring
53c424eba7

2
third_party/libwebrtc/README.mozilla vendored
View File

@@ -21326,3 +21326,5 @@ libwebrtc updated from /home/mfroman/mozilla/elm/.moz-fast-forward/moz-libwebrtc
libwebrtc updated from /home/mfroman/mozilla/elm/.moz-fast-forward/moz-libwebrtc commit mozpatches on 2024-09-17T19:15:18.460498.
# ./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 2024-09-17T19:16:13.377154.
# ./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 2024-09-17T19:17:07.059908.

2
third_party/libwebrtc/moz-patch-stack/0002.patch vendored
View File

@@ -1543,7 +1543,7 @@ index 0134e3ea58..86d1bdda16 100644
std::unique_ptr<ScalableVideoController> svc_controller_;
absl::optional<ScalabilityMode> scalability_mode_;
diff --git a/rtc_base/BUILD.gn b/rtc_base/BUILD.gn
index 486e7f4009..b880d62801 100644
index 70a1adf7dd..f1edaf7cf8 100644
--- a/rtc_base/BUILD.gn
+++ b/rtc_base/BUILD.gn
@@ -467,6 +467,12 @@ rtc_library("logging") {

4
third_party/libwebrtc/moz-patch-stack/0031.patch vendored
View File

@@ -1050,7 +1050,7 @@ index 29a7bea9d9..a8994aaa68 100644
"/config/external/nspr",
"/nsprpub/lib/ds",
diff --git a/rtc_base/BUILD.gn b/rtc_base/BUILD.gn
index b880d62801..0194fe85a4 100644
index f1edaf7cf8..448220c71d 100644
--- a/rtc_base/BUILD.gn
+++ b/rtc_base/BUILD.gn
@@ -336,6 +336,7 @@ rtc_library("sample_counter") {
@@ -1213,7 +1213,7 @@ index b880d62801..0194fe85a4 100644
rtc_library("ssl_adapter") {
visibility = [ "*" ]
@@ -2218,7 +2242,7 @@ if (rtc_include_tests) {
@@ -2221,7 +2245,7 @@ if (rtc_include_tests) {
}
}

2
third_party/libwebrtc/moz-patch-stack/0063.patch vendored
View File

@@ -29,7 +29,7 @@ index 7f0ab8faf0..aa6878a9e2 100644
rtc_library("task_queue_test") {
visibility = [ "*" ]
diff --git a/rtc_base/BUILD.gn b/rtc_base/BUILD.gn
index 0194fe85a4..f489db0a42 100644
index 448220c71d..bc090a7cf9 100644
--- a/rtc_base/BUILD.gn
+++ b/rtc_base/BUILD.gn
@@ -722,10 +722,14 @@ if (is_mac || is_ios) {

2
third_party/libwebrtc/moz-patch-stack/0108.patch vendored
View File

@@ -13,7 +13,7 @@ Mercurial Revision: https://hg.mozilla.org/mozilla-central/rev/4e7b3c485e549e7e3
1 file changed, 6 insertions(+)
diff --git a/rtc_base/BUILD.gn b/rtc_base/BUILD.gn
index f489db0a42..cf9677cf47 100644
index bc090a7cf9..aa55fe3fd2 100644
--- a/rtc_base/BUILD.gn
+++ b/rtc_base/BUILD.gn
@@ -1022,6 +1022,12 @@ rtc_library("threading") {

4
third_party/libwebrtc/moz-patch-stack/0111.patch vendored
View File

@@ -9,7 +9,7 @@ Mercurial Revision: https://hg.mozilla.org/mozilla-central/rev/ee2f06666bcc6d22c
1 file changed, 2 insertions(+)
diff --git a/rtc_base/BUILD.gn b/rtc_base/BUILD.gn
index cf9677cf47..a3b0ecaab2 100644
index aa55fe3fd2..cd82b37fc1 100644
--- a/rtc_base/BUILD.gn
+++ b/rtc_base/BUILD.gn
@@ -1644,6 +1644,7 @@ if (!build_with_mozilla) {
@@ -20,7 +20,7 @@ index cf9677cf47..a3b0ecaab2 100644
visibility = [ "*" ]
sources = [
"openssl_adapter.cc",
@@ -1693,6 +1694,7 @@ rtc_library("ssl_adapter") {
@@ -1694,6 +1695,7 @@ rtc_library("ssl_adapter") {
configs += [ ":external_ssl_library" ]
}
}

3
third_party/libwebrtc/rtc_base/BUILD.gn vendored
View File

@@ -1675,6 +1675,7 @@ if (!build_with_mozilla) {
":threading",
":timeutils",
"../api:array_view",
"../api:sequence_checker",
"../api/task_queue:pending_task_safety_flag",
"../api/units:time_delta",
"../system_wrappers:field_trial",
@@ -2202,6 +2203,7 @@ if (rtc_include_tests) {
"../api:array_view",
"../api:field_trials_view",
"../api:make_ref_counted",
"../api:sequence_checker",
"../api/task_queue",
"../api/task_queue:pending_task_safety_flag",
"../api/task_queue:task_queue_test",
@@ -2216,6 +2218,7 @@ if (rtc_include_tests) {
"network:received_packet",
"synchronization:mutex",
"third_party/sigslot",
"//testing/gtest",
"//third_party/abseil-cpp/absl/algorithm:container",
"//third_party/abseil-cpp/absl/functional:any_invocable",
"//third_party/abseil-cpp/absl/memory",

8
third_party/libwebrtc/rtc_base/DEPS vendored
View File

@@ -20,5 +20,11 @@ specific_include_rules = {
],
"trace_event\.h": [
"+third_party/perfetto",
]
],
"openssl_adapter.cc": [
"+openssl",
],
"openssl_stream_adapter.cc": [
"+openssl",
],
}

20
third_party/libwebrtc/rtc_base/openssl_adapter.cc vendored
View File

@@ -14,11 +14,27 @@
#include <openssl/bio.h>
#include <openssl/err.h>
#include <cstdint>
#include <string>
#include <utility>
#include <vector>
#include "absl/strings/string_view.h"
#include "api/task_queue/pending_task_safety_flag.h"
#include "openssl/base.h"
#include "openssl/ssl.h"
#include "rtc_base/async_socket.h"
#include "rtc_base/boringssl_certificate.h"
#include "rtc_base/openssl_session_cache.h"
#include "rtc_base/socket.h"
#include "rtc_base/socket_address.h"
#include "rtc_base/ssl_adapter.h"
#include "rtc_base/ssl_certificate.h"
#include "rtc_base/ssl_identity.h"
#include "rtc_base/ssl_stream_adapter.h"
#ifdef OPENSSL_IS_BORINGSSL
#include <openssl/pool.h>
#endif
#include <openssl/rand.h>
#include <openssl/x509.h>
#include <string.h>
#include <time.h>
@@ -37,7 +53,6 @@
#include "rtc_base/checks.h"
#include "rtc_base/logging.h"
#include "rtc_base/numerics/safe_conversions.h"
#include "rtc_base/openssl.h"
#ifdef OPENSSL_IS_BORINGSSL
#include "rtc_base/boringssl_identity.h"
#else
@@ -45,7 +60,6 @@
#endif
#include "rtc_base/openssl_utility.h"
#include "rtc_base/strings/str_join.h"
#include "rtc_base/strings/string_builder.h"
#include "rtc_base/thread.h"
#include "system_wrappers/include/field_trial.h"

9
third_party/libwebrtc/rtc_base/openssl_adapter_unittest.cc vendored
View File

@@ -10,14 +10,19 @@
#include "rtc_base/openssl_adapter.h"
#include <cstddef>
#include <cstdint>
#include <memory>
#include <sstream>
#include <string>
#include <vector>
#include "absl/memory/memory.h"
#include "rtc_base/gunit.h"
#include "rtc_base/socket.h"
#include "rtc_base/socket_address.h"
#include "rtc_base/ssl_certificate.h"
#include "rtc_base/thread.h"
#include "test/gmock.h"
#include "test/gtest.h"
namespace rtc {
namespace {

22
third_party/libwebrtc/rtc_base/openssl_stream_adapter.cc vendored
View File

@@ -11,25 +11,37 @@
#include "rtc_base/openssl_stream_adapter.h"
#include <openssl/bio.h>
#include <openssl/crypto.h>
#include <openssl/err.h>
#include <openssl/rand.h>
#include <openssl/tls1.h>
#include <openssl/x509v3.h>
#include <atomic>
#include <cstddef>
#include <cstdint>
#include <cstring>
#include <memory>
#include <string>
#include <utility>
#include <vector>
#include "absl/functional/any_invocable.h"
#include "absl/strings/string_view.h"
#include "api/array_view.h"
#include "api/sequence_checker.h"
#include "api/task_queue/pending_task_safety_flag.h"
#include "api/units/time_delta.h"
#include "openssl/base.h"
#include "openssl/digest.h"
#include "openssl/pool.h"
#include "openssl/stack.h"
#include "rtc_base/boringssl_certificate.h"
#include "rtc_base/buffer.h"
#include "rtc_base/checks.h"
#include "rtc_base/logging.h"
#include "rtc_base/numerics/safe_conversions.h"
#include "rtc_base/openssl.h"
#include "rtc_base/openssl_adapter.h"
#include "rtc_base/openssl_digest.h"
#include "rtc_base/ssl_identity.h"
#include "rtc_base/ssl_stream_adapter.h"
#include "rtc_base/task_utils/repeating_task.h"
#ifdef OPENSSL_IS_BORINGSSL
#include <openssl/dtls1.h>
#include <openssl/ssl.h>

3
third_party/libwebrtc/rtc_base/ssl_adapter.cc vendored
View File

@@ -10,7 +10,10 @@
#include "rtc_base/ssl_adapter.h"
#include <memory>
#include "rtc_base/openssl_adapter.h"
#include "rtc_base/socket.h"
///////////////////////////////////////////////////////////////////////////////

14
third_party/libwebrtc/rtc_base/ssl_adapter_unittest.cc vendored
View File

@@ -10,20 +10,32 @@
#include "rtc_base/ssl_adapter.h"
#include <cstddef>
#include <cstdint>
#include <memory>
#include <string>
#include <utility>
#include <vector>
#include "absl/memory/memory.h"
#include "absl/strings/string_view.h"
#include "api/array_view.h"
#include "api/sequence_checker.h"
#include "rtc_base/checks.h"
#include "rtc_base/gunit.h"
#include "rtc_base/ip_address.h"
#include "rtc_base/logging.h"
#include "rtc_base/message_digest.h"
#include "rtc_base/socket.h"
#include "rtc_base/socket_address.h"
#include "rtc_base/ssl_certificate.h"
#include "rtc_base/ssl_identity.h"
#include "rtc_base/stream.h"
#include "rtc_base/string_encode.h"
#include "rtc_base/third_party/sigslot/sigslot.h"
#include "rtc_base/thread.h"
#include "rtc_base/virtual_socket_server.h"
#include "test/gmock.h"
#include "test/gtest.h"
using ::testing::_;
using ::testing::Return;

11
third_party/libwebrtc/rtc_base/ssl_stream_adapter.cc vendored
View File

@@ -10,9 +10,18 @@
#include "rtc_base/ssl_stream_adapter.h"
#include "absl/memory/memory.h"
#include <cstddef>
#include <cstdint>
#include <memory>
#include <string>
#include <utility>
#include <vector>
#include "absl/functional/any_invocable.h"
#include "absl/strings/string_view.h"
#include "rtc_base/openssl_stream_adapter.h"
#include "rtc_base/ssl_identity.h"
#include "rtc_base/stream.h"
namespace rtc {

15
third_party/libwebrtc/rtc_base/ssl_stream_adapter_unittest.cc vendored
View File

@@ -10,27 +10,38 @@
#include "rtc_base/ssl_stream_adapter.h"
#include <algorithm>
#include <cstddef>
#include <cstdint>
#include <cstring>
#include <ctime>
#include <memory>
#include <set>
#include <string>
#include <utility>
#include <vector>
#include "absl/memory/memory.h"
#include "absl/strings/string_view.h"
#include "api/array_view.h"
#include "api/sequence_checker.h"
#include "api/task_queue/pending_task_safety_flag.h"
#include "api/units/time_delta.h"
#include "rtc_base/buffer_queue.h"
#include "rtc_base/callback_list.h"
#include "rtc_base/checks.h"
#include "rtc_base/crypto_random.h"
#include "rtc_base/fake_clock.h"
#include "rtc_base/gunit.h"
#include "rtc_base/logging.h"
#include "rtc_base/memory/fifo_buffer.h"
#include "rtc_base/memory_stream.h"
#include "rtc_base/message_digest.h"
#include "rtc_base/openssl_stream_adapter.h"
#include "rtc_base/ssl_adapter.h"
#include "rtc_base/ssl_identity.h"
#include "rtc_base/stream.h"
#include "rtc_base/third_party/sigslot/sigslot.h"
#include "rtc_base/thread.h"
#include "rtc_base/time_utils.h"
#include "test/field_trial.h"
#include "test/gmock.h"
#include "test/gtest.h"