Negotiate the same SRTP crypto suites for every DTLS association formed.

webrtc/pc/channel.cc

Index: webrtc/pc/channel.cc
diff --git a/webrtc/pc/channel.cc b/webrtc/pc/channel.cc
index d45e220d5c7843b9eab9099d7ccdd58d6b4e9dc6..59fca4a9d20c287626b4f2d7abbaa33bbf79d3af 100644
--- a/webrtc/pc/channel.cc
+++ b/webrtc/pc/channel.cc
@@ -242,14 +242,6 @@ bool BaseChannel::InitNetwork_n(
   SetTransports_n(rtp_dtls_transport, rtcp_dtls_transport, rtp_packet_transport,
                   rtcp_packet_transport);
 
-  if (rtp_dtls_transport_ &&
-      !SetDtlsSrtpCryptoSuites_n(rtp_dtls_transport_, false)) {
-    return false;
-  }
-  if (rtcp_dtls_transport_ &&
-      !SetDtlsSrtpCryptoSuites_n(rtcp_dtls_transport_, true)) {
-    return false;
-  }
   if (rtp_transport_.rtcp_mux_required()) {
     rtcp_mux_filter_.SetActive();
   }
@@ -590,11 +582,6 @@ int BaseChannel::SetOption_n(SocketType type,
   return transport ? transport->SetOption(opt, value) : -1;
 }
 
-bool BaseChannel::SetCryptoOptions(const rtc::CryptoOptions& crypto_options) {
-  crypto_options_ = crypto_options;
-  return true;
-}
-
 void BaseChannel::OnWritableState(rtc::PacketTransportInternal* transport) {
   RTC_DCHECK(transport == rtp_transport_.rtp_packet_transport() ||
              transport == rtp_transport_.rtcp_packet_transport());
@@ -1021,19 +1008,6 @@ void BaseChannel::SignalDtlsSrtpSetupFailure_s(bool rtcp) {
   SignalDtlsSrtpSetupFailure(this, rtcp);
 }
 
-bool BaseChannel::SetDtlsSrtpCryptoSuites_n(DtlsTransportInternal* transport,
-                                            bool rtcp) {
-  std::vector<int> crypto_suites;
-  // We always use the default SRTP crypto suites for RTCP, but we may use
-  // different crypto suites for RTP depending on the media type.
-  if (!rtcp) {
-    GetSrtpCryptoSuites_n(&crypto_suites);
-  } else {
-    GetDefaultSrtpCryptoSuites(crypto_options(), &crypto_suites);
-  }
-  return transport->SetSrtpCryptoSuites(crypto_suites);
-}
-
 bool BaseChannel::ShouldSetupDtlsSrtp_n() const {
   // Since DTLS is applied to all transports, checking RTP should be enough.
   return rtp_dtls_transport_ && rtp_dtls_transport_->IsDtlsActive();
@@ -1956,11 +1930,6 @@ void VoiceChannel::OnAudioMonitorUpdate(AudioMonitor* monitor,
   SignalAudioMonitor(this, info);
 }
 
-void VoiceChannel::GetSrtpCryptoSuites_n(
-    std::vector<int>* crypto_suites) const {
-  GetSupportedAudioCryptoSuites(crypto_options(), crypto_suites);
-}
-
 VideoChannel::VideoChannel(rtc::Thread* worker_thread,
                            rtc::Thread* network_thread,
                            rtc::Thread* signaling_thread,
@@ -2212,11 +2181,6 @@ void VideoChannel::OnMediaMonitorUpdate(
   SignalMediaMonitor(this, info);
 }
 
-void VideoChannel::GetSrtpCryptoSuites_n(
-    std::vector<int>* crypto_suites) const {
-  GetSupportedVideoCryptoSuites(crypto_options(), crypto_suites);
-}
-
 RtpDataChannel::RtpDataChannel(rtc::Thread* worker_thread,
                                rtc::Thread* network_thread,
                                rtc::Thread* signaling_thread,
@@ -2487,9 +2451,4 @@ void RtpDataChannel::OnDataChannelReadyToSend(bool writable) {
                            new DataChannelReadyToSendMessageData(writable));
 }
 
-void RtpDataChannel::GetSrtpCryptoSuites_n(
-    std::vector<int>* crypto_suites) const {
-  GetSupportedDataCryptoSuites(crypto_options(), crypto_suites);
-}
-
 }  // namespace cricket