2 files changed, 9 insertions, 54 deletions
diff --git a/phpBB/phpbb/passwords/driver/rehashable_driver_interface.php b/phpBB/phpbb/passwords/driver/rehashable_driver_interface.php
index c22f41cf6b..ca30748502 100644
--- a/phpBB/phpbb/passwords/driver/rehashable_driver_interface.php
+++ b/phpBB/phpbb/passwords/driver/rehashable_driver_interface.php
@@ -13,65 +13,13 @@
 
 namespace phpbb\passwords\driver;
 
-interface rehashable_driver_interface
+interface rehashable_driver_interface extends driver_interface
 {
 	/**
-	* Check if hash type is supported
-	*
-	* @return bool		True if supported, false if not
-	*/
-	public function is_supported();
-
-	/**
-	* Check if hash type is a legacy hash type
-	*
-	* @return bool		True if it's a legacy hash type, false if not
-	*/
-	public function is_legacy();
-
-	/**
 	 * Check if password needs to be rehashed
 	 *
 	 * @param string $hash Hash to check for rehash
 	 * @return bool True if password needs to be rehashed, false if not
 	 */
 	public function needs_rehash($hash);
-
-	/**
-	* Returns the hash prefix
-	*
-	* @return string	Hash prefix
-	*/
-	public function get_prefix();
-
-	/**
-	* Hash the password
-	*
-	* @param string $password The password that should be hashed
-	*
-	* @return bool|string	Password hash or false if something went wrong
-	*			during hashing
-	*/
-	public function hash($password);
-
-	/**
-	* Check the password against the supplied hash
-	*
-	* @param string		$password The password to check
-	* @param string		$hash The password hash to check against
-	* @param array		$user_row User's row in users table
-	*
-	* @return bool		True if password is correct, else false
-	*/
-	public function check($password, $hash, $user_row = array());
-
-	/**
-	* Get only the settings of the specified hash
-	*
-	* @param string		$hash Password hash
-	* @param bool		$full Return full settings or only settings
-	*			related to the salt
-	* @return string	String containing the hash settings
-	*/
-	public function get_settings_only($hash, $full = false);
 }
diff --git a/phpBB/phpbb/passwords/manager.php b/phpBB/phpbb/passwords/manager.php
index 38c12995b4..6c3ef4c477 100644
--- a/phpBB/phpbb/passwords/manager.php
+++ b/phpBB/phpbb/passwords/manager.php
@@ -297,7 +297,14 @@ class manager
 		}
 		else
 		{
-			$this->convert_flag = $stored_hash_type->needs_rehash($hash);
+			if ($stored_hash_type instanceof driver\rehashable_driver_interface)
+			{
+				$this->convert_flag = $stored_hash_type->needs_rehash($hash);
+			}
+			else
+			{
+				$this->convert_flag = false;
+			}
 		}
 
 		// Check all legacy hash types if prefix is $CP$