diff options
author | Bruno Wagner <bwgpro@gmail.com> | 2015-06-08 18:27:09 -0300 |
---|---|---|
committer | Bruno Wagner <bwgpro@gmail.com> | 2015-06-08 18:27:09 -0300 |
commit | 7b1af2ede753a63c9f584ccf37691917714e9655 (patch) | |
tree | bc40f8275a802e4072a9dc7a1679f83bf0ff7b6e /service/pixelated/bitmask_libraries/certs.py | |
parent | 8b0e4f05b142b73a5ca13f4706fcb6ececbb6911 (diff) |
Fixed certificates initialization and removed which_api_bundle
Diffstat (limited to 'service/pixelated/bitmask_libraries/certs.py')
-rw-r--r-- | service/pixelated/bitmask_libraries/certs.py | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/service/pixelated/bitmask_libraries/certs.py b/service/pixelated/bitmask_libraries/certs.py index 3ca55469..3d567e53 100644 --- a/service/pixelated/bitmask_libraries/certs.py +++ b/service/pixelated/bitmask_libraries/certs.py @@ -34,10 +34,6 @@ def init_leap_cert(leap_provider_cert, leap_provider_cert_fingerprint): LEAP_CERT = False -def which_api_CA_bundle(provider): - return str(LeapCertificate(provider).api_ca_bundle()) - - def which_bootstrap_cert_fingerprint(): return LEAP_FINGERPRINT @@ -59,6 +55,9 @@ class LeapCertificate(object): self._provider = provider def auto_detect_bootstrap_ca_bundle(self): + if LEAP_CERT is not None: + return LEAP_CERT + if self._config.bootstrap_ca_cert_bundle == AUTO_DETECT_CA_BUNDLE: local_cert = self._local_bootstrap_server_cert() if local_cert: |