From c32df1e84939e07ca5e1296d4ee8d69dea3f3321 Mon Sep 17 00:00:00 2001 From: Philipp Hancke Date: Wed, 2 Oct 2024 14:19:19 -0700 Subject: [PATCH] Clean up unused sigslot dependency from OpenSSL stream adapter BUG=webrtc:339300437,webrtc:42222066 Change-Id: I3efe104d7c65f516a8e6dd0034b2e0234db5748d Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/364540 Reviewed-by: Harald Alvestrand Commit-Queue: Philipp Hancke Cr-Commit-Position: refs/heads/main@{#43153} --- rtc_base/BUILD.gn | 1 - rtc_base/openssl_stream_adapter.h | 11 ++++------- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/rtc_base/BUILD.gn b/rtc_base/BUILD.gn index 1dace8a332..804d7aee3c 100644 --- a/rtc_base/BUILD.gn +++ b/rtc_base/BUILD.gn @@ -1619,7 +1619,6 @@ rtc_library("ssl_adapter") { "../system_wrappers:field_trial", "system:rtc_export", "task_utils:repeating_task", - "third_party/sigslot", "//third_party/abseil-cpp/absl/functional:any_invocable", "//third_party/abseil-cpp/absl/memory", "//third_party/abseil-cpp/absl/strings", diff --git a/rtc_base/openssl_stream_adapter.h b/rtc_base/openssl_stream_adapter.h index 7ad50c690a..a776c1ae5d 100644 --- a/rtc_base/openssl_stream_adapter.h +++ b/rtc_base/openssl_stream_adapter.h @@ -25,7 +25,8 @@ #include "api/array_view.h" #include "rtc_base/buffer.h" #ifdef OPENSSL_IS_BORINGSSL -#include "openssl/base.h" +#include + #include "rtc_base/boringssl_identity.h" #else #include "rtc_base/openssl_identity.h" @@ -35,7 +36,6 @@ #include "rtc_base/ssl_stream_adapter.h" #include "rtc_base/stream.h" #include "rtc_base/task_utils/repeating_task.h" -#include "rtc_base/third_party/sigslot/sigslot.h" #include "rtc_base/thread.h" namespace rtc { @@ -62,14 +62,11 @@ namespace rtc { // and it has an explicit SSL_CLOSED state. It should not be possible to send // any data in clear after one of the StartSSL methods has been called. -// Look in sslstreamadapter.h for documentation of the methods. - -class SSLCertChain; +// Look in ssl_stream_adapter.h for documentation of the methods. /////////////////////////////////////////////////////////////////////////////// -class OpenSSLStreamAdapter final : public SSLStreamAdapter, - public sigslot::has_slots<> { +class OpenSSLStreamAdapter final : public SSLStreamAdapter { public: OpenSSLStreamAdapter( std::unique_ptr stream,