Blame SOURCES/jabberpy-sha-deprecation.patch

42adf4
diff --git jabberpy-0.5-0/jabber/jabber.py jabberpy-0.5-0/jabber/jabber.py
42adf4
index 3074aa5..ab9d9b3 100644
42adf4
--- jabber/jabber.py
42adf4
+++ jabber/jabber.py
42adf4
@@ -65,7 +65,8 @@ An example of usage for a simple client would be ( only psuedo code !)
42adf4
 # $Id: jabber.py,v 1.58 2004/01/18 05:27:10 snakeru Exp $
42adf4
 
42adf4
 import xmlstream
42adf4
-import sha, time
42adf4
+import time
42adf4
+import hashlib
42adf4
 
42adf4
 debug=xmlstream.debug
42adf4
 
42adf4
@@ -524,15 +525,15 @@ class Client(Connection):
42adf4
             token = auth_ret_query.getTag('token').getData()
42adf4
             seq = auth_ret_query.getTag('sequence').getData()
42adf4
             self.DEBUG("zero-k authentication supported",(DBG_INIT,DBG_NODE_IQ))
42adf4
-            hash = sha.new(sha.new(passwd).hexdigest()+token).hexdigest()
42adf4
-            for foo in xrange(int(seq)): hash = sha.new(hash).hexdigest()
42adf4
+            hash = hashlib.new('sha1', hashlib.new('sha1', passwd).hexdigest()+token).hexdigest()
42adf4
+            for foo in xrange(int(seq)): hash = hashlib.new('sha1', hash).hexdigest()
42adf4
             q.insertTag('hash').insertData(hash)
42adf4
 
42adf4
         elif auth_ret_query.getTag('digest'):
42adf4
 
42adf4
             self.DEBUG("digest authentication supported",(DBG_INIT,DBG_NODE_IQ))
42adf4
             digest = q.insertTag('digest')
42adf4
-            digest.insertData(sha.new(
42adf4
+            digest.insertData(hashlib.new('sha1',
42adf4
                 self.getIncomingID() + passwd).hexdigest() )
42adf4
         else:
42adf4
             self.DEBUG("plain text authentication supported",(DBG_INIT,DBG_NODE_IQ))
42adf4
@@ -1397,7 +1398,7 @@ class Component(Connection):
42adf4
     def auth(self,secret):
42adf4
         """will disconnect on failure"""
42adf4
         self.send( u"<handshake id='1'>%s</handshake>"
42adf4
-                   % sha.new( self.getIncomingID() + secret ).hexdigest()
42adf4
+                   % hashlib.new('sha1', self.getIncomingID() + secret ).hexdigest()
42adf4
                   )
42adf4
         while not self._auth_OK:
42adf4
             self.DEBUG("waiting on handshake")