makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-10 21:38:54 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/16266] Refactor patch using argon2 predefined constants

Browse source 
PHPBB3-16266
This commit is contained in:
rxu 2019-12-28 12:20:51 +07:00
parent d000717d34
commit 3669849368
No known key found for this signature in database
GPG key ID: 955F0567380E586A
2 changed files with 5 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
phpBB/phpbb/passwords/driver/argon2i.php
View file

@ -38,13 +38,14 @@ class argon2i extends base_native
parent::__construct($config, $helper); parent::__construct($config, $helper);
/** /**
* For Sodium implementation of argon2 algorithm, set special cost factor values (since PHP 7.4) * 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 = $this->is_sodium() ? max($memory_cost, 256 * 1024) : max($memory_cost, 1024); $this->memory_cost = max($memory_cost, PASSWORD_ARGON2_DEFAULT_MEMORY_COST);
$this->threads = $this->is_sodium() ? 1 : max($threads, 2); $this->time_cost = max($time_cost, PASSWORD_ARGON2_DEFAULT_TIME_COST);
$this->time_cost = $this->is_sodium() ? max($time_cost, 3) : max($time_cost, 2); $this->threads = (defined('PASSWORD_ARGON2_PROVIDER') && PASSWORD_ARGON2_PROVIDER == 'sodium') ?
PASSWORD_ARGON2_DEFAULT_THREADS : max($threads, PASSWORD_ARGON2_DEFAULT_THREADS);
} }
/** /**

19
phpBB/phpbb/passwords/driver/base_native.php
View file

@ -57,25 +57,6 @@ abstract class base_native extends base
return password_hash($password, $this->get_algo_value(), $this->get_options()); return password_hash($password, $this->get_algo_value(), $this->get_options());
} }
/**
* Check if Sodium implementation for argon2 algorithm is being used
*
* @link https://wiki.php.net/rfc/sodium.argon.hash
*
* @return bool
*/
public function is_sodium()
{
static $is_sodium;
if (!isset($is_sodium))
{
$is_sodium = defined('PASSWORD_ARGON2_PROVIDER') && PASSWORD_ARGON2_PROVIDER == 'sodium';
}
return $is_sodium;
}
/** /**
* {@inheritdoc} * {@inheritdoc}
*/ */