Philipp Hörist pushed to branch master at gajim / gajim
Commits:
-
4e1a9db6
by Philipp Hörist at 2018-03-24T00:19:27+01:00
1 changed file:
Changes:
| ... | ... | @@ -1218,17 +1218,11 @@ class Connection(CommonConnection, ConnectionHandlers): |
| 1218 | 1218 |
if os.name == 'nt':
|
| 1219 | 1219 |
cacerts = certifi.where()
|
| 1220 | 1220 |
mycerts = common.app.MY_CACERTS
|
| 1221 |
- tls_version = app.config.get_per('accounts', self.name,
|
|
| 1222 |
- 'tls_version')
|
|
| 1223 |
- cipher_list = app.config.get_per('accounts', self.name,
|
|
| 1224 |
- 'cipher_list')
|
|
| 1225 |
- |
|
| 1226 |
- if version_condition(nbxmpp.__version__, '0.6.3'):
|
|
| 1227 |
- secure_tuple = (self._current_type, cacerts, mycerts, tls_version,
|
|
| 1228 |
- cipher_list, self._current_host['alpn'])
|
|
| 1229 |
- else:
|
|
| 1230 |
- secure_tuple = (self._current_type, cacerts, mycerts, tls_version,
|
|
| 1231 |
- cipher_list)
|
|
| 1221 |
+ tls_version = app.config.get_per('accounts', self.name, 'tls_version')
|
|
| 1222 |
+ cipher_list = app.config.get_per('accounts', self.name, 'cipher_list')
|
|
| 1223 |
+ |
|
| 1224 |
+ secure_tuple = (self._current_type, cacerts, mycerts, tls_version,
|
|
| 1225 |
+ cipher_list, self._current_host['alpn'])
|
|
| 1232 | 1226 |
|
| 1233 | 1227 |
con = nbxmpp.NonBlockingClient(
|
| 1234 | 1228 |
domain=self._hostname,
|