changeset e575b06d2ddd in /home/hg/repos/gajim

author: Yann Leboulanger asterix@lagaule.org branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=e575b06d2ddd description: don't crash with new nbxmpp

diffstat:

src/common/connection_handlers_events.py | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-)

diffs (30 lines):

diff -r 6f71f6e40b19 -r e575b06d2ddd src/common/connection_handlers_events.py --- a/src/common/connection_handlers_events.py Wed Dec 18 20:08:45 2013 +0400 +++ b/src/common/connection_handlers_events.py Mon Dec 23 16:03:39 2013 +0100 @@ -40,6 +40,9 @@ from common.jingle_transport import JingleTransportSocks5 from common.file_props import FilesProp

+if gajim.HAVE_PYOPENSSL: + import OpenSSL.crypto + import logging log = logging.getLogger('gajim.c.connection_handlers_events')

@@ -1632,12 +1635,12 @@ self.ssl_msg = ssl_error.get(er, _('Unknown SSL error: %d') % \ self.errnum) self.ssl_cert = '' - if len(self.conn.connection.Connection.ssl_cert_pem): - self.ssl_cert = self.conn.connection.Connection.ssl_cert_pem self.ssl_fingerprint = '' if self.conn.connection.Connection.ssl_certificate: - self.ssl_fingerprint = \ - self.conn.connection.Connection.ssl_certificate.digest('sha1') + cert = self.conn.connection.Connection.ssl_certificate + self.ssl_cert = OpenSSL.crypto.dump_certificate( + OpenSSL.crypto.FILETYPE_PEM, cert) + self.ssl_fingerprint = cert.digest('sha1') return True

class NewAccountNotConnectedEvent(nec.NetworkIncomingEvent):