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

Unified Diff: talk/session/media/mediasession.h

Issue 1528843005: Add support for GCM cipher suites from RFC 7714. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Added PeerConnection tests using GCM ciphers, fixed passing of flag through DtlsTransportChannel. Created 5 years 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
Index: talk/session/media/mediasession.h
diff --git a/talk/session/media/mediasession.h b/talk/session/media/mediasession.h
index 8a7f4ccf06758db5453b84c43bfadc1f2dceddd6..29474603f8f6d8685da1dbe6a8b812fe989a066c 100644
--- a/talk/session/media/mediasession.h
+++ b/talk/session/media/mediasession.h
@@ -103,7 +103,8 @@ struct MediaSessionOptions {
rtcp_mux_enabled(true),
bundle_enabled(false),
video_bandwidth(kAutoBandwidth),
- data_bandwidth(kDataMaxBandwidth) {
+ data_bandwidth(kDataMaxBandwidth),
+ enable_gcm_ciphers(false) {
pthatcher1 2015/12/18 20:31:32 Same here: can you change it to enable_gcm_crypto_
joachim 2015/12/19 15:26:23 Done.
}
bool has_audio() const {
@@ -144,6 +145,7 @@ struct MediaSessionOptions {
// bps. -1 == auto.
int video_bandwidth;
int data_bandwidth;
+ bool enable_gcm_ciphers;
TransportOptions transport_options;
struct Stream {
@@ -555,6 +557,8 @@ void GetSupportedDataCryptoSuiteNames(
std::vector<std::string>* crypto_suite_names);
void GetDefaultSrtpCryptoSuiteNames(
std::vector<std::string>* crypto_suite_names);
+void FilterGcmCiphers(std::vector<int>* crypto_suites);
+void FilterGcmCipherNames(std::vector<std::string>* crypto_suites);
} // namespace cricket

Powered by Google App Engine
This is Rietveld 408576698