- Fix TB on fingerprint mismatch
- Add debug message on import failure of PyOpenSSL - Update gajim.org digest after migration to new server
This commit is contained in:
parent
d027597bf8
commit
5529852ded
|
@ -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>
|
||||
|
|
|
@ -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):
|
||||
|
|
|
@ -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)."
|
||||
|
|
Loading…
Reference in New Issue