summaryrefslogtreecommitdiff
path: root/src/leap/bitmask/provider
diff options
context:
space:
mode:
authorTomás Touceda <chiiph@leap.se>2014-04-02 16:03:02 -0300
committerTomás Touceda <chiiph@leap.se>2014-04-02 16:03:02 -0300
commit2468b0eda7db1169d44a95f4c71c8cee323dfcf3 (patch)
tree46d35c93fbb8030eb0da0bceff776c47825e350d /src/leap/bitmask/provider
parentf33cbc3a7e92ce742ee213018d16152f4996b64e (diff)
parent5b21dfa2ca18ef4840d908b27228f55b8e65b172 (diff)
Merge remote-tracking branch 'refs/remotes/ivan/feature/5391_support-selfsigned-certs' into develop
Diffstat (limited to 'src/leap/bitmask/provider')
-rw-r--r--src/leap/bitmask/provider/providerbootstrapper.py7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/leap/bitmask/provider/providerbootstrapper.py b/src/leap/bitmask/provider/providerbootstrapper.py
index 654d1790..2a519206 100644
--- a/src/leap/bitmask/provider/providerbootstrapper.py
+++ b/src/leap/bitmask/provider/providerbootstrapper.py
@@ -99,9 +99,14 @@ class ProviderBootstrapper(AbstractBootstrapper):
:rtype: bool or str
"""
if self._bypass_checks:
- verify = False
+ return False
+
+ cert = flags.CA_CERT_FILE
+ if cert is not None:
+ verify = cert
else:
verify = ca_bundle.where()
+
return verify
def _check_name_resolution(self):