From 3c41231985beff869b987b487394c4e2bd12e1df Mon Sep 17 00:00:00 2001 From: flashwave Date: Fri, 5 Oct 2018 09:09:59 +0200 Subject: [PATCH] Use ARGON2ID if available for password hashing (prep for PHP 7.3). --- src/Users/user.php | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/Users/user.php b/src/Users/user.php index 3a8cf15e..a4ee2f86 100644 --- a/src/Users/user.php +++ b/src/Users/user.php @@ -14,8 +14,16 @@ define('MSZ_PERM_USER_MANAGE_REPORTS', 1 << 23); define('MSZ_PERM_USER_MANAGE_RESTRICTIONS', 1 << 24); define('MSZ_PERM_USER_MANAGE_BLACKLISTS', 1 << 25); -// falls back to bcrypt if argon2i isn't available, thanks travis ci -define('MSZ_USERS_PASSWORD_HASH_ALGO', defined('PASSWORD_ARGON2I') ? PASSWORD_ARGON2I : PASSWORD_BCRYPT); +define( + 'MSZ_USERS_PASSWORD_HASH_ALGO', + defined('PASSWORD_ARGON2ID') + ? PASSWORD_ARGON2ID + : ( + defined('PASSWORD_ARGON2I') + ? PASSWORD_ARGON2I + : PASSWORD_BCRYPT + ) +); function user_create( string $username,