Removing "crypto_required" from MediaContentDescription.

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 731 matching lines @@
     const std::vector<C>& codecs,
     const SecurePolicy& secure_policy,
     const CryptoParamsVec* current_cryptos,
     const std::vector<std::string>& crypto_suites,
     const RtpHeaderExtensions& rtp_extensions,
     bool add_legacy_stream,
     StreamParamsVec* current_streams,
     MediaContentDescriptionImpl<C>* offer) {
   offer->AddCodecs(codecs);
 
-  if (secure_policy == SEC_REQUIRED) {
-    offer->set_crypto_required(CT_SDES);
-  }
   offer->set_rtcp_mux(options.rtcp_mux_enabled);
   if (offer->type() == cricket::MEDIA_TYPE_VIDEO) {
     offer->set_rtcp_reduced_size(true);
   }
   offer->set_multistream(options.is_muc);
   offer->set_rtp_header_extensions(rtp_extensions);
 
   if (!AddStreamParams(offer->type(), options, current_streams, offer,
                        add_legacy_stream)) {
     return false;
   }
 
 #ifdef HAVE_SRTP
   if (secure_policy != SEC_DISABLED) {
     if (current_cryptos) {
       AddMediaCryptos(*current_cryptos, offer);
     }
     if (offer->cryptos().empty()) {
       if (!CreateMediaCryptos(crypto_suites, offer)) {
         return false;
       }
     }
   }
 #endif
 
-  if (offer->crypto_required() == CT_SDES && offer->cryptos().empty()) {
+  if (secure_policy == SEC_REQUIRED && offer->cryptos().empty()) {

[pthatcher1, 2016/11/30 19:16:17]

I looked around at all the uses of the SecurePolicy enum.  In WebRtcSession and
WebRtcSessionDesriptionFactory and in mediasession.cc, we can replace it all
with "bool require_srtp", because only DISABLED and REQUIRED are used, and they
mean "require_srtp" and "!require_srtp"

With TransportDescriptionFactory, we can replace it with "dtls_enabled", because
it only uses DISABLED and ENABLED, and they mean "!dtls_enabled" and
"dtls_enabled".

We can do that in a separate CL, but it's nice to know that we can get rid of
SecurePolicy its weird name altogether.

Similarly, in this file, we can remove "secure_transport" and replace it with
"dlts_enabled"

[Taylor Brandstetter, 2016/12/01 02:41:34]

Sounds good; I'll keep that in mind next time this code bites me.

     return false;
   }
   return true;
 }
 
 template <class C>
 static bool ReferencedCodecsMatch(const std::vector<C>& codecs1,
                                   const int codec1_id,
                                   const std::vector<C>& codecs2,
                                   const int codec2_id) {
@@ skipping 270 matching lines @@
   if (sdes_policy != SEC_DISABLED) {
     CryptoParams crypto;
     if (SelectCrypto(offer, bundle_enabled, options.crypto_options, &crypto)) {
       if (current_cryptos) {
         FindMatchingCrypto(*current_cryptos, crypto, &crypto);
       }
       answer->AddCrypto(crypto);
     }
   }
 
-  if (answer->cryptos().empty() &&
-      (offer->crypto_required() == CT_SDES || sdes_policy == SEC_REQUIRED)) {
+  if (answer->cryptos().empty() && sdes_policy == SEC_REQUIRED) {
     return false;
   }
 
   if (!AddStreamParams(answer->type(), options, current_streams, answer,
                        add_legacy_stream)) {
     return false;  // Something went seriously wrong.
   }
 
   // Make sure the answer media content direction is per default set as
   // described in RFC3264 section 6.1.
@@ skipping 1107 matching lines @@
       GetFirstMediaContentDescription(sdesc, MEDIA_TYPE_VIDEO));
 }
 
 DataContentDescription* GetFirstDataContentDescription(
     SessionDescription* sdesc) {
   return static_cast<DataContentDescription*>(
       GetFirstMediaContentDescription(sdesc, MEDIA_TYPE_DATA));
 }
 
 }  // namespace cricket