Author: junglecow Date: 2006-12-29 02:46:46 +0100 (Fri, 29 Dec 2006) New Revision: 7734

Modified: trunk/data/other/servers.xml trunk/src/common/connection.py trunk/src/common/xmpp/transports_nb.py Log: - Fix TB on fingerprint mismatch - Add debug message on import failure of PyOpenSSL - Update gajim.org digest after migration to new server

Modified: trunk/data/other/servers.xml =================================================================== --- trunk/data/other/servers.xml 2006-12-28 19:03:55 UTC (rev 7733) +++ trunk/data/other/servers.xml 2006-12-29 01:46:46 UTC (rev 7734) @@ -374,6 +374,6 @@ </item> <item jid="gajim.org" name="Official server of Gajim" hidden="True"> <active port="5222"/> - <digest algo="sha1" value="78:CE:51:E9:0D:56:5D:8B:16:9C:10:9E:24:ED:5C:F8:46:59:B1:19"/> + <digest algo="sha1" value="25:79:5D:AC:3A:62:C0:96:5A:C9:36:76:D8:B0:78:1F:AA:DA:79:18"/> </item> </query>

Modified: trunk/src/common/connection.py =================================================================== --- trunk/src/common/connection.py 2006-12-28 19:03:55 UTC (rev 7733) +++ trunk/src/common/connection.py 2006-12-29 01:46:46 UTC (rev 7734) @@ -436,7 +436,6 @@

fpr_good = self._check_fingerprint(con, con_type) if fpr_good == False: - log.error(_("Fingerprint mismatch for %s: Got %s, expected %s"), hostname, got, expected) self.disconnect(on_purpose = True) self.dispatch('STATUS', 'offline') self.dispatch('CONNECTION_LOST', @@ -495,6 +494,9 @@ else: log.debug("Connection to %s doesn't seem to have a fingerprint:", hostname, exc_info=True)

+ if fpr_good == False: + log.error(_("Fingerprint mismatch for %s: Got %s, expected %s"), hostname, got, expected) + return fpr_good

def _register_handlers(self, con, con_type):

Modified: trunk/src/common/xmpp/transports_nb.py =================================================================== --- trunk/src/common/xmpp/transports_nb.py 2006-12-28 19:03:55 UTC (rev 7733) +++ trunk/src/common/xmpp/transports_nb.py 2006-12-29 01:46:46 UTC (rev 7734) @@ -41,6 +41,8 @@ USE_PYOPENSSL = True log.info("PyOpenSSL loaded") except ImportError: + log.debug("Import of PyOpenSSL failed:", exc_info=True) + # FIXME: Remove these prints before release, replace with a warning dialog. print >> sys.stderr, "=" * 79 print >> sys.stderr, "PyOpenSSL not found, falling back to Python builtin SSL objects (insecure)."