mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-01-19 15:17:16 +01:00
Code Issues Releases Wiki Activity

[ticket/16266] Remove extra declaration of constants

Browse Source 
PHPBB3-16266
This commit is contained in:
Marc Alexander 2020-01-05 14:58:17 +01:00
parent b83de54bb4
commit 9fa058a8bd
No known key found for this signature in database
GPG Key ID: 50E0D2423696F995
1 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
phpBB/phpbb/passwords/driver/argon2i.php
View File

@ -37,23 +37,15 @@ class argon2i extends base_native
{ {
parent::__construct($config, $helper); parent::__construct($config, $helper);
// Workaround to prevent "Use of undefined constant" warning on some unsupported PHP installations
if (!defined('PASSWORD_ARGON2I'))
{
define('PASSWORD_ARGON2_DEFAULT_MEMORY_COST', 1024);
define('PASSWORD_ARGON2_DEFAULT_TIME_COST', 2);
define('PASSWORD_ARGON2_DEFAULT_THREADS', 1);
}
/** /**
* For Sodium implementation of argon2 algorithm (since PHP 7.4), set special value of 1 for "threads" cost factor * For Sodium implementation of argon2 algorithm (since PHP 7.4), set special value of 1 for "threads" cost factor
* See https://wiki.php.net/rfc/sodium.argon.hash and PHPBB3-16266 * See https://wiki.php.net/rfc/sodium.argon.hash and PHPBB3-16266
* Don't allow cost factors to be below default settings where possible * Don't allow cost factors to be below default settings where possible
*/ */
$this->memory_cost = max($memory_cost, PASSWORD_ARGON2_DEFAULT_MEMORY_COST); $this->memory_cost = max($memory_cost, defined('PASSWORD_ARGON2_DEFAULT_MEMORY_COST') ? PASSWORD_ARGON2_DEFAULT_MEMORY_COST : 1024);
$this->time_cost = max($time_cost, PASSWORD_ARGON2_DEFAULT_TIME_COST); $this->time_cost = max($time_cost, defined('PASSWORD_ARGON2_DEFAULT_TIME_COST') ? PASSWORD_ARGON2_DEFAULT_TIME_COST : 2);
$this->threads = (defined('PASSWORD_ARGON2_PROVIDER') && PASSWORD_ARGON2_PROVIDER == 'sodium') ? $this->threads = (defined('PASSWORD_ARGON2_PROVIDER') && PASSWORD_ARGON2_PROVIDER == 'sodium') ?
PASSWORD_ARGON2_DEFAULT_THREADS : max($threads, PASSWORD_ARGON2_DEFAULT_THREADS); PASSWORD_ARGON2_DEFAULT_THREADS : max($threads, defined('PASSWORD_ARGON2_DEFAULT_THREADS') ? PASSWORD_ARGON2_DEFAULT_THREADS : 1);
} }
/** /**