diff options
Diffstat (limited to '')
-rw-r--r-- | third_party/libwebrtc/pc/webrtc_session_description_factory.cc | 65 |
1 files changed, 27 insertions, 38 deletions
diff --git a/third_party/libwebrtc/pc/webrtc_session_description_factory.cc b/third_party/libwebrtc/pc/webrtc_session_description_factory.cc index 42a8da3e70..9919260aa3 100644 --- a/third_party/libwebrtc/pc/webrtc_session_description_factory.cc +++ b/third_party/libwebrtc/pc/webrtc_session_description_factory.cc @@ -128,13 +128,10 @@ WebRtcSessionDescriptionFactory::WebRtcSessionDescriptionFactory( RTC_DCHECK(signaling_thread_); if (!dtls_enabled) { - SetSdesPolicy(cricket::SEC_REQUIRED); - RTC_LOG(LS_VERBOSE) << "DTLS-SRTP disabled."; + RTC_LOG(LS_INFO) << "DTLS-SRTP disabled"; + transport_desc_factory_.SetInsecureForTesting(); return; } - - // SRTP-SDES is disabled if DTLS is on. - SetSdesPolicy(cricket::SEC_DISABLED); if (certificate) { // Use `certificate`. certificate_request_state_ = CERTIFICATE_WAITING; @@ -142,31 +139,32 @@ WebRtcSessionDescriptionFactory::WebRtcSessionDescriptionFactory( RTC_LOG(LS_VERBOSE) << "DTLS-SRTP enabled; has certificate parameter."; RTC_LOG(LS_INFO) << "Using certificate supplied to the constructor."; SetCertificate(certificate); - } else { - // Generate certificate. - certificate_request_state_ = CERTIFICATE_WAITING; - - auto callback = [weak_ptr = weak_factory_.GetWeakPtr()]( - rtc::scoped_refptr<rtc::RTCCertificate> certificate) { - if (!weak_ptr) { - return; - } - if (certificate) { - weak_ptr->SetCertificate(std::move(certificate)); - } else { - weak_ptr->OnCertificateRequestFailed(); - } - }; + return; + } + // Generate certificate. + RTC_DCHECK(cert_generator_); + certificate_request_state_ = CERTIFICATE_WAITING; + + auto callback = [weak_ptr = weak_factory_.GetWeakPtr()]( + rtc::scoped_refptr<rtc::RTCCertificate> certificate) { + if (!weak_ptr) { + return; + } + if (certificate) { + weak_ptr->SetCertificate(std::move(certificate)); + } else { + weak_ptr->OnCertificateRequestFailed(); + } + }; - rtc::KeyParams key_params = rtc::KeyParams(); - RTC_LOG(LS_VERBOSE) - << "DTLS-SRTP enabled; sending DTLS identity request (key type: " - << key_params.type() << ")."; + rtc::KeyParams key_params = rtc::KeyParams(); + RTC_LOG(LS_VERBOSE) + << "DTLS-SRTP enabled; sending DTLS identity request (key type: " + << key_params.type() << ")."; - // Request certificate. This happens asynchronously on a different thread. - cert_generator_->GenerateCertificateAsync(key_params, absl::nullopt, - std::move(callback)); - } + // Request certificate. This happens asynchronously on a different thread. + cert_generator_->GenerateCertificateAsync(key_params, absl::nullopt, + std::move(callback)); } WebRtcSessionDescriptionFactory::~WebRtcSessionDescriptionFactory() { @@ -258,15 +256,6 @@ void WebRtcSessionDescriptionFactory::CreateAnswer( } } -void WebRtcSessionDescriptionFactory::SetSdesPolicy( - cricket::SecurePolicy secure_policy) { - session_desc_factory_.set_secure(secure_policy); -} - -cricket::SecurePolicy WebRtcSessionDescriptionFactory::SdesPolicy() const { - return session_desc_factory_.secure(); -} - void WebRtcSessionDescriptionFactory::InternalCreateOffer( CreateSessionDescriptionRequest request) { if (sdp_info_->local_description()) { @@ -450,7 +439,6 @@ void WebRtcSessionDescriptionFactory::SetCertificate( on_certificate_ready_(certificate); transport_desc_factory_.set_certificate(std::move(certificate)); - transport_desc_factory_.set_secure(cricket::SEC_ENABLED); while (!create_session_description_requests_.empty()) { if (create_session_description_requests_.front().type == @@ -462,4 +450,5 @@ void WebRtcSessionDescriptionFactory::SetCertificate( create_session_description_requests_.pop(); } } + } // namespace webrtc |