Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1906)

Unified Diff: p2p/base/transportcontroller.cc

Issue 3011133002: Remove the support of fallback from DTLS to SDES. (Closed)
Patch Set: Merge and address the comments. Created 3 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « p2p/base/jseptransport.cc ('k') | p2p/base/transportdescriptionfactory.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: p2p/base/transportcontroller.cc
diff --git a/p2p/base/transportcontroller.cc b/p2p/base/transportcontroller.cc
index cfe43d23d4e9f1b1bae25633355a58b5c9cf75c0..12ea94fcd447b82e718699950ed7c7b31aca6bac 100644
--- a/p2p/base/transportcontroller.cc
+++ b/p2p/base/transportcontroller.cc
@@ -257,6 +257,10 @@ DtlsTransportInternal* TransportController::CreateDtlsTransport_n(
dtls->ice_transport()->SetIceRole(ice_role_);
dtls->ice_transport()->SetIceTiebreaker(ice_tiebreaker_);
dtls->ice_transport()->SetIceConfig(ice_config_);
+ if (certificate_) {
+ bool set_cert_success = dtls->SetLocalCertificate(certificate_);
+ RTC_DCHECK(set_cert_success);
+ }
// Connect to signals offered by the channels. Currently, the DTLS channel
// forwards signals from the ICE channel, so we only need to connect to the
@@ -535,12 +539,15 @@ bool TransportController::SetLocalCertificate_n(
certificate_ = certificate;
// Set certificate for JsepTransport, which verifies it matches the
- // fingerprint in SDP, and only applies it to the DTLS transport if a
- // fingerprint attribute is present in SDP. This is used for fallback from
- // DTLS to SDES.
+ // fingerprint in SDP, and DTLS transport.
+ // Fallback from DTLS to SDES is not supported.
for (auto& kv : transports_) {
kv.second->SetLocalCertificate(certificate_);
}
+ for (auto& channel : channels_) {
+ bool set_cert_success = channel->dtls()->SetLocalCertificate(certificate_);
+ RTC_DCHECK(set_cert_success);
+ }
return true;
}
« no previous file with comments | « p2p/base/jseptransport.cc ('k') | p2p/base/transportdescriptionfactory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698