summaryrefslogtreecommitdiff
path: root/plugins
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:25:52 +0200
commit78bee8b8b62f1ab4970c0b2b0265c17073ffb2be (patch)
tree1fec498f7e364daccf1afdde555de4b987db3ad2 /plugins
parent6c6991fb53e8d7cbac36dbd98ad7344a185e2f8c (diff)
Fix regression in SHAA password generation in ldap driver of password plugin (#1490094)
Diffstat (limited to 'plugins')
-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 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);