From 047fc190f3b20b43fda4428630f471187258fbb6 Mon Sep 17 00:00:00 2001 From: Aleksander Machniak Date: Fri, 10 Oct 2014 10:25:52 +0200 Subject: Fix regression in SHAA password generation in ldap driver of password plugin (#1490094) --- CHANGELOG | 1 + plugins/password/drivers/ldap.php | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG b/CHANGELOG index adba207f2..2c688b5b2 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -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 ------------- 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); -- cgit v1.2.3