Philipp Hörist pushed to branch master at gajim / gajim
Commits:
-
b3e6170e
by Philipp Hörist at 2018-03-24T00:17:34+01:00
2 changed files:
Changes:
| ... | ... | @@ -71,6 +71,9 @@ from gajim.gtkgui_helpers import get_action |
| 71 | 71 |
if app.HAVE_PYOPENSSL:
|
| 72 | 72 |
import OpenSSL.crypto
|
| 73 | 73 |
|
| 74 |
+if os.name == 'nt':
|
|
| 75 |
+ import certifi
|
|
| 76 |
+ |
|
| 74 | 77 |
from nbxmpp import Smacks
|
| 75 | 78 |
from string import Template
|
| 76 | 79 |
import logging
|
| ... | ... | @@ -1210,9 +1213,10 @@ class Connection(CommonConnection, ConnectionHandlers): |
| 1210 | 1213 |
self._current_type = self._current_host['type']
|
| 1211 | 1214 |
|
| 1212 | 1215 |
port = self._current_host['port']
|
| 1213 |
- cacerts = os.path.join(common.app.DATA_DIR, 'other', 'cacerts.pem')
|
|
| 1214 |
- if not os.path.exists(cacerts):
|
|
| 1215 |
- cacerts = ''
|
|
| 1216 |
+ |
|
| 1217 |
+ cacerts = ''
|
|
| 1218 |
+ if os.name == 'nt':
|
|
| 1219 |
+ cacerts = certifi.where()
|
|
| 1216 | 1220 |
mycerts = common.app.MY_CACERTS
|
| 1217 | 1221 |
tls_version = app.config.get_per('accounts', self.name,
|
| 1218 | 1222 |
'tls_version')
|