From 4db5b979b749ce1141d1406391499715e697f34d Mon Sep 17 00:00:00 2001
From: Harald Alvestrand <hta@webrtc.org>
Date: Wed, 16 Nov 2022 08:32:19 +0000
Subject: [PATCH] Remove backwards compatibility functions in openssl

After changing base functions to a CHECK instead of an =0, these
are no longer needed.

Bug: webrtc:14632
Change-Id: If3f1a62905cf433486f4974b2153c9210d1e045b
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/283542
Reviewed-by: Tomas Gunnarsson <tommi@webrtc.org>
Commit-Queue: Harald Alvestrand <hta@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#38643}
---
 rtc_base/openssl_stream_adapter.cc | 28 ----------------------------
 rtc_base/openssl_stream_adapter.h  |  7 -------
 2 files changed, 35 deletions(-)

diff --git a/rtc_base/openssl_stream_adapter.cc b/rtc_base/openssl_stream_adapter.cc
index 5fa1a3c502..9fd8c8f395 100644
--- a/rtc_base/openssl_stream_adapter.cc
+++ b/rtc_base/openssl_stream_adapter.cc
@@ -561,21 +561,6 @@ void OpenSSLStreamAdapter::SetInitialRetransmissionTimeout(int timeout_ms) {
 //
 // StreamInterface Implementation
 //
-// Backwards compatible Write() method using deprecated API.
-// Needed because deprecated API is still =0 in API definition.
-StreamResult OpenSSLStreamAdapter::Write(const void* data,
-                                         size_t data_len,
-                                         size_t* written,
-                                         int* error) {
-  // TODO(bugs.webrtc.org/14632): Consider doing
-  // RTC_CHECK_NOTREACHED(); when downstream usage is eliminated.
-  size_t dummy_written;
-  int dummy_error;
-  return Write(
-      rtc::MakeArrayView(reinterpret_cast<const uint8_t*>(data), data_len),
-      written ? *written : dummy_written, error ? *error : dummy_error);
-}
-
 StreamResult OpenSSLStreamAdapter::Write(rtc::ArrayView<const uint8_t> data,
                                          size_t& written,
                                          int& error) {
@@ -637,19 +622,6 @@ StreamResult OpenSSLStreamAdapter::Write(rtc::ArrayView<const uint8_t> data,
   // not reached
 }
 
-// Backwards compatible Read() method using deprecated API.
-StreamResult OpenSSLStreamAdapter::Read(void* data,
-                                        size_t data_len,
-                                        size_t* read,
-                                        int* error) {
-  // TODO(bugs.webrtc.org/14632): Consider doing
-  // RTC_CHECK_NOTREACHED() when downstream usage is thought to be eliminated.
-  size_t dummy_read;
-  int dummy_error;
-  return Read(rtc::MakeArrayView(reinterpret_cast<uint8_t*>(data), data_len),
-              read ? *read : dummy_read, error ? *error : dummy_error);
-}
-
 StreamResult OpenSSLStreamAdapter::Read(rtc::ArrayView<uint8_t> data,
                                         size_t& read,
                                         int& error) {
diff --git a/rtc_base/openssl_stream_adapter.h b/rtc_base/openssl_stream_adapter.h
index 3c94ecd2ce..aee8d36aad 100644
--- a/rtc_base/openssl_stream_adapter.h
+++ b/rtc_base/openssl_stream_adapter.h
@@ -95,16 +95,9 @@ class OpenSSLStreamAdapter final : public SSLStreamAdapter {
   void SetMaxProtocolVersion(SSLProtocolVersion version) override;
   void SetInitialRetransmissionTimeout(int timeout_ms) override;
 
-  [[deprecated("bugs.webrtc.org/14632")]] StreamResult
-  Read(void* data, size_t data_len, size_t* read, int* error) override;
   StreamResult Read(rtc::ArrayView<uint8_t> data,
                     size_t& read,
                     int& error) override;
-  [[deprecated("bugs.webrtc.org/14632")]] StreamResult Write(
-      const void* data,
-      size_t data_len,
-      size_t* written,
-      int* error) override;
   StreamResult Write(rtc::ArrayView<const uint8_t> data,
                      size_t& written,
                      int& error) override;