summaryrefslogtreecommitdiff
path: root/plugins/password
diff options
context:
space:
mode:
authorAleksander Machniak <alec@alec.pl>2014-10-10 10:25:52 +0200
committerAleksander Machniak <alec@alec.pl>2014-10-10 10:26:51 +0200
commit047fc190f3b20b43fda4428630f471187258fbb6 (patch)
treedd7e0fd73cdd7c26b3c770f287148c832d5326e7 /plugins/password
parent0d6c67354682cba082b457618705dd2346ffa861 (diff)
Fix regression in SHAA password generation in ldap driver of password plugin (#1490094)
Diffstat (limited to 'plugins/password')
-rw-r--r--plugins/password/drivers/ldap.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/plugins/password/drivers/ldap.php b/plugins/password/drivers/ldap.php
index 7bebc8a41..d46da0b26 100644
--- a/plugins/password/drivers/ldap.php
+++ b/plugins/password/drivers/ldap.php
@@ -263,7 +263,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);