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

fixed e2ee traceback

Browse source
This commit is contained in:
Brendan Taylor 2008-04-26 01:52:03 +00:00
parent 76808901eb
commit 051bd6e1b7
1 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/common/stanza_session.py
View file

@ -83,7 +83,7 @@ class StanzaSession(object):
def cancelled_negotiation(self): def cancelled_negotiation(self):
'''A negotiation has been cancelled, so reset this session to its default state.''' '''A negotiation has been cancelled, so reset this session to its default state.'''
if hasattr(self, 'control'): if self.control:
self.control.on_cancel_session_negotiation() self.control.on_cancel_session_negotiation()
self.status = None self.status = None
@ -778,7 +778,7 @@ class EncryptedStanzaSession(StanzaSession):
self.status = 'active' self.status = 'active'
self.enable_encryption = True self.enable_encryption = True
if hasattr(self, 'control'): if self.control:
self.control.print_esession_details() self.control.print_esession_details()
def final_steps_alice(self, form): def final_steps_alice(self, form):
@ -798,15 +798,14 @@ class EncryptedStanzaSession(StanzaSession):
self.do_retained_secret(k, srs) self.do_retained_secret(k, srs)
# don't need to calculate ks_s here # ks_s doesn't need to be calculated here
self.kc_s, self.km_s, self.ks_s = self.generate_initiator_keys(k) self.kc_s, self.km_s, self.ks_s = self.generate_initiator_keys(k)
self.kc_o, self.km_o, self.ks_o = self.generate_responder_keys(k) self.kc_o, self.km_o, self.ks_o = self.generate_responder_keys(k)
# 4.6.2 Verifying Bob's Identity # 4.6.2 Verifying Bob's Identity
self.verify_identity(form, self.d, False, 'b') self.verify_identity(form, self.d, False, 'b')
# Note: If Alice discovers an error then she SHOULD ignore any encrypted content she received in the stanza. # Note: If Alice discovers an error then she SHOULD ignore any encrypted content she received in the stanza.
if self.negotiated['logging'] == 'mustnot': if self.negotiated['logging'] == 'mustnot':
self.loggable = False self.loggable = False
@ -814,7 +813,7 @@ class EncryptedStanzaSession(StanzaSession):
self.status = 'active' self.status = 'active'
self.enable_encryption = True self.enable_encryption = True
if hasattr(self, 'control'): if self.control:
self.control.print_esession_details() self.control.print_esession_details()
# calculate and store the new retained secret # calculate and store the new retained secret