<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[17678] trunk/wp-includes/class-phpass.php: Update phpass.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/17678">17678</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2011-04-21 20:44:39 +0000 (Thu, 21 Apr 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Update phpass. Props duck_. fixes <a href="http://trac.wordpress.org/ticket/16072">#16072</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesclassphpassphp">trunk/wp-includes/class-phpass.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludesclassphpassphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/class-phpass.php (17677 => 17678)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/class-phpass.php 2011-04-21 20:40:32 UTC (rev 17677)
+++ trunk/wp-includes/class-phpass.php 2011-04-21 20:44:39 UTC (rev 17678)
</span><span class="lines">@@ -3,13 +3,13 @@
</span><span class="cx"> * Portable PHP password hashing framework.
</span><span class="cx"> * @package phpass
</span><span class="cx"> * @since 2.5
</span><del>- * @version 0.2 / genuine.
</del><ins>+ * @version 0.3 / WordPress
</ins><span class="cx"> * @link http://www.openwall.com/phpass/
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> #
</span><span class="cx"> # Written by Solar Designer <solar at openwall.com> in 2004-2006 and placed in
</span><del>-# the public domain.
</del><ins>+# the public domain. Revised in subsequent years, still public domain.
</ins><span class="cx"> #
</span><span class="cx"> # There's absolutely no warranty.
</span><span class="cx"> #
</span><span class="lines">@@ -29,7 +29,7 @@
</span><span class="cx"> * Portable PHP password hashing framework.
</span><span class="cx"> *
</span><span class="cx"> * @package phpass
</span><del>- * @version 0.2 / genuine.
</del><ins>+ * @version 0.3 / WordPress
</ins><span class="cx"> * @link http://www.openwall.com/phpass/
</span><span class="cx"> * @since 2.5
</span><span class="cx"> */
</span><span class="lines">@@ -114,7 +114,9 @@
</span><span class="cx"> if (substr($setting, 0, 2) == $output)
</span><span class="cx"> $output = '*1';
</span><span class="cx">
</span><del>- if (substr($setting, 0, 3) != '$P$')
</del><ins>+ $id = substr($setting, 0, 3);
+ # We use "$P$", phpBB3 uses "$H$" for the same thing
+ if ($id != '$P$' && $id != '$H$')
</ins><span class="cx"> return $output;
</span><span class="cx">
</span><span class="cx"> $count_log2 = strpos($this->itoa64, $setting[3]);
</span></span></pre>
</div>
</div>
</body>
</html>