From 8356256f176ae12051251c2e7f72a9abfc8830d5 Mon Sep 17 00:00:00 2001 From: Emmanuel Gil Peyrot Date: Wed, 14 Jun 2017 20:29:52 +0100 Subject: [PATCH] Update to XEP-0300 version 0.5 (:2 namespace). --- src/common/gajim.py | 2 +- src/common/jingle.py | 2 +- src/common/jingle_content.py | 2 +- src/common/jingle_session.py | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/common/gajim.py b/src/common/gajim.py index fc7fc323b..9726c4064 100644 --- a/src/common/gajim.py +++ b/src/common/gajim.py @@ -253,7 +253,7 @@ gajim_common_features = [nbxmpp.NS_BYTESTREAM, nbxmpp.NS_SI, nbxmpp.NS_FILE, nbxmpp.NS_REGISTER, nbxmpp.NS_VERSION, nbxmpp.NS_DATA, nbxmpp.NS_ENCRYPTED, 'msglog', 'sslc2s', 'stringprep', nbxmpp.NS_PING, nbxmpp.NS_TIME_REVISED, nbxmpp.NS_SSN, nbxmpp.NS_MOOD, nbxmpp.NS_ACTIVITY, nbxmpp.NS_NICK, - nbxmpp.NS_ROSTERX, nbxmpp.NS_SECLABEL, nbxmpp.NS_HASHES, + nbxmpp.NS_ROSTERX, nbxmpp.NS_SECLABEL, nbxmpp.NS_HASHES_2, nbxmpp.NS_HASHES_MD5, nbxmpp.NS_HASHES_SHA1, nbxmpp.NS_HASHES_SHA256, nbxmpp.NS_HASHES_SHA512, nbxmpp.NS_CONFERENCE] diff --git a/src/common/jingle.py b/src/common/jingle.py index 93f6b1011..6903679b9 100644 --- a/src/common/jingle.py +++ b/src/common/jingle.py @@ -172,7 +172,7 @@ class ConnectionJingle(object): return c.transport.sid def __hash_support(self, contact): - if contact.supports(nbxmpp.NS_HASHES): + if contact.supports(nbxmpp.NS_HASHES_2): if contact.supports(nbxmpp.NS_HASHES_BLAKE2B_512): return 'blake2b-512' elif contact.supports(nbxmpp.NS_HASHES_BLAKE2B_256): diff --git a/src/common/jingle_content.py b/src/common/jingle_content.py index 0bba140ef..9d82c821f 100644 --- a/src/common/jingle_content.py +++ b/src/common/jingle_content.py @@ -192,7 +192,7 @@ class JingleContent: if self.file_props.type_ == 'r': if self.file_props.hash_: file_tag.addChild('hash', attrs={'algo': self.file_props.algo}, - namespace=nbxmpp.NS_HASHES, + namespace=nbxmpp.NS_HASHES_2, payload=self.file_props.hash_) else: # if the file is less than 10 mb, then it is small diff --git a/src/common/jingle_session.py b/src/common/jingle_session.py index 79d724ffb..670fc58e0 100644 --- a/src/common/jingle_session.py +++ b/src/common/jingle_session.py @@ -444,7 +444,7 @@ class JingleSession: for child in payload: if child.getName() == 'checksum': hash_ = child.getTag('file').getTag(name='hash', - namespace=nbxmpp.NS_HASHES) + namespace=nbxmpp.NS_HASHES_2) algo = hash_.getAttr('algo') if algo in nbxmpp.Hashes.supported: file_props = FilesProp.getFileProp(self.connection.name,