Remove cacert.pem
Dont ship cacerts, use certifi on Windows
This commit is contained in:
parent
ba48e4530b
commit
b3e6170e57
|
@ -71,6 +71,9 @@ from gajim.gtkgui_helpers import get_action
|
|||
if app.HAVE_PYOPENSSL:
|
||||
import OpenSSL.crypto
|
||||
|
||||
if os.name == 'nt':
|
||||
import certifi
|
||||
|
||||
from nbxmpp import Smacks
|
||||
from string import Template
|
||||
import logging
|
||||
|
@ -1210,9 +1213,10 @@ class Connection(CommonConnection, ConnectionHandlers):
|
|||
self._current_type = self._current_host['type']
|
||||
|
||||
port = self._current_host['port']
|
||||
cacerts = os.path.join(common.app.DATA_DIR, 'other', 'cacerts.pem')
|
||||
if not os.path.exists(cacerts):
|
||||
|
||||
cacerts = ''
|
||||
if os.name == 'nt':
|
||||
cacerts = certifi.where()
|
||||
mycerts = common.app.MY_CACERTS
|
||||
tls_version = app.config.get_per('accounts', self.name,
|
||||
'tls_version')
|
||||
|
|
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue