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

Unified Diff: webrtc/pc/channel.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: Disable GCM if ENABLE_EXTERNAL_AUTH is defined. Created 4 years, 5 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 | « webrtc/base/sslstreamadapter_unittest.cc ('k') | webrtc/pc/channel.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/pc/channel.h
diff --git a/webrtc/pc/channel.h b/webrtc/pc/channel.h
index 37eee47c79d6d5456722c34514acbaf00ff4325a..3c00ee3d4a1b684a826cc63c960f22d78c63171b 100644
--- a/webrtc/pc/channel.h
+++ b/webrtc/pc/channel.h
@@ -170,6 +170,8 @@ class BaseChannel
virtual cricket::MediaType media_type() = 0;
+ bool SetCryptoOptions(const rtc::CryptoOptions& crypto_options);
+
protected:
virtual MediaChannel* media_channel() const { return media_channel_; }
// Sets the |transport_channel_| (and |rtcp_transport_channel_|, if |rtcp_| is
@@ -303,6 +305,10 @@ class BaseChannel
// From MessageHandler
void OnMessage(rtc::Message* pmsg) override;
+ const rtc::CryptoOptions& crypto_options() const {
+ return crypto_options_;
+ }
+
// Handled in derived classes
// Get the SRTP crypto suites to use for RTP media
virtual void GetSrtpCryptoSuites_n(std::vector<int>* crypto_suites) const = 0;
@@ -351,6 +357,7 @@ class BaseChannel
bool has_received_packet_;
bool dtls_keyed_;
bool secure_required_;
+ rtc::CryptoOptions crypto_options_;
int rtp_abs_sendtime_extn_id_;
// MediaChannel related members that should be access from worker thread.
« no previous file with comments | « webrtc/base/sslstreamadapter_unittest.cc ('k') | webrtc/pc/channel.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698