2 files changed, 4 insertions, 6 deletions
diff --git a/phpBB/phpbb/passwords/driver/helper.php b/phpBB/phpbb/passwords/driver/helper.php
index da66347ac3..086edb6b65 100644
--- a/phpBB/phpbb/passwords/driver/helper.php
+++ b/phpBB/phpbb/passwords/driver/helper.php
@@ -120,12 +120,13 @@ class helper
 	* Get random salt with specified length
 	*
 	* @param int $length Salt length
+	* @param string $rand_seed Seed for random data (optional). For tests.
 	*/
-	public function get_random_salt($length)
+	public function get_random_salt($length, $rand_seed = '/dev/urandom')
 	{
 		$random = '';
 
-		if (($fh = @fopen('/dev/urandom', 'rb')))
+		if (($fh = @fopen($rand_seed, 'rb')))
 		{
 			$random = fread($fh, $length);
 			fclose($fh);
diff --git a/phpBB/phpbb/passwords/driver/salted_md5.php b/phpBB/phpbb/passwords/driver/salted_md5.php
index 13d25560fe..23ae25c0c9 100644
--- a/phpBB/phpbb/passwords/driver/salted_md5.php
+++ b/phpBB/phpbb/passwords/driver/salted_md5.php
@@ -46,10 +46,7 @@ class salted_md5 extends \phpbb\passwords\driver\base
 		}
 		else
 		{
-			if (($settings = $this->get_hash_settings($this->generate_salt())) === false)
-			{
-				return false;
-			}
+			$settings = $this->get_hash_settings($this->generate_salt());
 		}
 
 		$hash = md5($settings['salt'] . $password, true);