Welcome to mirror list, hosted at ThFree Co, Russian Federation.

dev.gajim.org/gajim/gajim.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYann Leboulanger <asterix@lagaule.org>2012-06-14 20:34:07 +0400
committerYann Leboulanger <asterix@lagaule.org>2012-06-14 20:34:07 +0400
commit1fdf6b7e35f48bbaafef7030e6d611f0d315a53a (patch)
treec9f56ebe6b554fe67363b5575e1abf6b7c8ef369 /src/common/xmpp
parent2af1af2011220d38d4ef13e2583134af8df6b12b (diff)
jingle IBB and normal IBB are different
Diffstat (limited to 'src/common/xmpp')
-rw-r--r--src/common/xmpp/protocol.py28
1 files changed, 14 insertions, 14 deletions
diff --git a/src/common/xmpp/protocol.py b/src/common/xmpp/protocol.py
index daac07278..d4c5fb254 100644
--- a/src/common/xmpp/protocol.py
+++ b/src/common/xmpp/protocol.py
@@ -167,7 +167,7 @@ NS_HASHES_MD5 = 'urn:xmpp:hash-function-textual-names:md5'
NS_HASHES_SHA1 = 'urn:xmpp:hash-function-textual-names:sha-1'
NS_HASHES_SHA256 = 'urn:xmpp:hash-function-textual-names:sha-256'
NS_HASHES_SHA512 = 'urn:xmpp:hash-function-textual-names:sha-512'
-
+
xmpp_stream_error_conditions = '''
bad-format -- -- -- The entity has sent XML that cannot be processed.
bad-namespace-prefix -- -- -- The entity has sent a namespace prefix that is unsupported, or has sent no namespace prefix on an element that requires such a prefix.
@@ -1037,12 +1037,12 @@ class Iq(Protocol):
attrs={'id': self.getID()})
iq.setQuery(self.getQuery().getName()).setNamespace(self.getQueryNS())
return iq
-
-class Hashes(Node):
+
+class Hashes(Node):
"""
Hash elements for various XEPs as defined in XEP-300
"""
-
+
"""
RECOMENDED HASH USE:
Algorithm Support
@@ -1053,14 +1053,14 @@ class Hashes(Node):
SHA-256 MUST
SHA-512 SHOULD
"""
-
+
supported = ('md5', 'sha-1', 'sha-256', 'sha-512')
-
+
def __init__(self, nsp=NS_HASHES):
Node.__init__(self, None, {}, [], None, None, False, None)
self.setNamespace(nsp)
self.setName('hash')
-
+
def calculateHash(self, algo, file_string):
"""
Calculate the hash and add it. It is preferable doing it here
@@ -1078,12 +1078,12 @@ class Hashes(Node):
hl = hashlib.sha256()
elif algo == 'sha-512':
hl = hashlib.sha512()
-
+
if hl:
hl.update(file_string)
hash_ = hl.hexdigest()
else: # if it is a file
-
+
if algo == 'md5':
hl = hashlib.md5()
elif algo == 'sha-1':
@@ -1092,18 +1092,18 @@ class Hashes(Node):
hl = hashlib.sha256()
elif algo == 'sha-512':
hl = hashlib.sha512()
-
+
if hl:
for line in file_string:
hl.update(line)
hash_ = hl.hexdigest()
-
- return hash_
-
+
+ return hash_
+
def addHash(self, hash_, algo):
self.setAttr('algo', algo)
self.setData(hash_)
-
+
class Acks(Node):
"""
Acknowledgement elements for Stream Management