--- jabber/jabber.py 2011-02-22 11:15:44.706037736 +0100
+++ jabber/jabber.py 2011-02-22 11:31:25.628921665 +0100
@@ -65,7 +65,8 @@
# $Id: jabber.py,v 1.58 2004/01/18 05:27:10 snakeru Exp $
import xmlstream
-import sha, time
+import time
+import hashlib
debug=xmlstream.debug
@@ -524,7 +525,7 @@
token = auth_ret_query.getTag('token').getData()
seq = auth_ret_query.getTag('sequence').getData()
self.DEBUG("zero-k authentication supported",(DBG_INIT,DBG_NODE_IQ))
- hash = sha.new(sha.new(passwd).hexdigest()+token).hexdigest()
+ hash = hashlib.new('sha1', hashlib.new('sha1', passwd).hexdigest()+token).hexdigest()
for foo in xrange(int(seq)): hash = sha.new(hash).hexdigest()
q.insertTag('hash').insertData(hash)
@@ -532,7 +533,7 @@
self.DEBUG("digest authentication supported",(DBG_INIT,DBG_NODE_IQ))
digest = q.insertTag('digest')
- digest.insertData(sha.new(
+ digest.insertData(hashlib.new('sha1',
self.getIncomingID() + passwd).hexdigest() )
else:
self.DEBUG("plain text authentication supported",(DBG_INIT,DBG_NODE_IQ))
@@ -1397,7 +1398,7 @@
def auth(self,secret):
"""will disconnect on failure"""
self.send( u"<handshake id='1'>%s</handshake>"
- % sha.new( self.getIncomingID() + secret ).hexdigest()
+ % hashlib.new('sha1', self.getIncomingID() + secret ).hexdigest()
)
while not self._auth_OK:
self.DEBUG("waiting on handshake")