diff options
| author | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-11 20:56:07 +0000 |
|---|---|---|
| committer | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-11 20:56:07 +0000 |
| commit | 77fcfdaf8229bb0ab82ebe7e823e6319b58cd74a (patch) | |
| tree | efd1354cb1c6894648e066e9e022b8158419d375 /remoting/protocol/content_description.cc | |
| parent | 6c37dc9da790b86dcf99bb3802d6718786f87a5e (diff) | |
| download | chromium_src-77fcfdaf8229bb0ab82ebe7e823e6319b58cd74a.zip chromium_src-77fcfdaf8229bb0ab82ebe7e823e6319b58cd74a.tar.gz chromium_src-77fcfdaf8229bb0ab82ebe7e823e6319b58cd74a.tar.bz2 | |
Remove key exchange code from JingleSession.
BUG=None
TEST=None
Review URL: http://codereview.chromium.org/7616017
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@96451 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/protocol/content_description.cc')
| -rw-r--r-- | remoting/protocol/content_description.cc | 33 |
1 files changed, 1 insertions, 32 deletions
diff --git a/remoting/protocol/content_description.cc b/remoting/protocol/content_description.cc index 8ea4f6b..d9b9477 100644 --- a/remoting/protocol/content_description.cc +++ b/remoting/protocol/content_description.cc @@ -31,7 +31,6 @@ const char kVideoTag[] = "video"; const char kResolutionTag[] = "initial-resolution"; const char kAuthenticationTag[] = "authentication"; const char kCertificateTag[] = "certificate"; -const char kMasterKeyTag[] = "master-key"; const char kAuthTokenTag[] = "auth-token"; const char kTransportAttr[] = "transport"; @@ -153,11 +152,9 @@ bool ParseChannelConfig(const XmlElement* element, bool codec_required, ContentDescription::ContentDescription( const CandidateSessionConfig* candidate_config, const std::string& auth_token, - const std::string& master_key, const std::string& certificate) : candidate_config_(candidate_config), auth_token_(auth_token), - master_key_(master_key), certificate_(certificate) { } @@ -172,8 +169,6 @@ ContentDescription::~ContentDescription() { } // <initial-resolution width="800" height="600" /> // <authentication> // <certificate>[BASE64 Encoded Certificate]</certificate> -// <master-key>[master key encrypted with hosts -// public key encoded with BASE64]</master-key> // <auth-token>...</auth-token> // IT2Me only. // </authentication> // </description> @@ -226,19 +221,6 @@ XmlElement* ContentDescription::ToXml() const { authentication_tag->AddElement(certificate_tag); } - if (!master_key().empty()) { - XmlElement* master_key_tag = new XmlElement( - QName(kChromotingXmlNamespace, kMasterKeyTag)); - - std::string master_key_base64; - if (!base::Base64Encode(master_key(), &master_key_base64)) { - LOG(DFATAL) << "Cannot perform base64 encode on master key"; - } - - master_key_tag->SetBodyText(master_key_base64); - authentication_tag->AddElement(master_key_tag); - } - if (!auth_token().empty()) { XmlElement* auth_token_tag = new XmlElement( QName(kChromotingXmlNamespace, kAuthTokenTag)); @@ -315,7 +297,6 @@ cricket::ContentDescription* ContentDescription::ParseXml( // Parse authentication information. std::string certificate; std::string auth_token; - std::string master_key; child = element->FirstNamed(QName(kChromotingXmlNamespace, kAuthenticationTag)); if (child) { @@ -330,17 +311,6 @@ cricket::ContentDescription* ContentDescription::ParseXml( } } - // Parse master-key. - const XmlElement* master_key_tag = - child->FirstNamed(QName(kChromotingXmlNamespace, kMasterKeyTag)); - if (master_key_tag) { - if (!base::Base64Decode(master_key_tag->BodyText(), &master_key)) { - LOG(ERROR) << "Failed to decode master-key received from the peer."; - return NULL; - } - master_key = master_key_tag->BodyText(); - } - // Parse auth-token. const XmlElement* auth_token_tag = child->FirstNamed(QName(kChromotingXmlNamespace, kAuthTokenTag)); @@ -349,8 +319,7 @@ cricket::ContentDescription* ContentDescription::ParseXml( } } - return new ContentDescription(config.release(), auth_token, master_key, - certificate); + return new ContentDescription(config.release(), auth_token, certificate); } LOG(ERROR) << "Invalid description: " << element->Str(); return NULL; |