diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2020-01-05 15:29:40 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2020-01-05 15:29:40 +0100 |
| commit | d4293866b390ad32c424cd7096d8a3c795dab8fc (patch) | |
| tree | 9b3cc020c9359114a3262f9af3f1f8a3b0794aab | |
| parent | 4591cf9afad80e1afd8a9659713f66b8e85c6b86 (diff) | |
| parent | 9fa058a8bd66966082d624aacb65aa4abb46ef98 (diff) | |
| download | forums-d4293866b390ad32c424cd7096d8a3c795dab8fc.tar forums-d4293866b390ad32c424cd7096d8a3c795dab8fc.tar.gz forums-d4293866b390ad32c424cd7096d8a3c795dab8fc.tar.bz2 forums-d4293866b390ad32c424cd7096d8a3c795dab8fc.tar.xz forums-d4293866b390ad32c424cd7096d8a3c795dab8fc.zip | |
Merge pull request #5818 from marc1706/ticket/16266
[ticket/16266] Remove extra declaration of constants
| -rw-r--r-- | phpBB/phpbb/passwords/driver/argon2i.php | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/phpBB/phpbb/passwords/driver/argon2i.php b/phpBB/phpbb/passwords/driver/argon2i.php index bf4d6ec33a..03368f6361 100644 --- a/phpBB/phpbb/passwords/driver/argon2i.php +++ b/phpBB/phpbb/passwords/driver/argon2i.php @@ -37,23 +37,15 @@ class argon2i extends base_native { 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 * 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 = max($memory_cost, PASSWORD_ARGON2_DEFAULT_MEMORY_COST); - $this->time_cost = max($time_cost, PASSWORD_ARGON2_DEFAULT_TIME_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, defined('PASSWORD_ARGON2_DEFAULT_TIME_COST') ? PASSWORD_ARGON2_DEFAULT_TIME_COST : 2); $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); } /** |