commit ba957e486cfc08336255772396ea5ab2d4cc4b69
author Philipp Hancke <phancke@meta.com> Fri Oct 18 16:19:54 2024
committer WebRTC LUCI CQ <webrtc-scoped@luci-project-accounts.iam.gserviceaccount.com> Thu Oct 24 07:59:26 2024
tree ea6111533446aee1b526fd71b2d42bb34e4b4ff7
parent c959d2b2a061943df155b0feeee50affe730d111

Clean up deprecated variant of DTLS-SRTP key exporter

follow-up from
  https://webrtc-review.googlesource.com/c/src/+/364521 (reland as
  https://webrtc-review.googlesource.com/c/src/+/365180)

BUG=webrtc:357776213

Change-Id: I4f59d53407f41d903bca6664d85bd2c72d4ff1eb
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/365020
Reviewed-by: Harald Alvestrand <hta@webrtc.org>
Reviewed-by: Florent Castelli <orphis@webrtc.org>
Commit-Queue: Philipp Hancke <phancke@meta.com>
Cr-Commit-Position: refs/heads/main@{#43295}

p2p/base/dtls_transport.cc

diff --git a/p2p/base/dtls_transport.cc b/p2p/base/dtls_transport.cc
index 6696841..8d80c17 100644
--- a/p2p/base/dtls_transport.cc
+++ b/p2p/base/dtls_transport.cc
@@ -359,23 +359,6 @@
   return dtls_ ? dtls_->ExportSrtpKeyingMaterial(keying_material) : false;
 }
 
-bool DtlsTransport::ExportKeyingMaterial(absl::string_view label,
-                                         const uint8_t* context,
-                                         size_t context_len,
-                                         bool use_context,
-                                         uint8_t* result,
-                                         size_t result_len) {
-  RTC_DCHECK(!context);
-  RTC_DCHECK_EQ(context_len, 0u);
-  RTC_DCHECK_EQ(use_context, false);
-  rtc::ZeroOnFreeBuffer<uint8_t> temporary_result(result_len);
-  if (ExportSrtpKeyingMaterial(temporary_result)) {
-    std::memcpy(result, temporary_result.data(), result_len);
-    return true;
-  }
-  return false;
-}
-
 bool DtlsTransport::SetupDtls() {
   RTC_DCHECK(dtls_role_);
   {

p2p/base/dtls_transport.h

diff --git a/p2p/base/dtls_transport.h b/p2p/base/dtls_transport.h
index e33766f..e686907 100644
--- a/p2p/base/dtls_transport.h
+++ b/p2p/base/dtls_transport.h
@@ -182,14 +182,6 @@
   bool ExportSrtpKeyingMaterial(
       rtc::ZeroOnFreeBuffer<uint8_t>& keying_material) override;
 
-  [[deprecated("Use ExportSrtpKeyingMaterial instead")]] bool
-  ExportKeyingMaterial(absl::string_view label,
-                       const uint8_t* context,
-                       size_t context_len,
-                       bool use_context,
-                       uint8_t* result,
-                       size_t result_len) override;
-
   IceTransportInternal* ice_transport() override;
 
   // For informational purposes. Tells if the DTLS handshake has finished.

p2p/base/dtls_transport_internal.h

diff --git a/p2p/base/dtls_transport_internal.h b/p2p/base/dtls_transport_internal.h
index 4a182c2..ceb898b 100644
--- a/p2p/base/dtls_transport_internal.h
+++ b/p2p/base/dtls_transport_internal.h
@@ -92,14 +92,6 @@
   virtual bool ExportSrtpKeyingMaterial(
       rtc::ZeroOnFreeBuffer<uint8_t>& keying_material) = 0;
 
-  [[deprecated("Use ExportSrtpKeyingMaterial instead")]] virtual bool
-  ExportKeyingMaterial(absl::string_view label,
-                       const uint8_t* context,
-                       size_t context_len,
-                       bool use_context,
-                       uint8_t* result,
-                       size_t result_len) = 0;
-
   // Set DTLS remote fingerprint. Must be after local identity set.
   ABSL_DEPRECATED("Use SetRemoteParameters instead.")
   virtual bool SetRemoteFingerprint(absl::string_view digest_alg,

p2p/base/dtls_transport_unittest.cc

diff --git a/p2p/base/dtls_transport_unittest.cc b/p2p/base/dtls_transport_unittest.cc
index d7f7c60..81673ce 100644
--- a/p2p/base/dtls_transport_unittest.cc
+++ b/p2p/base/dtls_transport_unittest.cc
@@ -458,8 +458,6 @@
   TestTransfer(500, 100, /*srtp=*/false);
 }
 
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
 TEST_F(DtlsTransportTest, KeyingMaterialExporter) {
   PrepareDtls(rtc::KT_DEFAULT);
   ASSERT_TRUE(Connect());
@@ -474,15 +472,7 @@
   EXPECT_TRUE(client1_.dtls_transport()->ExportSrtpKeyingMaterial(client1_out));
   EXPECT_TRUE(client2_.dtls_transport()->ExportSrtpKeyingMaterial(client2_out));
   EXPECT_EQ(client1_out, client2_out);
-
-  // Legacy variant using the deprecated API.
-  rtc::ZeroOnFreeBuffer<uint8_t> client1_out_legacy(2 * (key_len + salt_len));
-  EXPECT_TRUE(client1_.dtls_transport()->ExportKeyingMaterial(
-      "EXTRACTOR-dtls_srtp", nullptr, 0, false, client1_out_legacy.data(),
-      client1_out_legacy.size()));
-  EXPECT_EQ(client1_out, client1_out_legacy);
 }
-#pragma clang diagnostic pop
 
 class DtlsTransportVersionTest
     : public DtlsTransportTestBase,

p2p/base/fake_dtls_transport.h

diff --git a/p2p/base/fake_dtls_transport.h b/p2p/base/fake_dtls_transport.h
index e68b5e5..ca3209e 100644
--- a/p2p/base/fake_dtls_transport.h
+++ b/p2p/base/fake_dtls_transport.h
@@ -235,18 +235,6 @@
     }
     return do_dtls_;
   }
-  bool ExportKeyingMaterial(absl::string_view label,
-                            const uint8_t* context,
-                            size_t context_len,
-                            bool use_context,
-                            uint8_t* result,
-                            size_t result_len) override {
-    if (!do_dtls_) {
-      return false;
-    }
-    memset(result, 0xff, result_len);
-    return true;
-  }
   void set_ssl_max_protocol_version(rtc::SSLProtocolVersion version) {
     ssl_max_version_ = version;
   }