From 186a3d40c60b4d5f11e6f399737557ef08913078 Mon Sep 17 00:00:00 2001
From: rxu <rxu@mail.ru>
Date: Thu, 26 Dec 2019 19:44:22 +0700
Subject: [ticket/16266] Fix argon2 driver issue for Sodium implementation

PHPBB3-16266
---
 phpBB/phpbb/passwords/driver/argon2i.php     | 19 +++++++++++++++----
 phpBB/phpbb/passwords/driver/base_native.php | 12 ++++++++++++
 2 files changed, 27 insertions(+), 4 deletions(-)

(limited to 'phpBB')

diff --git a/phpBB/phpbb/passwords/driver/argon2i.php b/phpBB/phpbb/passwords/driver/argon2i.php
index 49d7d6393e..3babbaa780 100644
--- a/phpBB/phpbb/passwords/driver/argon2i.php
+++ b/phpBB/phpbb/passwords/driver/argon2i.php
@@ -37,10 +37,21 @@ class argon2i extends base_native
 	{
 		parent::__construct($config, $helper);
 
-		// Don't allow cost factors to be below default settings
-		$this->memory_cost = max($memory_cost, 1024);
-		$this->threads     = max($threads,     2);
-		$this->time_cost   = max($time_cost,   2);
+		if ($this->is_sodium())
+		{
+			// For Sodium implementation, set special cost factor values (since PHP 7.4)
+			// See https://wiki.php.net/rfc/sodium.argon.hash and PHPBB3-16266
+			$this->memory_cost = max($memory_cost, 256*1024);
+			$this->threads     = 1;
+			$this->time_cost   = max($time_cost,   3);
+		}
+		else
+		{
+			// Otherwise don't allow cost factors to be below default settings
+			$this->memory_cost = max($memory_cost, 1024);
+			$this->threads     = max($threads,     2);
+			$this->time_cost   = max($time_cost,   2);
+		}
 	}
 
 	/**
diff --git a/phpBB/phpbb/passwords/driver/base_native.php b/phpBB/phpbb/passwords/driver/base_native.php
index 87498327f9..31d3465165 100644
--- a/phpBB/phpbb/passwords/driver/base_native.php
+++ b/phpBB/phpbb/passwords/driver/base_native.php
@@ -57,6 +57,18 @@ abstract class base_native extends base
 		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()
+	{
+		return defined('PASSWORD_ARGON2_PROVIDER') && PASSWORD_ARGON2_PROVIDER == 'sodium';
+	}
+
 	/**
 	* {@inheritdoc}
 	*/
-- 
cgit v1.2.1