<!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>[42344] branches/4.9/src/wp-includes/random_compat: Avoid PHP Linting errors in the Random_Compat library under PHP7.</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 { 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/42344">42344</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/42344","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>dd32</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2017-12-01 03:06:13 +0000 (Fri, 01 Dec 2017)</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'>Avoid PHP Linting errors in the Random_Compat library under PHP7.
The latest updates to the library are larger than preferred, so instead this modifies the library to lint properly.
Fixes <a href="https://core.trac.wordpress.org/ticket/42439">#42439</a> for 4.9</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches49srcwpincludesrandom_compatrandom_bytes_com_dotnetphp">branches/4.9/src/wp-includes/random_compat/random_bytes_com_dotnet.php</a></li>
<li><a href="#branches49srcwpincludesrandom_compatrandom_bytes_dev_urandomphp">branches/4.9/src/wp-includes/random_compat/random_bytes_dev_urandom.php</a></li>
<li><a href="#branches49srcwpincludesrandom_compatrandom_bytes_libsodiumphp">branches/4.9/src/wp-includes/random_compat/random_bytes_libsodium.php</a></li>
<li><a href="#branches49srcwpincludesrandom_compatrandom_bytes_libsodium_legacyphp">branches/4.9/src/wp-includes/random_compat/random_bytes_libsodium_legacy.php</a></li>
<li><a href="#branches49srcwpincludesrandom_compatrandom_bytes_mcryptphp">branches/4.9/src/wp-includes/random_compat/random_bytes_mcrypt.php</a></li>
<li><a href="#branches49srcwpincludesrandom_compatrandom_bytes_opensslphp">branches/4.9/src/wp-includes/random_compat/random_bytes_openssl.php</a></li>
<li><a href="#branches49srcwpincludesrandom_compatrandom_intphp">branches/4.9/src/wp-includes/random_compat/random_int.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branches49srcwpincludesrandom_compatrandom_bytes_com_dotnetphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/4.9/src/wp-includes/random_compat/random_bytes_com_dotnet.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.9/src/wp-includes/random_compat/random_bytes_com_dotnet.php 2017-11-30 23:09:33 UTC (rev 42343)
+++ branches/4.9/src/wp-includes/random_compat/random_bytes_com_dotnet.php 2017-12-01 03:06:13 UTC (rev 42344)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -26,6 +26,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * SOFTWARE.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+if ( ! is_callable( 'random_bytes' ) ):
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Windows with PHP < 5.3.0 will not have the function
</span><span class="cx" style="display: block; padding: 0 10px"> * openssl_random_pseudo_bytes() available, so let's use
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -79,3 +80,4 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'Could not gather sufficient random data'
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+endif;
</ins></span></pre></div>
<a id="branches49srcwpincludesrandom_compatrandom_bytes_dev_urandomphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/4.9/src/wp-includes/random_compat/random_bytes_dev_urandom.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.9/src/wp-includes/random_compat/random_bytes_dev_urandom.php 2017-11-30 23:09:33 UTC (rev 42343)
+++ branches/4.9/src/wp-includes/random_compat/random_bytes_dev_urandom.php 2017-12-01 03:06:13 UTC (rev 42344)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -30,6 +30,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> define('RANDOM_COMPAT_READ_BUFFER', 8);
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+if ( ! is_callable( 'random_bytes' ) ):
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Unless open_basedir is enabled, use /dev/urandom for
</span><span class="cx" style="display: block; padding: 0 10px"> * random numbers in accordance with best practices
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -146,3 +147,4 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'Error reading from source device'
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+endif;
</ins></span></pre></div>
<a id="branches49srcwpincludesrandom_compatrandom_bytes_libsodiumphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/4.9/src/wp-includes/random_compat/random_bytes_libsodium.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.9/src/wp-includes/random_compat/random_bytes_libsodium.php 2017-11-30 23:09:33 UTC (rev 42343)
+++ branches/4.9/src/wp-includes/random_compat/random_bytes_libsodium.php 2017-12-01 03:06:13 UTC (rev 42344)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -26,6 +26,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * SOFTWARE.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+if ( ! is_callable( 'random_bytes' ) ):
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * If the libsodium PHP extension is loaded, we'll use it above any other
</span><span class="cx" style="display: block; padding: 0 10px"> * solution.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -84,3 +85,4 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'Could not gather sufficient random data'
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+endif;
</ins></span></pre></div>
<a id="branches49srcwpincludesrandom_compatrandom_bytes_libsodium_legacyphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/4.9/src/wp-includes/random_compat/random_bytes_libsodium_legacy.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.9/src/wp-includes/random_compat/random_bytes_libsodium_legacy.php 2017-11-30 23:09:33 UTC (rev 42343)
+++ branches/4.9/src/wp-includes/random_compat/random_bytes_libsodium_legacy.php 2017-12-01 03:06:13 UTC (rev 42344)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -26,6 +26,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * SOFTWARE.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+if ( ! is_callable( 'random_bytes' ) ):
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * If the libsodium PHP extension is loaded, we'll use it above any other
</span><span class="cx" style="display: block; padding: 0 10px"> * solution.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -84,3 +85,4 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'Could not gather sufficient random data'
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+endif;
</ins></span></pre></div>
<a id="branches49srcwpincludesrandom_compatrandom_bytes_mcryptphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/4.9/src/wp-includes/random_compat/random_bytes_mcrypt.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.9/src/wp-includes/random_compat/random_bytes_mcrypt.php 2017-11-30 23:09:33 UTC (rev 42343)
+++ branches/4.9/src/wp-includes/random_compat/random_bytes_mcrypt.php 2017-12-01 03:06:13 UTC (rev 42344)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -27,6 +27,7 @@
</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">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+if ( ! is_callable( 'random_bytes' ) ):
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Powered by ext/mcrypt (and thankfully NOT libmcrypt)
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -74,3 +75,4 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'Could not gather sufficient random data'
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+endif;
</ins></span></pre></div>
<a id="branches49srcwpincludesrandom_compatrandom_bytes_opensslphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/4.9/src/wp-includes/random_compat/random_bytes_openssl.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.9/src/wp-includes/random_compat/random_bytes_openssl.php 2017-11-30 23:09:33 UTC (rev 42343)
+++ branches/4.9/src/wp-includes/random_compat/random_bytes_openssl.php 2017-12-01 03:06:13 UTC (rev 42344)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -26,6 +26,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * SOFTWARE.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+if ( ! is_callable( 'random_bytes' ) ):
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Since openssl_random_pseudo_bytes() uses openssl's
</span><span class="cx" style="display: block; padding: 0 10px"> * RAND_pseudo_bytes() API, which has been marked as deprecated by the
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -81,3 +82,4 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'Could not gather sufficient random data'
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+endif;
</ins></span></pre></div>
<a id="branches49srcwpincludesrandom_compatrandom_intphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/4.9/src/wp-includes/random_compat/random_int.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.9/src/wp-includes/random_compat/random_int.php 2017-11-30 23:09:33 UTC (rev 42343)
+++ branches/4.9/src/wp-includes/random_compat/random_int.php 2017-12-01 03:06:13 UTC (rev 42344)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -26,6 +26,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * SOFTWARE.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+if ( ! is_callable( 'random_int' ) ):
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Fetch a random integer between $min and $max inclusive
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -189,3 +190,4 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return (int) $val;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+endif;
</ins></span></pre>
</div>
</div>
</body>
</html>