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

webrtc/pc/mediasession.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 179 matching lines @@
 }
 
 void GetSupportedAudioCryptoSuiteNames(const rtc::CryptoOptions& crypto_options,
     std::vector<std::string>* crypto_suite_names) {
   GetSupportedCryptoSuiteNames(GetSupportedAudioCryptoSuites,
                                crypto_options, crypto_suite_names);
 }
 
 void GetSupportedVideoCryptoSuites(const rtc::CryptoOptions& crypto_options,
     std::vector<int>* crypto_suites) {
-  GetDefaultSrtpCryptoSuites(crypto_options, crypto_suites);
+  rtc::GetDefaultSrtpCryptoSuites(crypto_options, crypto_suites);
 }
 
 void GetSupportedVideoCryptoSuiteNames(const rtc::CryptoOptions& crypto_options,
     std::vector<std::string>* crypto_suite_names) {
   GetSupportedCryptoSuiteNames(GetSupportedVideoCryptoSuites,
                                crypto_options, crypto_suite_names);
 }
 
 void GetSupportedDataCryptoSuites(const rtc::CryptoOptions& crypto_options,
     std::vector<int>* crypto_suites) {
-  GetDefaultSrtpCryptoSuites(crypto_options, crypto_suites);
+  rtc::GetDefaultSrtpCryptoSuites(crypto_options, crypto_suites);
 }
 
 void GetSupportedDataCryptoSuiteNames(const rtc::CryptoOptions& crypto_options,
     std::vector<std::string>* crypto_suite_names) {
   GetSupportedCryptoSuiteNames(GetSupportedDataCryptoSuites,
                                crypto_options, crypto_suite_names);
 }
 
-void GetDefaultSrtpCryptoSuites(const rtc::CryptoOptions& crypto_options,
-    std::vector<int>* crypto_suites) {
-  if (crypto_options.enable_gcm_crypto_suites) {
-    crypto_suites->push_back(rtc::SRTP_AEAD_AES_256_GCM);
-    crypto_suites->push_back(rtc::SRTP_AEAD_AES_128_GCM);
-  }
-  crypto_suites->push_back(rtc::SRTP_AES128_CM_SHA1_80);
-}
-
 void GetDefaultSrtpCryptoSuiteNames(const rtc::CryptoOptions& crypto_options,
     std::vector<std::string>* crypto_suite_names) {
-  GetSupportedCryptoSuiteNames(GetDefaultSrtpCryptoSuites,
-                               crypto_options, crypto_suite_names);
+  GetSupportedCryptoSuiteNames(rtc::GetDefaultSrtpCryptoSuites, crypto_options,
+                               crypto_suite_names);
 }
 
 // Support any GCM cipher (if enabled through options). For video support only
 // 80-bit SHA1 HMAC. For audio 32-bit HMAC is tolerated unless bundle is enabled
 // because it is low overhead.
 // Pick the crypto in the list that is supported.
 static bool SelectCrypto(const MediaContentDescription* offer,
                          bool bundle,
                          const rtc::CryptoOptions& crypto_options,
                          CryptoParams *crypto) {
@@ skipping 1940 matching lines @@
       GetFirstMediaContentDescription(sdesc, MEDIA_TYPE_VIDEO));
 }
 
 DataContentDescription* GetFirstDataContentDescription(
     SessionDescription* sdesc) {
   return static_cast<DataContentDescription*>(
       GetFirstMediaContentDescription(sdesc, MEDIA_TYPE_DATA));
 }
 
 }  // namespace cricket