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

Unified Diff: talk/app/webrtc/peerconnection.cc

Issue 1528843005: Add support for GCM cipher suites from RFC 7714. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Rebased Created 4 years, 11 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 | « no previous file | talk/app/webrtc/peerconnection_unittest.cc » ('j') | webrtc/base/sslstreamadapter.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: talk/app/webrtc/peerconnection.cc
diff --git a/talk/app/webrtc/peerconnection.cc b/talk/app/webrtc/peerconnection.cc
index beae77097836474083ef0afec7955cdf5fe2c52f..e553c15565c24877de6042d321c6447f61661832 100644
--- a/talk/app/webrtc/peerconnection.cc
+++ b/talk/app/webrtc/peerconnection.cc
@@ -1535,6 +1535,7 @@ bool PeerConnection::GetOptionsForOffer(
if (session_->data_channel_type() == cricket::DCT_SCTP && HasDataChannels()) {
session_options->data_channel_type = cricket::DCT_SCTP;
}
+ session_options->crypto_options = factory_->options().crypto_options;
return true;
}
@@ -1559,6 +1560,7 @@ bool PeerConnection::GetOptionsForAnswer(
if (session_->data_channel_type() == cricket::DCT_SCTP) {
session_options->data_channel_type = cricket::DCT_SCTP;
}
+ session_options->crypto_options = factory_->options().crypto_options;
return true;
}
« no previous file with comments | « no previous file | talk/app/webrtc/peerconnection_unittest.cc » ('j') | webrtc/base/sslstreamadapter.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698