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

Remove libsrtp 2.0.0 compatibility code.

Browse Source 
The upgrade to libsrtp 2.1.0 rolled in https://codereview.webrtc.org/2968463002
so the compatibility code can be removed.

BUG=webrtc:7856

Review-Url: https://codereview.webrtc.org/2969543002
Cr-Commit-Position: refs/heads/master@{#19174}
This commit is contained in:
jbauch 2017-07-27 15:04:20 -07:00 committed by Commit Bot
parent 516711cde9
commit 4c27a96767
1 changed files with 0 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
webrtc/pc/srtpsession.cc
View File

@ -154,21 +154,11 @@ bool SrtpSession::GetRtpAuthParams(uint8_t** key, int* key_len, int* tag_len) {
// stream_template will be the reference context for other streams. // stream_template will be the reference context for other streams.
// Let's use it for getting the keys. // Let's use it for getting the keys.
srtp_stream_ctx_t* srtp_context = session_->stream_template; srtp_stream_ctx_t* srtp_context = session_->stream_template;
#if defined(SRTP_MAX_MKI_LEN)
// libsrtp 2.1.0
if (srtp_context && srtp_context->session_keys && if (srtp_context && srtp_context->session_keys &&
srtp_context->session_keys->rtp_auth) { srtp_context->session_keys->rtp_auth) {
external_hmac = reinterpret_cast<ExternalHmacContext*>( external_hmac = reinterpret_cast<ExternalHmacContext*>(
srtp_context->session_keys->rtp_auth->state); srtp_context->session_keys->rtp_auth->state);
} }
#else
// libsrtp 2.0.0
// TODO(jbauch): Remove after switching to libsrtp 2.1.0
if (srtp_context && srtp_context->rtp_auth) {
external_hmac =
reinterpret_cast<ExternalHmacContext*>(srtp_context->rtp_auth->state);
}
#endif
if (!external_hmac) { if (!external_hmac) {
LOG(LS_ERROR) << "Failed to get auth keys from libsrtp!."; LOG(LS_ERROR) << "Failed to get auth keys from libsrtp!.";