From 10695e15d2df2e804e8f2e2cba862fefe8fd52ef Mon Sep 17 00:00:00 2001
From: Yann Leboulanger <asterix@lagaule.org>
Date: Mon, 23 Dec 2013 16:03:39 +0100
Subject: [PATCH] don't crash with new nbxmpp
---
src/common/connection_handlers_events.py | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/src/common/connection_handlers_events.py b/src/common/connection_handlers_events.py
index 477cf217f6..0210ee686c 100644
--- a/src/common/connection_handlers_events.py
+++ b/src/common/connection_handlers_events.py
@@ -42,6 +42,9 @@ from common.file_props import FilesProp
import gtkgui_helpers
+if gajim.HAVE_PYOPENSSL:
+ import OpenSSL.crypto
+
import logging
log = logging.getLogger('gajim.c.connection_handlers_events')
@@ -1633,12 +1636,12 @@ class NewAccountConnectedEvent(nec.NetworkIncomingEvent):
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):
--
GitLab