Add support for GCM cipher suites from RFC 7714.

webrtc/pc/channelmanager.h

 /*
  *  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 93 matching lines @@
   // Indicates whether any channels exist.
   bool has_channels() const {
     return (!voice_channels_.empty() || !video_channels_.empty());
   }
 
   bool GetOutputVolume(int* level);
   bool SetOutputVolume(int level);
   // RTX will be enabled/disabled in engines that support it. The supporting
   // engines will start offering an RTX codec. Must be called before Init().
   bool SetVideoRtxEnabled(bool enable);
+  bool SetCryptoOptions(const rtc::CryptoOptions& crypto_options);
 
   // Starts/stops the local microphone and enables polling of the input level.
   bool capturing() const { return capturing_; }
 
   // The operations below occur on the main thread.
 
   // Starts AEC dump using existing file, with a specified maximum file size in
   // bytes. When the limit is reached, logging will stop and the file will be
   // closed. If max_size_bytes is set to <= 0, no limit will be used.
   bool StartAecDump(rtc::PlatformFile file, int64_t max_size_bytes);
@@ skipping 43 matching lines @@
   bool initialized_;
   rtc::Thread* main_thread_;
   rtc::Thread* worker_thread_;
 
   VoiceChannels voice_channels_;
   VideoChannels video_channels_;
   DataChannels data_channels_;
 
   int audio_output_volume_;
   bool enable_rtx_;
+  rtc::CryptoOptions crypto_options_;

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

Again, I'd prefer to have a more explicit default set in the constructor here.

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

Done.

 
   bool capturing_;
 };
 
 }  // namespace cricket
 
 #endif  // WEBRTC_PC_CHANNELMANAGER_H_