From 1e075ab1ab0af2318f6981ff83f1cd64f0efb653 Mon Sep 17 00:00:00 2001
From: ryan <ryan@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Thu, 21 Apr 2011 20:44:39 +0000
Subject: [PATCH] Update phpass. Props duck_. fixes #16072

git-svn-id: http://svn.automattic.com/wordpress/trunk@17678 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/class-phpass.php | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/wp-includes/class-phpass.php b/wp-includes/class-phpass.php
index 6d77a1cce9..ad474bcc50 100644
--- a/wp-includes/class-phpass.php
+++ b/wp-includes/class-phpass.php
@@ -3,13 +3,13 @@
  * Portable PHP password hashing framework.
  * @package phpass
  * @since 2.5
- * @version 0.2 / genuine.
+ * @version 0.3 / WordPress
  * @link http://www.openwall.com/phpass/
  */
 
 #
 # Written by Solar Designer <solar at openwall.com> in 2004-2006 and placed in
-# the public domain.
+# the public domain.  Revised in subsequent years, still public domain.
 #
 # There's absolutely no warranty.
 #
@@ -29,7 +29,7 @@
  * Portable PHP password hashing framework.
  *
  * @package phpass
- * @version 0.2 / genuine.
+ * @version 0.3 / WordPress
  * @link http://www.openwall.com/phpass/
  * @since 2.5
  */
@@ -114,7 +114,9 @@ class PasswordHash {
 		if (substr($setting, 0, 2) == $output)
 			$output = '*1';
 
-		if (substr($setting, 0, 3) != '$P$')
+		$id = substr($setting, 0, 3);
+		# We use "$P$", phpBB3 uses "$H$" for the same thing
+		if ($id != '$P$' && $id != '$H$')
 			return $output;
 
 		$count_log2 = strpos($this->itoa64, $setting[3]);