Add support for GCM cipher suites from RFC 7714.

webrtc/pc/channelmanager.cc

 /*
  *  Copyright 2004 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 81 matching lines @@
   // app.
   if (!initialized_) {
     enable_rtx_ = enable;
     return true;
   } else {
     LOG(LS_WARNING) << "Cannot toggle rtx after initialization!";
     return false;
   }
 }
 
+bool ChannelManager::SetCryptoOptions(
+    const rtc::CryptoOptions& crypto_options) {
+  crypto_options_ = crypto_options;

[mattdr, 2016/05/06 22:34:14]

Maybe this should fail or log if there are active channels? API consumers might
imagine this will change the crypto on existing channels, instead of them
keeping a copy of this state.

Could also consider renaming this to, say, SetCryptoSetupOptions.

[joachim, 2016/05/09 23:21:40]

Done (added warning log and comment in header but didn't rename).

+  return true;
+}
+
 void ChannelManager::GetSupportedAudioCodecs(
     std::vector<AudioCodec>* codecs) const {
   codecs->clear();
 
   for (std::vector<AudioCodec>::const_iterator it =
            media_engine_->audio_codecs().begin();
       it != media_engine_->audio_codecs().end(); ++it) {
     codecs->push_back(*it);
   }
 }
@@ skipping 111 matching lines @@
   ASSERT(worker_thread_ == rtc::Thread::Current());
   ASSERT(nullptr != media_controller);
   VoiceMediaChannel* media_channel = media_engine_->CreateChannel(
       media_controller->call_w(), media_controller->config(), options);
   if (!media_channel)
     return nullptr;
 
   VoiceChannel* voice_channel =
       new VoiceChannel(worker_thread_, media_engine_.get(), media_channel,
                        transport_controller, content_name, rtcp);
+  voice_channel->SetCryptoOptions(crypto_options_);
   if (!voice_channel->Init()) {
     delete voice_channel;
     return nullptr;
   }
   voice_channels_.push_back(voice_channel);
   return voice_channel;
 }
 
 void ChannelManager::DestroyVoiceChannel(VoiceChannel* voice_channel) {
   TRACE_EVENT0("webrtc", "ChannelManager::DestroyVoiceChannel");
@@ skipping 38 matching lines @@
   ASSERT(worker_thread_ == rtc::Thread::Current());
   ASSERT(nullptr != media_controller);
   VideoMediaChannel* media_channel = media_engine_->CreateVideoChannel(
       media_controller->call_w(), media_controller->config(), options);
   if (media_channel == NULL) {
     return NULL;
   }
 
   VideoChannel* video_channel = new VideoChannel(
       worker_thread_, media_channel, transport_controller, content_name, rtcp);
+  video_channel->SetCryptoOptions(crypto_options_);
   if (!video_channel->Init()) {
     delete video_channel;
     return NULL;
   }
   video_channels_.push_back(video_channel);
   return video_channel;
 }
 
 void ChannelManager::DestroyVideoChannel(VideoChannel* video_channel) {
   TRACE_EVENT0("webrtc", "ChannelManager::DestroyVideoChannel");
@@ skipping 38 matching lines @@
   DataMediaChannel* media_channel = data_media_engine_->CreateChannel(
       data_channel_type);
   if (!media_channel) {
     LOG(LS_WARNING) << "Failed to create data channel of type "
                     << data_channel_type;
     return NULL;
   }
 
   DataChannel* data_channel = new DataChannel(
       worker_thread_, media_channel, transport_controller, content_name, rtcp);
+  data_channel->SetCryptoOptions(crypto_options_);
   if (!data_channel->Init()) {
     LOG(LS_WARNING) << "Failed to init data channel.";
     delete data_channel;
     return NULL;
   }
   data_channels_.push_back(data_channel);
   return data_channel;
 }
 
 void ChannelManager::DestroyDataChannel(DataChannel* data_channel) {
@@ skipping 58 matching lines @@
   return worker_thread_->Invoke<bool>(
       Bind(&MediaEngineInterface::StartRtcEventLog, media_engine_.get(), file));
 }
 
 void ChannelManager::StopRtcEventLog() {
   worker_thread_->Invoke<void>(
       Bind(&MediaEngineInterface::StopRtcEventLog, media_engine_.get()));
 }
 
 }  // namespace cricket