copyleftie
/
gajim-plural
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

correctly get SSL certificate from nbxmpp. Fixes #7283

This commit is contained in:
Yann Leboulanger 2012-12-25 18:18:39 +01:00
parent 2780fc2b0e
commit 37e0797f30
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/common/connection.py
View File

@ -1334,7 +1334,7 @@ class Connection(CommonConnection, ConnectionHandlers):
if con.Connection.ssl_fingerprint_sha1[-1] != saved_fingerprint: if con.Connection.ssl_fingerprint_sha1[-1] != saved_fingerprint:
gajim.nec.push_incoming_event(FingerprintErrorEvent(None, gajim.nec.push_incoming_event(FingerprintErrorEvent(None,
conn=self, conn=self,
certificate=con.Connection.ssl_certificate, certificate=con.Connection.ssl_certificate[-1],
new_fingerprint=con.Connection.ssl_fingerprint_sha1[ new_fingerprint=con.Connection.ssl_fingerprint_sha1[
-1])) -1]))
return True return True
@ -1342,8 +1342,8 @@ class Connection(CommonConnection, ConnectionHandlers):
gajim.config.set_per('accounts', self.name, gajim.config.set_per('accounts', self.name,
'ssl_fingerprint_sha1', 'ssl_fingerprint_sha1',
con.Connection.ssl_fingerprint_sha1[-1]) con.Connection.ssl_fingerprint_sha1[-1])
if not check_X509.check_certificate(con.Connection.ssl_certificate, if not check_X509.check_certificate(con.Connection.ssl_certificate[
hostname) and '100' not in gajim.config.get_per('accounts', -1], hostname) and '100' not in gajim.config.get_per('accounts',
self.name, 'ignore_ssl_errors').split(): self.name, 'ignore_ssl_errors').split():
txt = _('The authenticity of the %s certificate could be ' txt = _('The authenticity of the %s certificate could be '
'invalid.\nThe certificate does not cover this domain.') % \ 'invalid.\nThe certificate does not cover this domain.') % \
@ -1352,7 +1352,7 @@ class Connection(CommonConnection, ConnectionHandlers):
error_text=txt, error_num=100, error_text=txt, error_num=100,
cert=con.Connection.ssl_cert_pem[-1], cert=con.Connection.ssl_cert_pem[-1],
fingerprint=con.Connection.ssl_fingerprint_sha1[-1], fingerprint=con.Connection.ssl_fingerprint_sha1[-1],
certificate=con.Connection.ssl_certificate)) certificate=con.Connection.ssl_certificate[-1]))
return True return True
self._register_handlers(con, con_type) self._register_handlers(con, con_type)