maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

fix ftp user passwords

Browse Source 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann
2022-10-07 17:56:51 +02:00
parent fb163f8006
commit 0757cc25ce
9 changed files with 15 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
lib/Froxlor/System/Crypt.php
View File

@@ -206,11 +206,10 @@ class Crypt
* Password to be encrypted
* @param bool $htpasswd
* optional whether to generate a SHA1 password for directory protection
* @param bool $openssl
* optional generates $htpasswd like strings but for proftpd
*
* @return string encrypted password
* @author Michal Wojcik <m.wojcik@sonet3.pl>
* @author Michael Kaufmann <mkaufmann@nutime.de>
* @author Froxlor team <team@froxlor.org> (2010-)
* @return string encrypted password)
*
* 0 - default crypt (depends on system configuration)
* 1 - MD5 $1$
@@ -219,10 +218,10 @@ class Crypt
* 4 - SHA-512 $6$
*
*/
public static function makeCryptPassword($password, $htpasswd = false)
public static function makeCryptPassword($password, $htpasswd = false, $openssl = false)
{
if ($htpasswd) {
return '{SHA}' . base64_encode(sha1($password, true));
if ($htpasswd || $openssl) {
return '{SHA' . ($openssl ? '1' : '') . '}' . base64_encode(sha1($password, true));
}
$algo = Settings::Get('system.passwordcryptfunc') !== null ? Settings::Get('system.passwordcryptfunc') : PASSWORD_DEFAULT;
return password_hash($password, $algo);