admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Clean up deprecated variant of DTLS-SRTP key exporter

Browse Source 
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}
This commit is contained in:
Philipp Hancke 2024-10-18 18:19:54 +02:00 committed by WebRTC LUCI CQ
parent c959d2b2a0
commit ba957e486c
5 changed files with 0 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
p2p/base/dtls_transport.cc
View File

@ -359,23 +359,6 @@ bool DtlsTransport::ExportSrtpKeyingMaterial(
return dtls_ ? dtls_->ExportSrtpKeyingMaterial(keying_material) : false; 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() { bool DtlsTransport::SetupDtls() {
RTC_DCHECK(dtls_role_); RTC_DCHECK(dtls_role_);
{ {

8
p2p/base/dtls_transport.h
View File

@ -182,14 +182,6 @@ class DtlsTransport : public DtlsTransportInternal {
bool ExportSrtpKeyingMaterial( bool ExportSrtpKeyingMaterial(
rtc::ZeroOnFreeBuffer<uint8_t>& keying_material) override; 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; IceTransportInternal* ice_transport() override;
// For informational purposes. Tells if the DTLS handshake has finished. // For informational purposes. Tells if the DTLS handshake has finished.

8
p2p/base/dtls_transport_internal.h
View File

@ -92,14 +92,6 @@ class DtlsTransportInternal : public rtc::PacketTransportInternal {
virtual bool ExportSrtpKeyingMaterial( virtual bool ExportSrtpKeyingMaterial(
rtc::ZeroOnFreeBuffer<uint8_t>& keying_material) = 0; 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. // Set DTLS remote fingerprint. Must be after local identity set.
ABSL_DEPRECATED("Use SetRemoteParameters instead.") ABSL_DEPRECATED("Use SetRemoteParameters instead.")
virtual bool SetRemoteFingerprint(absl::string_view digest_alg, virtual bool SetRemoteFingerprint(absl::string_view digest_alg,

10
p2p/base/dtls_transport_unittest.cc
View File

@ -458,8 +458,6 @@ TEST_F(DtlsTransportTest, TestTransferDtlsCombineRecords) {
TestTransfer(500, 100, /*srtp=*/false); TestTransfer(500, 100, /*srtp=*/false);
} }
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
TEST_F(DtlsTransportTest, KeyingMaterialExporter) { TEST_F(DtlsTransportTest, KeyingMaterialExporter) {
PrepareDtls(rtc::KT_DEFAULT); PrepareDtls(rtc::KT_DEFAULT);
ASSERT_TRUE(Connect()); ASSERT_TRUE(Connect());
@ -474,15 +472,7 @@ TEST_F(DtlsTransportTest, KeyingMaterialExporter) {
EXPECT_TRUE(client1_.dtls_transport()->ExportSrtpKeyingMaterial(client1_out)); EXPECT_TRUE(client1_.dtls_transport()->ExportSrtpKeyingMaterial(client1_out));
EXPECT_TRUE(client2_.dtls_transport()->ExportSrtpKeyingMaterial(client2_out)); EXPECT_TRUE(client2_.dtls_transport()->ExportSrtpKeyingMaterial(client2_out));
EXPECT_EQ(client1_out, 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 class DtlsTransportVersionTest
: public DtlsTransportTestBase, : public DtlsTransportTestBase,

12
p2p/base/fake_dtls_transport.h
View File

@ -235,18 +235,6 @@ class FakeDtlsTransport : public DtlsTransportInternal {
} }
return do_dtls_; 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) { void set_ssl_max_protocol_version(rtc::SSLProtocolVersion version) {
ssl_max_version_ = version; ssl_max_version_ = version;
} }