diff options
| author | rxu <rxu@mail.ru> | 2019-12-28 01:04:13 +0700 |
|---|---|---|
| committer | rxu <rxu@mail.ru> | 2019-12-28 01:04:13 +0700 |
| commit | a750372a030c343b4f158be23d8aa3901c6094f3 (patch) | |
| tree | 914c2a90e9041aef58735aa7f18e4bb8978bd432 | |
| parent | 5dfba1b06473ecb0298d9b61fd9dec28ac60f884 (diff) | |
| download | forums-a750372a030c343b4f158be23d8aa3901c6094f3.tar forums-a750372a030c343b4f158be23d8aa3901c6094f3.tar.gz forums-a750372a030c343b4f158be23d8aa3901c6094f3.tar.bz2 forums-a750372a030c343b4f158be23d8aa3901c6094f3.tar.xz forums-a750372a030c343b4f158be23d8aa3901c6094f3.zip | |
[ticket/16266] More code optimizing
PHPBB3-16266
| -rw-r--r-- | phpBB/phpbb/passwords/driver/argon2i.php | 8 | ||||
| -rw-r--r-- | phpBB/phpbb/passwords/driver/base_native.php | 2 |
2 files changed, 6 insertions, 4 deletions
diff --git a/phpBB/phpbb/passwords/driver/argon2i.php b/phpBB/phpbb/passwords/driver/argon2i.php index 9aa2b6f14c..575fbf05bd 100644 --- a/phpBB/phpbb/passwords/driver/argon2i.php +++ b/phpBB/phpbb/passwords/driver/argon2i.php @@ -37,9 +37,11 @@ class argon2i extends base_native { parent::__construct($config, $helper); - // For Sodium implementation, set special cost factor values (since PHP 7.4) - // See https://wiki.php.net/rfc/sodium.argon.hash and PHPBB3-16266 - // Otherwise don't allow cost factors to be below default settings + /** + * For Sodium implementation of argon2 algorithm, set special cost factor values (since PHP 7.4) + * See https://wiki.php.net/rfc/sodium.argon.hash and PHPBB3-16266 + * 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->threads = ($this->is_sodium()) ? 1 : max($threads, 2); $this->time_cost = ($this->is_sodium()) ? max($time_cost, 3) : max($time_cost, 2); diff --git a/phpBB/phpbb/passwords/driver/base_native.php b/phpBB/phpbb/passwords/driver/base_native.php index fa4f0995a5..ab2e9f83a4 100644 --- a/phpBB/phpbb/passwords/driver/base_native.php +++ b/phpBB/phpbb/passwords/driver/base_native.php @@ -68,7 +68,7 @@ abstract class base_native extends base { static $is_sodium; - if (empty($is_sodium)) + if (!isset($is_sodium)) { $is_sodium = defined('PASSWORD_ARGON2_PROVIDER') && PASSWORD_ARGON2_PROVIDER == 'sodium'; } |