3 files changed, 63 insertions, 1 deletions
diff --git a/phpBB/config/passwords.yml b/phpBB/config/passwords.yml
index 29986a85f2..4f4a4621ee 100644
--- a/phpBB/config/passwords.yml
+++ b/phpBB/config/passwords.yml
@@ -38,6 +38,14 @@ services:
         tags:
             - { name: passwords.driver }
 
+    passwords.driver.convert_password:
+        class: phpbb\passwords\driver\convert_password
+        arguments:
+            - @config
+            - @passwords.driver_helper
+        tags:
+            - { name: passwords.driver }
+
     passwords.driver.sha1_smf:
         class: phpbb\passwords\driver\sha1_smf
         arguments:
diff --git a/phpBB/phpbb/passwords/driver/convert_password.php b/phpBB/phpbb/passwords/driver/convert_password.php
new file mode 100644
index 0000000000..354c6b9ff3
--- /dev/null
+++ b/phpBB/phpbb/passwords/driver/convert_password.php
@@ -0,0 +1,50 @@
+<?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 convert_password extends base
+{
+	const PREFIX = '$CP$';
+
+	/**
+	* @inheritdoc
+	*/
+	public function get_prefix()
+	{
+		return self::PREFIX;
+	}
+
+	/**
+	* @inheritdoc
+	*/
+	public function hash($password, $user_row = '')
+	{
+		return false;
+	}
+
+	/**
+	* @inheritdoc
+	*/
+	public function check($password, $hash, $user_row = array())
+	{
+		return false;
+	}
+
+	/**
+	* @inheritdoc
+	*/
+	public function get_settings_only($hash, $full = false)
+	{
+		return false;
+	}
+}
diff --git a/tests/passwords/manager_test.php b/tests/passwords/manager_test.php
index c2fda170a1..d0f860c4c5 100644
--- a/tests/passwords/manager_test.php
+++ b/tests/passwords/manager_test.php
@@ -30,6 +30,7 @@ class phpbb_passwords_manager_test extends \phpbb_test_case
 			'passwords.driver.bcrypt'		=> new \phpbb\passwords\driver\bcrypt($config, $this->driver_helper),
 			'passwords.driver.salted_md5'	=> new \phpbb\passwords\driver\salted_md5($config, $this->driver_helper),
 			'passwords.driver.phpass'		=> new \phpbb\passwords\driver\phpass($config, $this->driver_helper),
+			'passwords.driver.convert_password'	=> new \phpbb\passwords\driver\convert_password($config, $this->driver_helper),
 			'passwords.driver.sha1_smf'	=> new \phpbb\passwords\driver\sha1_smf($config, $this->driver_helper),
 		);
 
@@ -134,13 +135,16 @@ class phpbb_passwords_manager_test extends \phpbb_test_case
 	{
 		return array(
 			array('foobar', '3858f62230ac3c915f300c664312c63f', true),
+			array('foobar', '$CP$3858f62230ac3c915f300c664312c63f', true),
+			array('foobar', '$CP$3858f62230ac3c915f300c', false),
 			array('foobar', '$S$b57a939fa4f2c04413a4eea9734a0903647b7adb93181295', false),
 			array('foobar', '$2a\S$kkkkaakdkdiej39023903204j2k3490234jk234j02349', false),
 			array('foobar', '$H$kklk938d023k//k3023', false),
 			array('foobar', '$H$3PtYMgXb39lrIWkgoxYLWtRkZtY3AY/', false),
 			array('foobar', '$2a$kwiweorurlaeirw', false),
 			array('foobar', '6f9e2a1899e1f15708fd2e554103480eb53e8b57', false),
-			array('foobar', '6f9e2a1899e1f15708fd2e554103480eb53e8b57', true, array('login_name' => 'test')),
+			array('foobar', '6f9e2a1899e1f15708fd2e554103480eb53e8b57', false, array('login_name' => 'test')),
+			array('foobar', '$CP$6f9e2a1899e1f15708fd2e554103480eb53e8b57', true, array('login_name' => 'test')),
 			array('foobar', '6f9e2a1899', false, array('login_name' => 'test')),
 		);
 	}