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

Check for argon2 support before using constant PASSWORD_ARGON2X (#1228)

Browse Source
This commit is contained in:
sro0
2024-01-16 21:34:17 +01:00
committed by GitHub
parent 8fa286a71d
commit 83047019b0
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/Froxlor/Api/Commands/EmailAccounts.php
View File

@@ -157,10 +157,10 @@ class EmailAccounts extends ApiCommand implements ResourceEntity
// prefix hash-algo // prefix hash-algo
switch (Settings::Get('system.passwordcryptfunc')) { switch (Settings::Get('system.passwordcryptfunc')) {
case PASSWORD_ARGON2I: case defined('PASSWORD_ARGON2I') && PASSWORD_ARGON2I:
$cpPrefix = '{ARGON2I}'; $cpPrefix = '{ARGON2I}';
break; break;
case PASSWORD_ARGON2ID: case defined('PASSWORD_ARGON2ID') && PASSWORD_ARGON2ID:
$cpPrefix = '{ARGON2ID}'; $cpPrefix = '{ARGON2ID}';
break; break;
default: default:
@@ -404,10 +404,10 @@ class EmailAccounts extends ApiCommand implements ResourceEntity
$password = Crypt::validatePassword($password, true); $password = Crypt::validatePassword($password, true);
// prefix hash-algo // prefix hash-algo
switch (Settings::Get('system.passwordcryptfunc')) { switch (Settings::Get('system.passwordcryptfunc')) {
case PASSWORD_ARGON2I: case defined('PASSWORD_ARGON2I') && PASSWORD_ARGON2I:
$cpPrefix = '{ARGON2I}'; $cpPrefix = '{ARGON2I}';
break; break;
case PASSWORD_ARGON2ID: case defined('PASSWORD_ARGON2ID') && PASSWORD_ARGON2ID:
$cpPrefix = '{ARGON2ID}'; $cpPrefix = '{ARGON2ID}';
break; break;
default: default:

4
tests/Emails/EmailsTest.php
View File

@@ -426,10 +426,10 @@ class MailsTest extends TestCase
$this->assertEquals(1, $result['popaccountid']); $this->assertEquals(1, $result['popaccountid']);
switch (Settings::Get('system.passwordcryptfunc')) { switch (Settings::Get('system.passwordcryptfunc')) {
case PASSWORD_ARGON2I: case defined('PASSWORD_ARGON2I') && PASSWORD_ARGON2I:
$cpPrefix = '{ARGON2I}'; $cpPrefix = '{ARGON2I}';
break; break;
case PASSWORD_ARGON2ID: case defined('PASSWORD_ARGON2ID') && PASSWORD_ARGON2ID:
$cpPrefix = '{ARGON2ID}'; $cpPrefix = '{ARGON2ID}';
break; break;
default: default: