Changeset 9534

Timestamp:

04/26/08 03:52:03 (7 months ago)

Author:

bct

Message:

fixed e2ee traceback

Files:

• branches/session_centric/src/common/stanza_session.py (modified) (5 diffs)

branches/session_centric/src/common/stanza_session.py

@@ -84 +84 @@
                 '''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()
 
@@ -779 +779 @@
                 self.enable_encryption = True
 
-                if hasattr(self, 'control'):
+                if self.control:
                         self.control.print_esession_details()
 
@@ -799 +799 @@
                 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_o, self.km_o, self.ks_o = self.generate_responder_keys(k)
@@ -807 +806 @@
 
                 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':
@@ -815 +814 @@
                 self.enable_encryption = True
 
-                if hasattr(self, 'control'):
+                if self.control:
                         self.control.print_esession_details()