From 4c27a967671a93c9bb0f445c25d6e493bf81f17c Mon Sep 17 00:00:00 2001 From: jbauch Date: Thu, 27 Jul 2017 15:04:20 -0700 Subject: [PATCH] Remove libsrtp 2.0.0 compatibility code. 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} --- webrtc/pc/srtpsession.cc | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/webrtc/pc/srtpsession.cc b/webrtc/pc/srtpsession.cc index e8b29460a7..67ae9a6629 100644 --- a/webrtc/pc/srtpsession.cc +++ b/webrtc/pc/srtpsession.cc @@ -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. // Let's use it for getting the keys. 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 && srtp_context->session_keys->rtp_auth) { external_hmac = reinterpret_cast( 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(srtp_context->rtp_auth->state); - } -#endif if (!external_hmac) { LOG(LS_ERROR) << "Failed to get auth keys from libsrtp!.";