Merge pull request #8 from UncleAlbie/master

SHA1 support.
This commit is contained in:
Marcin Łojewski
2017-12-19 19:51:24 +01:00
committed by GitHub
2 changed files with 9 additions and 1 deletions

View File

@@ -283,6 +283,10 @@ class OC_USER_SQL extends \OC_User_Backend implements \OCP\IUserBackend, \OCP\Us
if(!$salt)
return false;
$enc_password = sha1($salt['salt'].sha1($password));
}
elseif($this -> settings['set_crypt_type'] === 'sha1')
{
$enc_password = sha1($password);
} else
{
$enc_password = $this -> pacrypt($password, $old_password);
@@ -336,6 +340,10 @@ class OC_USER_SQL extends \OC_User_Backend implements \OCP\IUserBackend, \OCP\Us
if(!$salt)
return false;
$ret = sha1($salt['salt'].sha1($password)) === $db_pass;
}
elseif($this -> settings['set_crypt_type'] == 'sha1')
{
$ret = sha1($password) === $db_pass;
} else
{
$ret = $this -> pacrypt($password, $db_pass) === $db_pass;