Author: junglecow Date: 2006-12-28 00:28:47 +0100 (Thu, 28 Dec 2006) New Revision: 7728
Modified: trunk/src/common/connection.py Log: - More accurate description of None outcome of _check_fingerprint - Check for presence of PyOpenSSL in fingerprint check. Fixes #2841.
Modified: trunk/src/common/connection.py =================================================================== --- trunk/src/common/connection.py 2006-12-27 23:25:32 UTC (rev 7727) +++ trunk/src/common/connection.py 2006-12-27 23:28:47 UTC (rev 7728) @@ -448,7 +448,7 @@ return
if fpr_good == None: - log.warning(_("No fingerprint in database for %s. Connection could be insecure."), hostname) + log.warning(_("Unable to check fingerprint for %s. Connection could be insecure."), hostname)
if fpr_good == True: log.info("Fingerprint found and matched for %s.", hostname) @@ -458,8 +458,12 @@ return True
def _check_fingerprint(self, con, con_type): - fpr_good = None # None: No fpr in database, False: mismatch, True: match + fpr_good = None # None: Unable to check fpr, False: mismatch, True: match
+ # FIXME: not tidy + import common.xmpp.transports_nb + if not common.xmpp.transports_nb.USE_PYOPENSSL: return None + # FIXME: find a more permanent place for loading servers.xml servers_xml = os.path.join(gajim.DATA_DIR, 'other', 'servers.xml') servers = gtkgui_helpers.parse_server_xml(servers_xml)