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

fix connecting with python3 internal ssl implementation

Browse source
This commit is contained in:
Yann Leboulanger 2013-01-06 13:47:23 +01:00
parent 379fb0c515
commit d20dcfccea
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/common/connection.py
View file

@ -1326,7 +1326,7 @@ class Connection(CommonConnection, ConnectionHandlers):
certificate=con.Connection.ssl_certificate[i])) certificate=con.Connection.ssl_certificate[i]))
return True return True
i += 1 i += 1
if hasattr(con.Connection, 'ssl_fingerprint_sha1'): if len(con.Connection.ssl_fingerprint_sha1):
saved_fingerprint = gajim.config.get_per('accounts', self.name, saved_fingerprint = gajim.config.get_per('accounts', self.name,
'ssl_fingerprint_sha1') 'ssl_fingerprint_sha1')
if saved_fingerprint: if saved_fingerprint:

4
src/common/connection_handlers_events.py
View file

@ -1568,10 +1568,10 @@ class NewAccountConnectedEvent(nec.NetworkIncomingEvent):
self.ssl_msg = ssl_error.get(er, _('Unknown SSL error: %d') % \ self.ssl_msg = ssl_error.get(er, _('Unknown SSL error: %d') % \
er) er)
self.ssl_cert = '' self.ssl_cert = ''
if hasattr(self.conn.connection.Connection, 'ssl_cert_pem'): if len(self.conn.connection.Connection.ssl_cert_pem):
self.ssl_cert = self.conn.connection.Connection.ssl_cert_pem self.ssl_cert = self.conn.connection.Connection.ssl_cert_pem
self.ssl_fingerprint = '' self.ssl_fingerprint = ''
if hasattr(self.conn.connection.Connection, 'ssl_fingerprint_sha1'): if len(self.conn.connection.Connection.ssl_fingerprint_sha1):
self.ssl_fingerprint = \ self.ssl_fingerprint = \
self.conn.connection.Connection.ssl_fingerprint_sha1 self.conn.connection.Connection.ssl_fingerprint_sha1
return True return True