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

Unified Diff: remoting/protocol/jingle_session.h

Issue 7616017: Remove key exchange code from JingleSession. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 4 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 | « remoting/protocol/content_description.cc ('k') | remoting/protocol/jingle_session.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/protocol/jingle_session.h
diff --git a/remoting/protocol/jingle_session.h b/remoting/protocol/jingle_session.h
index e4e3a6f1d37f18f3470a72fe580087b2e5ff6133..2336d5faf4ed116db8b5b0fb07f4a2156bb8ce36 100644
--- a/remoting/protocol/jingle_session.h
+++ b/remoting/protocol/jingle_session.h
@@ -80,7 +80,6 @@ class JingleSession : public protocol::Session,
void set_candidate_config(const CandidateSessionConfig* candidate_config);
const std::string& local_certificate() const;
void Init(cricket::Session* cricket_session);
- std::string GetEncryptedMasterKey() const;
// Close all the channels and terminate the session.
void CloseInternal(int result, bool failed);
@@ -146,11 +145,6 @@ class JingleSession : public protocol::Session,
// Public key of the peer.
std::string peer_public_key_;
- // Master key used to derive ice keys for each ice
- // session. Generated on the client and sent to the host in the
- // session-initiate message (encrypted with the host's key).
- std::string master_key_;
-
// Shared secret to use in channel authentication. This is currently only
// used in IT2Me.
std::string shared_secret_;
« no previous file with comments | « remoting/protocol/content_description.cc ('k') | remoting/protocol/jingle_session.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698