diff --git a/pc/srtp_session.cc b/pc/srtp_session.cc index 193298400c..509c2c9124 100644 --- a/pc/srtp_session.cc +++ b/pc/srtp_session.cc @@ -168,52 +168,24 @@ SrtpSession::~SrtpSession() { } } -bool SrtpSession::SetSend(int crypto_suite, - const uint8_t* key, - size_t len, - const std::vector& extension_ids) { - return SetSend(crypto_suite, {key, len}, extension_ids); -} - bool SrtpSession::SetSend(int crypto_suite, const rtc::ZeroOnFreeBuffer& key, const std::vector& extension_ids) { return SetKey(ssrc_any_outbound, crypto_suite, key, extension_ids); } -bool SrtpSession::UpdateSend(int crypto_suite, - const uint8_t* key, - size_t len, - const std::vector& extension_ids) { - return UpdateSend(crypto_suite, {key, len}, extension_ids); -} - bool SrtpSession::UpdateSend(int crypto_suite, const rtc::ZeroOnFreeBuffer& key, const std::vector& extension_ids) { return UpdateKey(ssrc_any_outbound, crypto_suite, key, extension_ids); } -bool SrtpSession::SetRecv(int crypto_suite, - const uint8_t* key, - size_t len, - const std::vector& extension_ids) { - return SetReceive(crypto_suite, {key, len}, extension_ids); -} - bool SrtpSession::SetReceive(int crypto_suite, const rtc::ZeroOnFreeBuffer& key, const std::vector& extension_ids) { return SetKey(ssrc_any_inbound, crypto_suite, key, extension_ids); } -bool SrtpSession::UpdateRecv(int crypto_suite, - const uint8_t* key, - size_t len, - const std::vector& extension_ids) { - return UpdateReceive(crypto_suite, {key, len}, extension_ids); -} - bool SrtpSession::UpdateReceive(int crypto_suite, const rtc::ZeroOnFreeBuffer& key, const std::vector& extension_ids) { diff --git a/pc/srtp_session.h b/pc/srtp_session.h index 3bee25abdb..f9e7ae5d40 100644 --- a/pc/srtp_session.h +++ b/pc/srtp_session.h @@ -44,38 +44,18 @@ class SrtpSession { // Configures the session for sending data using the specified // crypto suite and key. Receiving must be done by a separate session. - [[deprecated("Pass ZeroOnFreeBuffer to SetSend")]] bool SetSend( - int crypto_suite, - const uint8_t* key, - size_t len, - const std::vector& extension_ids); bool SetSend(int crypto_suite, const rtc::ZeroOnFreeBuffer& key, const std::vector& extension_ids); - [[deprecated("Pass ZeroOnFreeBuffer to UpdateSend")]] bool UpdateSend( - int crypto_suite, - const uint8_t* key, - size_t len, - const std::vector& extension_ids); bool UpdateSend(int crypto_suite, const rtc::ZeroOnFreeBuffer& key, const std::vector& extension_ids); // Configures the session for receiving data using the specified // crypto suite and key. Sending must be done by a separate session. - [[deprecated("Pass ZeroOnFreeBuffer to SetReceive")]] bool SetRecv( - int crypto_suite, - const uint8_t* key, - size_t len, - const std::vector& extension_ids); bool SetReceive(int crypto_suite, const rtc::ZeroOnFreeBuffer& key, const std::vector& extension_ids); - [[deprecated("Pass ZeroOnFreeBuffer to UpdateReceive")]] bool UpdateRecv( - int crypto_suite, - const uint8_t* key, - size_t len, - const std::vector& extension_ids); bool UpdateReceive(int crypto_suite, const rtc::ZeroOnFreeBuffer& key, const std::vector& extension_ids);