mirror of
https://github.com/mollyim/webrtc.git
synced 2025-05-12 21:30:45 +01:00
Revert "Split digest methods from ssl target into digest target"
This reverts commit 47bfe39ecf
.
Reason for revert: Breaks downstream project.
Original change's description:
> Split digest methods from ssl target into digest target
>
> in an attempt to break up the monolithic ssl target.
>
> BUG=None
>
> Change-Id: I38f5b3e2828742d5d918460db1af0a5797d6a5c2
> Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/349764
> Reviewed-by: Harald Alvestrand <hta@webrtc.org>
> Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
> Commit-Queue: Philipp Hancke <phancke@meta.com>
> Cr-Commit-Position: refs/heads/main@{#42249}
Bug: None
Change-Id: Ice6f901cd8c2aecf4cf44d3728ec76568b19a7ca
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/350180
Bot-Commit: rubber-stamper@appspot.gserviceaccount.com <rubber-stamper@appspot.gserviceaccount.com>
Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org>
Owners-Override: Mirko Bonadei <mbonadei@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#42255}
This commit is contained in:
parent
8de2cf7c93
commit
fc57037462
7 changed files with 9 additions and 46 deletions
|
@ -110,7 +110,6 @@ rtc_source_set("stun_types") {
|
|||
"../../rtc_base:byte_order",
|
||||
"../../rtc_base:checks",
|
||||
"../../rtc_base:crc32",
|
||||
"../../rtc_base:digest",
|
||||
"../../rtc_base:ip_address",
|
||||
"../../rtc_base:logging",
|
||||
"../../rtc_base:socket_address",
|
||||
|
|
|
@ -399,7 +399,7 @@ rtc_library("rtp_utils") {
|
|||
"../rtc_base:async_packet_socket",
|
||||
"../rtc_base:byte_order",
|
||||
"../rtc_base:checks",
|
||||
"../rtc_base:digest",
|
||||
"../rtc_base:ssl",
|
||||
"../rtc_base/system:rtc_export",
|
||||
]
|
||||
absl_deps = [ "//third_party/abseil-cpp/absl/strings" ]
|
||||
|
|
|
@ -837,7 +837,7 @@ rtc_library("neteq_test_tools") {
|
|||
"../../common_audio",
|
||||
"../../rtc_base:buffer",
|
||||
"../../rtc_base:checks",
|
||||
"../../rtc_base:digest",
|
||||
"../../rtc_base:ssl",
|
||||
"../../rtc_base:stringutils",
|
||||
"../../rtc_base/system:arch",
|
||||
"../../test:rtp_test_utils",
|
||||
|
@ -954,7 +954,7 @@ rtc_library("audio_coding_modules_tests_shared") {
|
|||
"../../api/audio_codecs:builtin_audio_encoder_factory",
|
||||
"../../api/neteq:neteq_api",
|
||||
"../../rtc_base:checks",
|
||||
"../../rtc_base:digest",
|
||||
"../../rtc_base:ssl",
|
||||
"../../rtc_base:stringutils",
|
||||
"../../system_wrappers",
|
||||
"../../test:fileutils",
|
||||
|
@ -1713,7 +1713,6 @@ if (rtc_include_tests) {
|
|||
"../../logging:rtc_event_audio",
|
||||
"../../modules/rtp_rtcp:rtp_rtcp_format",
|
||||
"../../rtc_base:checks",
|
||||
"../../rtc_base:digest",
|
||||
"../../rtc_base:macromagic",
|
||||
"../../rtc_base:platform_thread",
|
||||
"../../rtc_base:refcount",
|
||||
|
@ -1721,6 +1720,7 @@ if (rtc_include_tests) {
|
|||
"../../rtc_base:rtc_event",
|
||||
"../../rtc_base:safe_conversions",
|
||||
"../../rtc_base:sanitizer",
|
||||
"../../rtc_base:ssl",
|
||||
"../../rtc_base:stringutils",
|
||||
"../../rtc_base:timeutils",
|
||||
"../../rtc_base/synchronization:mutex",
|
||||
|
|
|
@ -1181,7 +1181,6 @@ if (rtc_include_tests) {
|
|||
"../rtc_base:byte_buffer",
|
||||
"../rtc_base:checks",
|
||||
"../rtc_base:copy_on_write_buffer",
|
||||
"../rtc_base:digest",
|
||||
"../rtc_base:dscp",
|
||||
"../rtc_base:gunit_helpers",
|
||||
"../rtc_base:ip_address",
|
||||
|
@ -1243,7 +1242,6 @@ rtc_library("p2p_server_utils") {
|
|||
"../rtc_base:async_udp_socket",
|
||||
"../rtc_base:byte_buffer",
|
||||
"../rtc_base:checks",
|
||||
"../rtc_base:digest",
|
||||
"../rtc_base:logging",
|
||||
"../rtc_base:rtc_base_tests_utils",
|
||||
"../rtc_base:socket_adapters",
|
||||
|
|
|
@ -2424,7 +2424,6 @@ if (rtc_include_tests && !build_with_chromium) {
|
|||
"../rtc_base:byte_buffer",
|
||||
"../rtc_base:checks",
|
||||
"../rtc_base:copy_on_write_buffer",
|
||||
"../rtc_base:digest",
|
||||
"../rtc_base:event_tracer",
|
||||
"../rtc_base:gunit_helpers",
|
||||
"../rtc_base:ip_address",
|
||||
|
|
|
@ -1487,45 +1487,18 @@ rtc_library("rtc_certificate_generator") {
|
|||
]
|
||||
}
|
||||
|
||||
rtc_source_set("ssl_header") {
|
||||
sources = [ "openssl.h" ]
|
||||
deps = []
|
||||
if (is_win) {
|
||||
deps += [ ":win32" ]
|
||||
}
|
||||
}
|
||||
|
||||
rtc_library("digest") {
|
||||
visibility = [ "*" ]
|
||||
sources = [
|
||||
"message_digest.cc",
|
||||
"message_digest.h",
|
||||
"openssl_digest.cc",
|
||||
"openssl_digest.h",
|
||||
]
|
||||
deps = [
|
||||
":checks",
|
||||
":ssl_header",
|
||||
":stringutils",
|
||||
]
|
||||
|
||||
# If we are building the SSL library ourselves, we know it's BoringSSL.
|
||||
if (rtc_build_ssl) {
|
||||
deps += [ "//third_party/boringssl" ]
|
||||
} else {
|
||||
configs += [ ":external_ssl_library" ]
|
||||
}
|
||||
|
||||
absl_deps = [ "//third_party/abseil-cpp/absl/strings" ]
|
||||
}
|
||||
|
||||
rtc_library("ssl") {
|
||||
visibility = [ "*" ]
|
||||
sources = [
|
||||
"helpers.cc",
|
||||
"helpers.h",
|
||||
"message_digest.cc",
|
||||
"message_digest.h",
|
||||
"openssl.h",
|
||||
"openssl_adapter.cc",
|
||||
"openssl_adapter.h",
|
||||
"openssl_digest.cc",
|
||||
"openssl_digest.h",
|
||||
"openssl_key_pair.cc",
|
||||
"openssl_key_pair.h",
|
||||
"openssl_session_cache.cc",
|
||||
|
@ -1553,13 +1526,11 @@ rtc_library("ssl") {
|
|||
":buffer",
|
||||
":checks",
|
||||
":copy_on_write_buffer",
|
||||
":digest",
|
||||
":logging",
|
||||
":macromagic",
|
||||
":safe_conversions",
|
||||
":socket",
|
||||
":socket_address",
|
||||
":ssl_header",
|
||||
":stream",
|
||||
":stringutils",
|
||||
":threading",
|
||||
|
@ -1718,7 +1689,6 @@ rtc_library("rtc_base_tests_utils") {
|
|||
":buffer",
|
||||
":byte_buffer",
|
||||
":checks",
|
||||
":digest",
|
||||
":ip_address",
|
||||
":logging",
|
||||
":macromagic",
|
||||
|
@ -2101,7 +2071,6 @@ if (rtc_include_tests) {
|
|||
":checks",
|
||||
":crc32",
|
||||
":data_rate_limiter",
|
||||
":digest",
|
||||
":gunit_helpers",
|
||||
":ifaddrs_converter",
|
||||
":ip_address",
|
||||
|
@ -2124,7 +2093,6 @@ if (rtc_include_tests) {
|
|||
":socket_factory",
|
||||
":socket_server",
|
||||
":ssl",
|
||||
":ssl_header",
|
||||
":stream",
|
||||
":stringutils",
|
||||
":testclient",
|
||||
|
|
|
@ -689,7 +689,6 @@ webrtc_fuzzer_test("ssl_certificate_fuzzer") {
|
|||
sources = [ "ssl_certificate_fuzzer.cc" ]
|
||||
deps = [
|
||||
"../:rtp_test_utils",
|
||||
"../../rtc_base:digest",
|
||||
"../../rtc_base:ssl",
|
||||
"../../rtc_base:stringutils",
|
||||
]
|
||||
|
|
Loading…
Reference in a new issue