copyleftie
/
gajim-plural
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix bad indentation

This commit is contained in:
Yann Leboulanger 2008-12-03 21:37:54 +00:00
parent 3392c54dd0
commit c271d1f15a
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/common/xmpp/auth.py
View File

@ -63,10 +63,10 @@ class NonSASL(PlugIn):
self.DEBUG("Performing zero-k authentication",'ok') self.DEBUG("Performing zero-k authentication",'ok')
def hasher(s): def hasher(s):
return sha.new(s).hexdigest() return sha.new(s).hexdigest()
def hash_n_times(s, count): def hash_n_times(s, count):
return count and hasher(hash_n_times(s, count-1)) or s return count and hasher(hash_n_times(s, count-1)) or s
hash_ = hash_n_times(hasher(hasher(self.password)+token), int(seq)) hash_ = hash_n_times(hasher(hasher(self.password)+token), int(seq))
query.setTagData('hash', hash_) query.setTagData('hash', hash_)

10
src/common/xmpp/client.py
View File

@ -284,11 +284,11 @@ class Component(CommonClient):
self.Server=server[0] self.Server=server[0]
CommonClient.connect(self,server=server,proxy=proxy) CommonClient.connect(self,server=server,proxy=proxy)
if self.connected and (self.typ=='jabberd2' or not self.typ and self.Dispatcher.Stream.features is not None): if self.connected and (self.typ=='jabberd2' or not self.typ and self.Dispatcher.Stream.features is not None):
self.defaultNamespace=auth.NS_CLIENT self.defaultNamespace=auth.NS_CLIENT
self.Dispatcher.RegisterNamespace(self.defaultNamespace) self.Dispatcher.RegisterNamespace(self.defaultNamespace)
self.Dispatcher.RegisterProtocol('iq',dispatcher.Iq) self.Dispatcher.RegisterProtocol('iq',dispatcher.Iq)
self.Dispatcher.RegisterProtocol('message',dispatcher.Message) self.Dispatcher.RegisterProtocol('message',dispatcher.Message)
self.Dispatcher.RegisterProtocol('presence',dispatcher.Presence) self.Dispatcher.RegisterProtocol('presence',dispatcher.Presence)
return self.connected return self.connected
def auth(self,name,password,dup=None,sasl=0): def auth(self,name,password,dup=None,sasl=0):

2
src/common/xmpp/commands.py
View File

@ -89,7 +89,7 @@ class Commands(PlugIn):
conn.send(Error(request,ERR_ITEM_NOT_FOUND)) conn.send(Error(request,ERR_ITEM_NOT_FOUND))
raise NodeProcessed raise NodeProcessed
elif node in self._handlers['']: elif node in self._handlers['']:
self._handlers[''][node]['execute'](conn,request) self._handlers[''][node]['execute'](conn,request)
else: else:
conn.send(Error(request,ERR_ITEM_NOT_FOUND)) conn.send(Error(request,ERR_ITEM_NOT_FOUND))
raise NodeProcessed raise NodeProcessed

2
src/osx/growl/Growl.py
View File

@ -135,7 +135,7 @@ class netgrowl:
checksum = md5.new() checksum = md5.new()
checksum.update(data) checksum.update(data)
if self.password: if self.password:
checksum.update(self.password) checksum.update(self.password)
data += checksum.digest() data += checksum.digest()
return data return data