summaryrefslogtreecommitdiff
path: root/src/leap/bitmask/crypto/srpregister.py
diff options
context:
space:
mode:
authorKali Kaneko <kali@leap.se>2013-11-15 23:43:16 -0200
committerKali Kaneko <kali@leap.se>2013-11-15 23:43:16 -0200
commitaa91a2cee69fb205b4354952a2b06661a7623bf4 (patch)
tree2ae86805b336a247e2aaf5df3f4038831be47b5b /src/leap/bitmask/crypto/srpregister.py
parentb4c7f2183395c34361b186fc8379363330788c5e (diff)
parentd51d6bedfecd41491f2c8243235e7d3db043a4d7 (diff)
Merge tag '0.3.7' into debian
Tag leap.bitmask version 0.3.7
Diffstat (limited to 'src/leap/bitmask/crypto/srpregister.py')
-rw-r--r--src/leap/bitmask/crypto/srpregister.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/leap/bitmask/crypto/srpregister.py b/src/leap/bitmask/crypto/srpregister.py
index 5c0a8efc..02a1ea63 100644
--- a/src/leap/bitmask/crypto/srpregister.py
+++ b/src/leap/bitmask/crypto/srpregister.py
@@ -108,7 +108,8 @@ class SRPRegister(QtCore.QObject):
:rparam: (ok, request)
"""
- username = username.lower()
+ username = username.lower().encode('utf-8')
+ password = password.encode('utf-8')
salt, verifier = self._srp.create_salted_verification_key(
username,
@@ -140,8 +141,7 @@ class SRPRegister(QtCore.QObject):
verify=self._provider_config.
get_ca_cert_path())
- except (requests.exceptions.SSLError,
- requests.exceptions.ConnectionError) as exc:
+ except requests.exceptions.RequestException as exc:
logger.error(exc.message)
ok = False
else: