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

Remove cacert.pem 

Dont ship cacerts, use certifi on Windows
This commit is contained in:
Philipp Hörist 2018-03-24 00:17:03 +01:00
parent ba48e4530b
commit b3e6170e57
2 changed files with 7 additions and 3868 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gajim/common/connection.py
View File

@ -71,6 +71,9 @@ from gajim.gtkgui_helpers import get_action
if app.HAVE_PYOPENSSL: if app.HAVE_PYOPENSSL:
import OpenSSL.crypto import OpenSSL.crypto
if os.name == 'nt':
import certifi
from nbxmpp import Smacks from nbxmpp import Smacks
from string import Template from string import Template
import logging import logging
@ -1210,9 +1213,10 @@ class Connection(CommonConnection, ConnectionHandlers):
self._current_type = self._current_host['type'] self._current_type = self._current_host['type']
port = self._current_host['port'] port = self._current_host['port']
cacerts = os.path.join(common.app.DATA_DIR, 'other', 'cacerts.pem')
if not os.path.exists(cacerts): cacerts = ''
cacerts = '' if os.name == 'nt':
cacerts = certifi.where()
mycerts = common.app.MY_CACERTS mycerts = common.app.MY_CACERTS
tls_version = app.config.get_per('accounts', self.name, tls_version = app.config.get_per('accounts', self.name,
'tls_version') 'tls_version')

3865
gajim/data/other/cacerts.pem
View File

File diff suppressed because it is too large Load Diff