Fix regression in SHAA password generation in ldap driver of password plugin (#1490094)

10 years ago · 047fc190f3
parent 0d6c673546
commit 047fc190f3
2 changed files with 2 additions and 1 deletions
--- a/1
+++ b/1
@ -2,6 +2,7 @@ CHANGELOG Roundcube Webmail
 ===========================

 - Fix setting flags on servers with no PERMANENTFLAGS response (#1490087)
+- Fix regression in SHAA password generation in ldap driver of password plugin (#1490094)

 RELEASE 1.0.3
 -------------
--- 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);