diff --git a/p2p/base/dtls_transport.cc b/p2p/base/dtls_transport.cc index 66968415fd..8d80c17351 100644 --- a/p2p/base/dtls_transport.cc +++ b/p2p/base/dtls_transport.cc @@ -359,23 +359,6 @@ bool DtlsTransport::ExportSrtpKeyingMaterial( 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 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_); { diff --git a/p2p/base/dtls_transport.h b/p2p/base/dtls_transport.h index e33766f388..e686907094 100644 --- a/p2p/base/dtls_transport.h +++ b/p2p/base/dtls_transport.h @@ -182,14 +182,6 @@ class DtlsTransport : public DtlsTransportInternal { bool ExportSrtpKeyingMaterial( rtc::ZeroOnFreeBuffer& 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. diff --git a/p2p/base/dtls_transport_internal.h b/p2p/base/dtls_transport_internal.h index 4a182c2398..ceb898b9fb 100644 --- a/p2p/base/dtls_transport_internal.h +++ b/p2p/base/dtls_transport_internal.h @@ -92,14 +92,6 @@ class DtlsTransportInternal : public rtc::PacketTransportInternal { virtual bool ExportSrtpKeyingMaterial( rtc::ZeroOnFreeBuffer& 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, diff --git a/p2p/base/dtls_transport_unittest.cc b/p2p/base/dtls_transport_unittest.cc index d7f7c608de..81673cec3a 100644 --- a/p2p/base/dtls_transport_unittest.cc +++ b/p2p/base/dtls_transport_unittest.cc @@ -458,8 +458,6 @@ TEST_F(DtlsTransportTest, TestTransferDtlsCombineRecords) { 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 @@ TEST_F(DtlsTransportTest, KeyingMaterialExporter) { 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 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, diff --git a/p2p/base/fake_dtls_transport.h b/p2p/base/fake_dtls_transport.h index e68b5e5df8..ca3209ec09 100644 --- a/p2p/base/fake_dtls_transport.h +++ b/p2p/base/fake_dtls_transport.h @@ -235,18 +235,6 @@ class FakeDtlsTransport : public DtlsTransportInternal { } 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; }