From a2e25331a5d2937306c0c507c6e4aee809c08c98 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Mon, 16 Aug 2021 22:23:24 +0530 Subject: [PATCH] Dont check Linux CA locations on macOS --- __main__.py | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/__main__.py b/__main__.py index df7166ffb..b6090ad1a 100644 --- a/__main__.py +++ b/__main__.py @@ -128,18 +128,20 @@ def setup_openssl_environment() -> None: # their NIH SSL library instead of OpenSSL. if 'SSL_CERT_FILE' in os.environ or 'SSL_CERT_DIR' in os.environ: return - candidates = [ - '/etc/ssl/certs/ca-certificates.crt', # Debian/Ubuntu/Arch/Gentoo etc. - "/etc/pki/ca-trust/extracted/pem/tls-ca-bundle.pem" # RHEL 7 - '/etc/pki/tls/certs/ca-bundle.crt', # Fedora/RHEL 6 - '/etc/ssl/ca-bundle.pem', # OpenSUSE - "/etc/pki/tls/cacert.pem", # OpenELEC - ] - ext_dir = getattr(sys, 'kitty_extensions_dir', '') - if ext_dir: - d = os.path.dirname - if 'darwin' in sys.platform.lower(): - candidates.insert(0, os.path.join(d(d(d(ext_dir))), 'cacert.pem')) + d = os.path.dirname + candidates: tuple = () + if 'darwin' in sys.platform.lower(): + ext_dir = getattr(sys, 'kitty_extensions_dir', '') + if ext_dir: + candidates = (os.path.join(d(d(d(ext_dir))), 'cacert.pem'),) + else: + candidates = ( + '/etc/ssl/certs/ca-certificates.crt', # Debian/Ubuntu/Arch/Gentoo etc. + "/etc/pki/ca-trust/extracted/pem/tls-ca-bundle.pem" # RHEL 7 + '/etc/pki/tls/certs/ca-bundle.crt', # Fedora/RHEL 6 + '/etc/ssl/ca-bundle.pem', # OpenSUSE + "/etc/pki/tls/cacert.pem", # OpenELEC + ) for q in candidates: if os.access(q, os.R_OK): os.environ['SSL_CERT_FILE'] = q