summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKali Kaneko <kali@leap.se>2014-11-10 16:03:16 +0100
committerKali Kaneko <kali@leap.se>2014-11-10 16:03:16 +0100
commit2b23a3035a5aa38652d0cff81f25952c6297b669 (patch)
tree3ea756e73bb3b8c938ed63b987ee1d33623581bb
parent24c15fb8ced1f2c8edb8a0f657e3c332dca981c4 (diff)
parentbb17bf8295d04d4834246b0f30244933429dc247 (diff)
Merge branch 'bug/provider-check-deb-fixes' into deb-0.7.1-rc4
-rw-r--r--src/leap/bitmask/config/providerconfig.py3
-rw-r--r--src/leap/bitmask/provider/providerbootstrapper.py2
2 files changed, 2 insertions, 3 deletions
diff --git a/src/leap/bitmask/config/providerconfig.py b/src/leap/bitmask/config/providerconfig.py
index 57bc3a98..386c697d 100644
--- a/src/leap/bitmask/config/providerconfig.py
+++ b/src/leap/bitmask/config/providerconfig.py
@@ -201,7 +201,8 @@ class ProviderConfig(BaseConfig):
leap_check(cert_exists, error_msg, MissingCACert)
logger.debug("Going to verify SSL against %s" % (cert_path,))
- return cert_path
+ # OpenSSL does not handle unicode.
+ return cert_path.encode('utf-8')
def provides_eip(self):
"""
diff --git a/src/leap/bitmask/provider/providerbootstrapper.py b/src/leap/bitmask/provider/providerbootstrapper.py
index 71edbb87..8eefb9d9 100644
--- a/src/leap/bitmask/provider/providerbootstrapper.py
+++ b/src/leap/bitmask/provider/providerbootstrapper.py
@@ -148,7 +148,6 @@ class ProviderBootstrapper(AbstractBootstrapper):
timeout=REQUEST_TIMEOUT)
res.raise_for_status()
except requests.exceptions.SSLError as exc:
- logger.exception(exc)
self._err_msg = self.tr("Provider certificate could "
"not be verified")
raise
@@ -156,7 +155,6 @@ class ProviderBootstrapper(AbstractBootstrapper):
# XXX careful!. The error might be also a SSL handshake
# timeout error, in which case we should retry a couple of times
# more, for cases where the ssl server gives high latencies.
- logger.exception(exc)
self._err_msg = self.tr("Provider does not support HTTPS")
raise