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

froxlor · Jan 16, 2024 · 0315963 · 0315963
1 parent b34ab45
commit 0315963
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/lib/Froxlor/Api/Commands/EmailAccounts.php b/lib/Froxlor/Api/Commands/EmailAccounts.php
@@ -157,10 +157,10 @@ public function add()
 
 			// prefix hash-algo
 			switch (Settings::Get('system.passwordcryptfunc')) {
-				case PASSWORD_ARGON2I:
+				case defined('PASSWORD_ARGON2I') && PASSWORD_ARGON2I:
 					$cpPrefix = '{ARGON2I}';
 					break;
-				case PASSWORD_ARGON2ID:
+				case defined('PASSWORD_ARGON2ID') && PASSWORD_ARGON2ID:
 					$cpPrefix = '{ARGON2ID}';
 					break;
 				default:
@@ -404,10 +404,10 @@ public function update()
 			$password = Crypt::validatePassword($password, true);
 			// prefix hash-algo
 			switch (Settings::Get('system.passwordcryptfunc')) {
-				case PASSWORD_ARGON2I:
+				case defined('PASSWORD_ARGON2I') && PASSWORD_ARGON2I:
 					$cpPrefix = '{ARGON2I}';
 					break;
-				case PASSWORD_ARGON2ID:
+				case defined('PASSWORD_ARGON2ID') && PASSWORD_ARGON2ID:
 					$cpPrefix = '{ARGON2ID}';
 					break;
 				default:

diff --git a/tests/Emails/EmailsTest.php b/tests/Emails/EmailsTest.php
@@ -426,10 +426,10 @@ public function testCustomerEmailAccountsAdd()
 		$this->assertEquals(1, $result['popaccountid']);
 
 		switch (Settings::Get('system.passwordcryptfunc')) {
-			case PASSWORD_ARGON2I:
+			case defined('PASSWORD_ARGON2I') && PASSWORD_ARGON2I:
 				$cpPrefix = '{ARGON2I}';
 				break;
-			case PASSWORD_ARGON2ID:
+			case defined('PASSWORD_ARGON2ID') && PASSWORD_ARGON2ID:
 				$cpPrefix = '{ARGON2ID}';
 				break;
 			default: