diff options
Diffstat (limited to 'plugins/password')
| -rw-r--r-- | plugins/password/drivers/ldap.php | 2 | ||||
| -rw-r--r-- | plugins/password/password.php | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/plugins/password/drivers/ldap.php b/plugins/password/drivers/ldap.php index acd968723..340dd29f8 100644 --- a/plugins/password/drivers/ldap.php +++ b/plugins/password/drivers/ldap.php @@ -277,7 +277,7 @@ class rcube_ldap_password if (function_exists('mhash') && function_exists('mhash_keygen_s2k')) { $salt = mhash_keygen_s2k(MHASH_SHA1, $password_clear, $salt, 4); - $password = mhash(MHASH_MD5, $password_clear . $salt); + $password = mhash(MHASH_SHA1, $password_clear . $salt); } else if (function_exists('sha1')) { $salt = substr(pack("H*", sha1($salt . $password_clear)), 0, 4); diff --git a/plugins/password/password.php b/plugins/password/password.php index 0db57afc6..9239cd0b0 100644 --- a/plugins/password/password.php +++ b/plugins/password/password.php @@ -306,10 +306,10 @@ class password extends rcube_plugin switch ($result) { case PASSWORD_SUCCESS: return; - case PASSWORD_CRYPT_ERROR; + case PASSWORD_CRYPT_ERROR: $reason = $this->gettext('crypterror'); break; - case PASSWORD_CONNECT_ERROR; + case PASSWORD_CONNECT_ERROR: $reason = $this->gettext('connecterror'); break; case PASSWORD_ERROR: |