Add support for GCM cipher suites from RFC 7714.

talk/app/webrtc/peerconnectioninterface.h

 /*
  * libjingle
  * Copyright 2012 Google Inc.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  *
  *  1. Redistributions of source code must retain the above copyright notice,
  *     this list of conditions and the following disclaimer.
  *  2. Redistributions in binary form must reproduce the above copyright notice,
@@ skipping 530 matching lines @@
 // argument.
 class PeerConnectionFactoryInterface : public rtc::RefCountInterface {
  public:
   class Options {
    public:
     Options() :
       disable_encryption(false),
       disable_sctp_data_channels(false),
       disable_network_monitor(false),
       network_ignore_mask(rtc::kDefaultNetworkIgnoreMask),
-      ssl_max_version(rtc::SSL_PROTOCOL_DTLS_10) {
+      ssl_max_version(rtc::SSL_PROTOCOL_DTLS_10),
+      enable_gcm_ciphers(false) {

[pthatcher1, 2015/12/18 20:31:31]

Can you call this enable_gcm_crypto_suites to be more consistent with our
naming?

[joachim, 2015/12/19 15:26:23]

Done.

     }
     bool disable_encryption;
     bool disable_sctp_data_channels;
     bool disable_network_monitor;
 
     // Sets the network types to ignore. For instance, calling this with
     // ADAPTER_TYPE_ETHERNET | ADAPTER_TYPE_LOOPBACK will ignore Ethernet and
     // loopback interfaces.
     int network_ignore_mask;
 
     // Sets the maximum supported protocol version. The highest version
     // supported by both ends will be used for the connection, i.e. if one
     // party supports DTLS 1.0 and the other DTLS 1.2, DTLS 1.0 will be used.
     rtc::SSLProtocolVersion ssl_max_version;
+
+    // May GCM ciphers from RFC 7714 be used for SRTP? Only codecs supported by
+    // both endpoints will be used, GCM must be supported by both to be used.

[pthatcher1, 2015/12/18 20:31:31]

Might be more clear as "Enable GCM crypto suites from RFC 7714 for SRTP.  GCM
will only be used if both sides enable it."

[joachim, 2015/12/19 15:26:23]

Done.

+    bool enable_gcm_ciphers;
   };
 
   virtual void SetOptions(const Options& options) = 0;
 
   // TODO(deadbeef): Remove this overload of CreatePeerConnection once clients
   // are moved to the new version.
   virtual rtc::scoped_refptr<PeerConnectionInterface> CreatePeerConnection(
       const PeerConnectionInterface::RTCConfiguration& configuration,
       const MediaConstraintsInterface* constraints,
       PortAllocatorFactoryInterface* allocator_factory,
@@ skipping 101 matching lines @@
 CreatePeerConnectionFactory(
     rtc::Thread* worker_thread,
     rtc::Thread* signaling_thread,
     AudioDeviceModule* default_adm,
     cricket::WebRtcVideoEncoderFactory* encoder_factory,
     cricket::WebRtcVideoDecoderFactory* decoder_factory);
 
 }  // namespace webrtc
 
 #endif  // TALK_APP_WEBRTC_PEERCONNECTIONINTERFACE_H_