Philipp Hörist pushed to branch master at gajim / gajim
Commits: b3e6170e by Philipp Hörist at 2018-03-24T00:17:34+01:00 Remove cacert.pem
Dont ship cacerts, use certifi on Windows
- - - - -
2 changed files:
- gajim/common/connection.py - − gajim/data/other/cacerts.pem
Changes:
===================================== gajim/common/connection.py ===================================== --- a/gajim/common/connection.py +++ b/gajim/common/connection.py @@ -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 = '' + + cacerts = '' + if os.name == 'nt': + cacerts = certifi.where() mycerts = common.app.MY_CACERTS tls_version = app.config.get_per('accounts', self.name, 'tls_version')
===================================== gajim/data/other/cacerts.pem deleted ===================================== The diff for this file was not included because it is too large.
View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/b3e6170e57798955edd01e111dd71da0175...
--- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/b3e6170e57798955edd01e111dd71da0175... You're receiving this email because of your account on dev.gajim.org.