diff options
| author | junglecow <junglecow@no-mail.com> | 2006-12-29 04:46:46 +0300 |
|---|---|---|
| committer | junglecow <junglecow@no-mail.com> | 2006-12-29 04:46:46 +0300 |
| commit | 5529852ded31f9c288f55ccafbf5b4b4e3869ba5 (patch) | |
| tree | 6ee5c504628d1959885a25a607e9f74c18bc671d | |
| parent | d027597bf8cf1fed035213af3eff903775a00e7e (diff) | |
- Fix TB on fingerprint mismatch
- Add debug message on import failure of PyOpenSSL
- Update gajim.org digest after migration to new server
| -rw-r--r-- | data/other/servers.xml | 2 | ||||
| -rw-r--r-- | src/common/connection.py | 4 | ||||
| -rw-r--r-- | src/common/xmpp/transports_nb.py | 2 |
3 files changed, 6 insertions, 2 deletions
diff --git a/data/other/servers.xml b/data/other/servers.xml index f8bcf7161..4a2cf19f7 100644 --- a/data/other/servers.xml +++ b/data/other/servers.xml @@ -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> diff --git a/src/common/connection.py b/src/common/connection.py index d70dd43ff..8c1cc1608 100644 --- a/src/common/connection.py +++ b/src/common/connection.py @@ -436,7 +436,6 @@ class Connection(ConnectionHandlers): 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 @@ class Connection(ConnectionHandlers): 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): diff --git a/src/common/xmpp/transports_nb.py b/src/common/xmpp/transports_nb.py index 77d4ad200..66da4b57f 100644 --- a/src/common/xmpp/transports_nb.py +++ b/src/common/xmpp/transports_nb.py @@ -41,6 +41,8 @@ try: 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)." |