aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrxu <rxu@mail.ru>2019-12-28 02:11:58 +0700
committerrxu <rxu@mail.ru>2019-12-28 02:11:58 +0700
commitd000717d341a2c12099b0fba3ab677bbb0f2340c (patch)
tree90f9043645575eb3d40b62987872fc98873150e2
parenta750372a030c343b4f158be23d8aa3901c6094f3 (diff)
downloadforums-d000717d341a2c12099b0fba3ab677bbb0f2340c.tar
forums-d000717d341a2c12099b0fba3ab677bbb0f2340c.tar.gz
forums-d000717d341a2c12099b0fba3ab677bbb0f2340c.tar.bz2
forums-d000717d341a2c12099b0fba3ab677bbb0f2340c.tar.xz
forums-d000717d341a2c12099b0fba3ab677bbb0f2340c.zip
[ticket/16266] More code optimizing
PHPBB3-16266
-rw-r--r--phpBB/phpbb/passwords/driver/argon2i.php6
1 files changed, 3 insertions, 3 deletions
diff --git a/phpBB/phpbb/passwords/driver/argon2i.php b/phpBB/phpbb/passwords/driver/argon2i.php
index 575fbf05bd..f4a6e3e644 100644
--- a/phpBB/phpbb/passwords/driver/argon2i.php
+++ b/phpBB/phpbb/passwords/driver/argon2i.php
@@ -42,9 +42,9 @@ class argon2i extends base_native
* 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);
+ $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);
}
/**