Commit c6900594 authored by Jason R. Coombs's avatar Jason R. Coombs Committed by GitHub

Merge pull request #762 from matejcik/master

improve certificate handling in SUSE Linux
parents f1cf491f 7576d32d
...@@ -26,6 +26,7 @@ cert_paths = """ ...@@ -26,6 +26,7 @@ cert_paths = """
/etc/ssl/cert.pem /etc/ssl/cert.pem
/System/Library/OpenSSL/certs/cert.pem /System/Library/OpenSSL/certs/cert.pem
/usr/local/share/certs/ca-root-nss.crt /usr/local/share/certs/ca-root-nss.crt
/etc/ssl/ca-bundle.pem
""".strip().split() """.strip().split()
...@@ -242,6 +243,7 @@ def find_ca_bundle(): ...@@ -242,6 +243,7 @@ def find_ca_bundle():
if os.path.isfile(cert_path): if os.path.isfile(cert_path):
return cert_path return cert_path
try: try:
return pkg_resources.resource_filename('certifi', 'cacert.pem') import certifi
return certifi.where()
except (ImportError, ResolutionError, ExtractionError): except (ImportError, ResolutionError, ExtractionError):
return None return None
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment