summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIvan Alejandro <ivanalejandro0@gmail.com>2014-07-10 11:44:49 -0300
committerIvan Alejandro <ivanalejandro0@gmail.com>2014-07-10 11:44:49 -0300
commit90cd60a3c73796372b11b90f0b23ec91c944bfc1 (patch)
tree85c479f4efc1f3a8e80eb60bf30e9174ce071308
parent279fa11b6f49aabc2269dbd2316e2186d1373cbe (diff)
parent60b51222f5aab24e8aab1b9f763c2d63eb29bc89 (diff)
Merge remote-tracking branch 'chiiph/feature/cacert_osx' into develop
-rw-r--r--changes/feature_support_cacert_osx1
-rw-r--r--src/leap/common/ca_bundle.py8
2 files changed, 9 insertions, 0 deletions
diff --git a/changes/feature_support_cacert_osx b/changes/feature_support_cacert_osx
new file mode 100644
index 0000000..90a51bf
--- /dev/null
+++ b/changes/feature_support_cacert_osx
@@ -0,0 +1 @@
+ o Look for bundled cacert.pem in the Resources dir for OSX. \ No newline at end of file
diff --git a/src/leap/common/ca_bundle.py b/src/leap/common/ca_bundle.py
index 1e00f25..d8c72a6 100644
--- a/src/leap/common/ca_bundle.py
+++ b/src/leap/common/ca_bundle.py
@@ -21,8 +21,12 @@ If you are packaging Requests, e.g., for a Linux distribution or a managed
environment, you can change the definition of where() to return a separately
packaged CA bundle.
"""
+import platform
import os.path
+_system = platform.system()
+
+IS_MAC = _system == "Darwin"
def where():
"""
@@ -30,6 +34,10 @@ def where():
:rtype: str
"""
# vendored bundle inside Requests, plus some additions of ours
+ if IS_MAC:
+ return os.path.join("/Applications", "Bitmask.app",
+ "Contents", "Resources",
+ "cacert.pem")
return os.path.join(os.path.dirname(__file__), 'cacert.pem')
if __name__ == '__main__':