From 2ea45a06e724dfe9c3248fbb659d86558b55265e Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Thu, 24 Apr 2014 21:00:33 +0200
Subject: [ticket/12352] Add legacy passwords driver for sha1 smf type
 passwords

PHPBB3-12352
---
 phpBB/phpbb/passwords/driver/sha1_smf.php | 58 +++++++++++++++++++++++++++++++
 1 file changed, 58 insertions(+)
 create mode 100644 phpBB/phpbb/passwords/driver/sha1_smf.php

(limited to 'phpBB/phpbb/passwords/driver/sha1_smf.php')

diff --git a/phpBB/phpbb/passwords/driver/sha1_smf.php b/phpBB/phpbb/passwords/driver/sha1_smf.php
new file mode 100644
index 0000000000..f7f5587485
--- /dev/null
+++ b/phpBB/phpbb/passwords/driver/sha1_smf.php
@@ -0,0 +1,58 @@
+<?php
+/**
+*
+* @package phpBB3
+* @copyright (c) 2014 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+namespace phpbb\passwords\driver;
+
+/**
+* @package passwords
+*/
+class sha1_smf extends base
+{
+	const PREFIX = '$smf$';
+
+	/**
+	* @inheritdoc
+	*/
+	public function get_prefix()
+	{
+		return self::PREFIX;
+	}
+
+	/**
+	* @inheritdoc
+	*/
+	public function is_legacy()
+	{
+		return true;
+	}
+
+	/**
+	* @inheritdoc
+	*/
+	public function hash($password, $user_row = '')
+	{
+		return (isset($user_row['login_name'])) ? sha1(strtolower($user_row['login_name']) . $password) : false;
+	}
+
+	/**
+	* @inheritdoc
+	*/
+	public function check($password, $hash, $user_row = array())
+	{
+		return $hash === $this->hash($password, $user_row);
+	}
+
+	/**
+	* @inheritdoc
+	*/
+	public function get_settings_only($hash, $full = false)
+	{
+		return false;
+	}
+}
-- 
cgit v1.2.1


From 4b3aacfd18a8a3334532f9fcc830affb5f12963b Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Fri, 30 May 2014 00:22:55 +0200
Subject: [ticket/12352] Add get_settings_only method to passwords driver base

PHPBB3-12352
---
 phpBB/phpbb/passwords/driver/sha1_smf.php | 8 --------
 1 file changed, 8 deletions(-)

(limited to 'phpBB/phpbb/passwords/driver/sha1_smf.php')

diff --git a/phpBB/phpbb/passwords/driver/sha1_smf.php b/phpBB/phpbb/passwords/driver/sha1_smf.php
index f7f5587485..92181ccef2 100644
--- a/phpBB/phpbb/passwords/driver/sha1_smf.php
+++ b/phpBB/phpbb/passwords/driver/sha1_smf.php
@@ -47,12 +47,4 @@ class sha1_smf extends base
 	{
 		return $hash === $this->hash($password, $user_row);
 	}
-
-	/**
-	* @inheritdoc
-	*/
-	public function get_settings_only($hash, $full = false)
-	{
-		return false;
-	}
 }
-- 
cgit v1.2.1


From 94b2b64ca199f3db66818c3830c96ea9ff7eeff9 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Sun, 1 Jun 2014 21:36:53 +0200
Subject: [ticket/12352] Update file headers to fit new format

PHPBB3-12352
---
 phpBB/phpbb/passwords/driver/sha1_smf.php | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

(limited to 'phpBB/phpbb/passwords/driver/sha1_smf.php')

diff --git a/phpBB/phpbb/passwords/driver/sha1_smf.php b/phpBB/phpbb/passwords/driver/sha1_smf.php
index 92181ccef2..6cc0841f4d 100644
--- a/phpBB/phpbb/passwords/driver/sha1_smf.php
+++ b/phpBB/phpbb/passwords/driver/sha1_smf.php
@@ -1,17 +1,18 @@
 <?php
 /**
 *
-* @package phpBB3
-* @copyright (c) 2014 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+* This file is part of the phpBB Forum Software package.
+*
+* @copyright (c) phpBB Limited <https://www.phpbb.com>
+* @license GNU General Public License, version 2 (GPL-2.0)
+*
+* For full copyright and license information, please see
+* the docs/CREDITS.txt file.
 *
 */
 
 namespace phpbb\passwords\driver;
 
-/**
-* @package passwords
-*/
 class sha1_smf extends base
 {
 	const PREFIX = '$smf$';
-- 
cgit v1.2.1


From ac311e1b39f891ba3c137f6203981c491639bec3 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Mon, 2 Jun 2014 10:14:26 +0200
Subject: [ticket/12352] Do not check hashes that don't have the necessary
 length

This should significantly reduce the time spent on checking hashes of
passwords that should be converted.

PHPBB3-12352
---
 phpBB/phpbb/passwords/driver/sha1_smf.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/phpbb/passwords/driver/sha1_smf.php')

diff --git a/phpBB/phpbb/passwords/driver/sha1_smf.php b/phpBB/phpbb/passwords/driver/sha1_smf.php
index 6cc0841f4d..3e3322d77f 100644
--- a/phpBB/phpbb/passwords/driver/sha1_smf.php
+++ b/phpBB/phpbb/passwords/driver/sha1_smf.php
@@ -46,6 +46,6 @@ class sha1_smf extends base
 	*/
 	public function check($password, $hash, $user_row = array())
 	{
-		return $hash === $this->hash($password, $user_row);
+		return (strlen($hash) == 40) ? $hash === $this->hash($password, $user_row) : false;
 	}
 }
-- 
cgit v1.2.1