golem
/
twentyGOLEM
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update phpass. Props duck_. fixes #16072 

git-svn-id: http://svn.automattic.com/wordpress/trunk@17678 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
ryan 2011-04-21 20:44:39 +00:00
parent a619926bab
commit 1e075ab1ab
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
wp-includes/class-phpass.php
View File

@ -3,13 +3,13 @@
* Portable PHP password hashing framework. * Portable PHP password hashing framework.
* @package phpass * @package phpass
* @since 2.5 * @since 2.5
* @version 0.2 / genuine. * @version 0.3 / WordPress
* @link http://www.openwall.com/phpass/ * @link http://www.openwall.com/phpass/
*/ */
# #
# Written by Solar Designer <solar at openwall.com> in 2004-2006 and placed in # 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. # There's absolutely no warranty.
# #
@ -29,7 +29,7 @@
* Portable PHP password hashing framework. * Portable PHP password hashing framework.
* *
* @package phpass * @package phpass
* @version 0.2 / genuine. * @version 0.3 / WordPress
* @link http://www.openwall.com/phpass/ * @link http://www.openwall.com/phpass/
* @since 2.5 * @since 2.5
*/ */
@ -114,7 +114,9 @@ class PasswordHash {
if (substr($setting, 0, 2) == $output) if (substr($setting, 0, 2) == $output)
$output = '*1'; $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; return $output;
$count_log2 = strpos($this->itoa64, $setting[3]); $count_log2 = strpos($this->itoa64, $setting[3]);