summaryrefslogtreecommitdiff
path: root/src/leap/bitmask/keymanager/__init__.py
diff options
context:
space:
mode:
authorKali Kaneko (leap communications) <kali@leap.se>2016-10-21 17:04:04 -0400
committerKali Kaneko (leap communications) <kali@leap.se>2016-10-21 17:17:39 -0400
commit7c2a489725293bba7de8b8238fb1c5c7f1e30a47 (patch)
treecf34bfb0aff672a245f17394e7aac156bde06e9f /src/leap/bitmask/keymanager/__init__.py
parent0f6dae78b45335e0428ed5aba4672b6ad297f82a (diff)
[bug] fail gracefully if cannot find cert file
Diffstat (limited to 'src/leap/bitmask/keymanager/__init__.py')
-rw-r--r--src/leap/bitmask/keymanager/__init__.py7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/leap/bitmask/keymanager/__init__.py b/src/leap/bitmask/keymanager/__init__.py
index be3730a7..3798ce06 100644
--- a/src/leap/bitmask/keymanager/__init__.py
+++ b/src/leap/bitmask/keymanager/__init__.py
@@ -98,7 +98,12 @@ class KeyManager(object):
self.uid = uid
self._openpgp = OpenPGPScheme(soledad, gpgbinary=gpgbinary)
create = self._create_combined_bundle_file
- self._combined_ca_bundle = combined_ca_bundle or create()
+ try:
+ self._combined_ca_bundle = combined_ca_bundle or create()
+ except Exception:
+ logger.warn('error while creating combined ca bundle')
+ self._combined_ca_bundle = ''
+
self._async_client = HTTPClient(self._combined_ca_bundle)
self._async_client_pinned = HTTPClient(self._ca_cert_path)