<!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" />
<title>[59030] trunk/src/wp-includes/class-phpass.php: External Libraries: Update PHPass library.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { 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 { white-space: pre-line; overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#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>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/59030">59030</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/59030","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>desrosj</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2024-09-17 21:06:30 +0000 (Tue, 17 Sep 2024)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>External Libraries: Update PHPass library.
This updates the PHPass library to version `0.5.4` while maintaining the adjustments introduced in <a href="https://core.trac.wordpress.org/changeset/30466">[30466]</a>.
Props jrf.
Fixes <a href="https://core.trac.wordpress.org/ticket/62058">#62058</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesclassphpassphp">trunk/src/wp-includes/class-phpass.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesclassphpassphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class-phpass.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-phpass.php 2024-09-17 20:56:03 UTC (rev 59029)
+++ trunk/src/wp-includes/class-phpass.php 2024-09-17 21:06:30 UTC (rev 59030)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -10,7 +10,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> #
</span><span class="cx" style="display: block; padding: 0 10px"> # Portable PHP password hashing framework.
</span><span class="cx" style="display: block; padding: 0 10px"> #
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-# Version 0.5 / WordPress.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+# Version 0.5.4 / WordPress.
</ins><span class="cx" style="display: block; padding: 0 10px"> #
</span><span class="cx" style="display: block; padding: 0 10px"> # Written by Solar Designer <solar at openwall.com> in 2004-2006 and placed in
</span><span class="cx" style="display: block; padding: 0 10px"> # the public domain. Revised in subsequent years, still public domain.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -51,15 +51,17 @@
</span><span class="cx" style="display: block; padding: 0 10px"> {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->itoa64 = './0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ($iteration_count_log2 < 4 || $iteration_count_log2 > 31)
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ($iteration_count_log2 < 4 || $iteration_count_log2 > 31) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $iteration_count_log2 = 8;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->iteration_count_log2 = $iteration_count_log2;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->portable_hashes = $portable_hashes;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->random_state = microtime();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if (function_exists('getmypid'))
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if (function_exists('getmypid')) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->random_state .= getmypid();
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> function PasswordHash($iteration_count_log2, $portable_hashes)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -96,16 +98,20 @@
</span><span class="cx" style="display: block; padding: 0 10px"> do {
</span><span class="cx" style="display: block; padding: 0 10px"> $value = ord($input[$i++]);
</span><span class="cx" style="display: block; padding: 0 10px"> $output .= $this->itoa64[$value & 0x3f];
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ($i < $count)
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ($i < $count) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $value |= ord($input[$i]) << 8;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> $output .= $this->itoa64[($value >> 6) & 0x3f];
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ($i++ >= $count)
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ($i++ >= $count) {
</ins><span class="cx" style="display: block; padding: 0 10px"> break;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ($i < $count)
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
+ if ($i < $count) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $value |= ord($input[$i]) << 16;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> $output .= $this->itoa64[($value >> 12) & 0x3f];
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ($i++ >= $count)
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ($i++ >= $count) {
</ins><span class="cx" style="display: block; padding: 0 10px"> break;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> $output .= $this->itoa64[($value >> 18) & 0x3f];
</span><span class="cx" style="display: block; padding: 0 10px"> } while ($i < $count);
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -115,8 +121,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function gensalt_private($input)
</span><span class="cx" style="display: block; padding: 0 10px"> {
</span><span class="cx" style="display: block; padding: 0 10px"> $output = '$P$';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $output .= $this->itoa64[min($this->iteration_count_log2 +
- ((PHP_VERSION >= '5') ? 5 : 3), 30)];
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $output .= $this->itoa64[min($this->iteration_count_log2 + 5,
+ 30)];
</ins><span class="cx" style="display: block; padding: 0 10px"> $output .= $this->encode64($input, 6);
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return $output;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -125,23 +131,27 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function crypt_private($password, $setting)
</span><span class="cx" style="display: block; padding: 0 10px"> {
</span><span class="cx" style="display: block; padding: 0 10px"> $output = '*0';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if (substr($setting, 0, 2) === $output)
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if (substr($setting, 0, 2) === $output) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $output = '*1';
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $id = substr($setting, 0, 3);
</span><span class="cx" style="display: block; padding: 0 10px"> # We use "$P$", phpBB3 uses "$H$" for the same thing
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ($id !== '$P$' && $id !== '$H$')
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ($id !== '$P$' && $id !== '$H$') {
</ins><span class="cx" style="display: block; padding: 0 10px"> return $output;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $count_log2 = strpos($this->itoa64, $setting[3]);
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ($count_log2 < 7 || $count_log2 > 30)
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ($count_log2 < 7 || $count_log2 > 30) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return $output;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $count = 1 << $count_log2;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $salt = substr($setting, 4, 8);
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if (strlen($salt) !== 8)
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if (strlen($salt) !== 8) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return $output;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> # We were kind of forced to use MD5 here since it's the only
</span><span class="cx" style="display: block; padding: 0 10px"> # cryptographic primitive that was available in all versions
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -174,7 +184,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $output = '$2a$';
</span><span class="cx" style="display: block; padding: 0 10px"> $output .= chr((int)(ord('0') + $this->iteration_count_log2 / 10));
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $output .= chr((ord('0') + $this->iteration_count_log2 % 10));
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $output .= chr(ord('0') + $this->iteration_count_log2 % 10);
</ins><span class="cx" style="display: block; padding: 0 10px"> $output .= '$';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $i = 0;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -213,17 +223,20 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $random = $this->get_random_bytes(16);
</span><span class="cx" style="display: block; padding: 0 10px"> $hash =
</span><span class="cx" style="display: block; padding: 0 10px"> crypt($password, $this->gensalt_blowfish($random));
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if (strlen($hash) === 60)
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if (strlen($hash) === 60) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return $hash;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if (strlen($random) < 6)
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if (strlen($random) < 6) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $random = $this->get_random_bytes(6);
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> $hash =
</span><span class="cx" style="display: block; padding: 0 10px"> $this->crypt_private($password,
</span><span class="cx" style="display: block; padding: 0 10px"> $this->gensalt_private($random));
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if (strlen($hash) === 34)
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if (strlen($hash) === 34) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return $hash;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> # Returning '*' on error is safe here, but would _not_ be safe
</span><span class="cx" style="display: block; padding: 0 10px"> # in a crypt(3)-like function used _both_ for generating new
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -238,8 +251,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $hash = $this->crypt_private($password, $stored_hash);
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ($hash[0] === '*')
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ($hash[0] === '*') {
</ins><span class="cx" style="display: block; padding: 0 10px"> $hash = crypt($password, $stored_hash);
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> # This is not constant-time. In order to keep the code simple,
</span><span class="cx" style="display: block; padding: 0 10px"> # for timing safety we currently rely on the salts being
</span></span></pre>
</div>
</div>
</body>
</html>