summaryrefslogtreecommitdiff
path: root/src/leap/bitmask/crypto
diff options
context:
space:
mode:
Diffstat (limited to 'src/leap/bitmask/crypto')
-rw-r--r--src/leap/bitmask/crypto/srpauth.py20
-rw-r--r--src/leap/bitmask/crypto/srpregister.py6
2 files changed, 13 insertions, 13 deletions
diff --git a/src/leap/bitmask/crypto/srpauth.py b/src/leap/bitmask/crypto/srpauth.py
index 192a9d5c..856d2c81 100644
--- a/src/leap/bitmask/crypto/srpauth.py
+++ b/src/leap/bitmask/crypto/srpauth.py
@@ -523,7 +523,7 @@ class SRPAuth(object):
Password change callback.
"""
if self._signaler is not None:
- self._signaler.signal(self._signaler.SRP_PASSWORD_CHANGE_OK)
+ self._signaler.signal(self._signaler.srp_password_change_ok)
def _change_password_error(self, failure):
"""
@@ -535,9 +535,9 @@ class SRPAuth(object):
return
if failure.check(SRPAuthBadUserOrPassword):
- self._signaler.signal(self._signaler.SRP_PASSWORD_CHANGE_BADPW)
+ self._signaler.signal(self._signaler.srp_password_change_badpw)
else:
- self._signaler.signal(self._signaler.SRP_PASSWORD_CHANGE_ERROR)
+ self._signaler.signal(self._signaler.srp_password_change_error)
def authenticate(self, username, password):
"""
@@ -591,7 +591,7 @@ class SRPAuth(object):
:type _: IGNORED
"""
logger.debug("Successful login!")
- self._signaler.signal(self._signaler.SRP_AUTH_OK)
+ self._signaler.signal(self._signaler.srp_auth_ok)
def _authenticate_error(self, failure):
"""
@@ -612,13 +612,13 @@ class SRPAuth(object):
return
if failure.check(SRPAuthBadUserOrPassword):
- signal = self._signaler.SRP_AUTH_BAD_USER_OR_PASSWORD
+ signal = self._signaler.srp_auth_bad_user_or_password
elif failure.check(SRPAuthConnectionError):
- signal = self._signaler.SRP_AUTH_CONNECTION_ERROR
+ signal = self._signaler.srp_auth_connection_error
elif failure.check(SRPAuthenticationError):
- signal = self._signaler.SRP_AUTH_SERVER_ERROR
+ signal = self._signaler.srp_auth_server_error
else:
- signal = self._signaler.SRP_AUTH_ERROR
+ signal = self._signaler.srp_auth_error
self._signaler.signal(signal)
@@ -647,7 +647,7 @@ class SRPAuth(object):
logger.warning("Something went wrong with the logout: %r" %
(e,))
if self._signaler is not None:
- self._signaler.signal(self._signaler.SRP_LOGOUT_ERROR)
+ self._signaler.signal(self._signaler.srp_logout_error)
raise
else:
self.set_session_id(None)
@@ -657,7 +657,7 @@ class SRPAuth(object):
self._session = self._fetcher.session()
logger.debug("Successfully logged out.")
if self._signaler is not None:
- self._signaler.signal(self._signaler.SRP_LOGOUT_OK)
+ self._signaler.signal(self._signaler.srp_logout_ok)
def set_session_id(self, session_id):
with self._session_id_lock:
diff --git a/src/leap/bitmask/crypto/srpregister.py b/src/leap/bitmask/crypto/srpregister.py
index f03dc469..86510de1 100644
--- a/src/leap/bitmask/crypto/srpregister.py
+++ b/src/leap/bitmask/crypto/srpregister.py
@@ -179,11 +179,11 @@ class SRPRegister(QtCore.QObject):
return
if status_code in self.STATUS_OK:
- self._signaler.signal(self._signaler.SRP_REGISTRATION_FINISHED)
+ self._signaler.signal(self._signaler.srp_registration_finished)
elif status_code == self.STATUS_TAKEN:
- self._signaler.signal(self._signaler.SRP_REGISTRATION_TAKEN)
+ self._signaler.signal(self._signaler.srp_registration_taken)
else:
- self._signaler.signal(self._signaler.SRP_REGISTRATION_FAILED)
+ self._signaler.signal(self._signaler.srp_registration_failed)
if __name__ == "__main__":