<!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>[36421] trunk/src/wp-includes/random_compat/random.php: Update Random_Compat to the latest version (1.1.6).</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/36421">36421</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/36421","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>2016-01-30 00:56:07 +0000 (Sat, 30 Jan 2016)</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'>Update Random_Compat to the latest version (1.1.6).
See <a href="https://core.trac.wordpress.org/ticket/35665">#35665</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesrandom_compatrandomphp">trunk/src/wp-includes/random_compat/random.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesrandom_compatrandomphp"></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/random_compat/random.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/random_compat/random.php 2016-01-29 04:51:11 UTC (rev 36420)
+++ trunk/src/wp-includes/random_compat/random.php 2016-01-30 00:56:07 UTC (rev 36421)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -50,7 +50,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * In order of preference:
</span><span class="cx" style="display: block; padding: 0 10px"> * 1. Use libsodium if available.
</span><span class="cx" style="display: block; padding: 0 10px"> * 2. fread() /dev/urandom if available (never on Windows)
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * 3. mcrypt_create_iv($bytes, MCRYPT_CREATE_IV)
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * 3. mcrypt_create_iv($bytes, MCRYPT_DEV_URANDOM)
</ins><span class="cx" style="display: block; padding: 0 10px"> * 4. COM('CAPICOM.Utilities.1')->GetRandom()
</span><span class="cx" style="display: block; padding: 0 10px"> * 5. openssl_random_pseudo_bytes() (absolute last resort)
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -64,23 +64,47 @@
</span><span class="cx" style="display: block; padding: 0 10px"> require_once $RandomCompatDIR.'/random_bytes_libsodium_legacy.php';
</span><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 (
- !function_exists('random_bytes') &&
- DIRECTORY_SEPARATOR === '/' &&
- @is_readable('/dev/urandom')
- ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**
+ * Reading directly from /dev/urandom:
+ */
+ if (DIRECTORY_SEPARATOR === '/') {
</ins><span class="cx" style="display: block; padding: 0 10px"> // DIRECTORY_SEPARATOR === '/' on Unix-like OSes -- this is a fast
</span><span class="cx" style="display: block; padding: 0 10px"> // way to exclude Windows.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- //
- // Error suppression on is_readable() in case of an open_basedir or
- // safe_mode failure. All we care about is whether or not we can
- // read it at this point. If the PHP environment is going to panic
- // over trying to see if the file can be read in the first place,
- // that is not helpful to us here.
-
- // See random_bytes_dev_urandom.php
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $RandomCompatUrandom = true;
+ $RandomCompat_basedir = ini_get('open_basedir');
+ if (!empty($RandomCompat_basedir)) {
+ $RandomCompat_open_basedir = explode(
+ PATH_SEPARATOR,
+ strtolower($RandomCompat_basedir)
+ );
+ $RandomCompatUrandom = in_array(
+ '/dev',
+ $RandomCompat_open_basedir
+ );
+ $RandomCompat_open_basedir = null;
+ }
+ if (
+ !function_exists('random_bytes') &&
+ $RandomCompatUrandom &&
+ @is_readable('/dev/urandom')
+ ) {
+ // Error suppression on is_readable() in case of an open_basedir
+ // or safe_mode failure. All we care about is whether or not we
+ // can read it at this point. If the PHP environment is going to
+ // panic over trying to see if the file can be read in the first
+ // place, that is not helpful to us here.
+
+ // See random_bytes_dev_urandom.php
</ins><span class="cx" style="display: block; padding: 0 10px"> require_once $RandomCompatDIR.'/random_bytes_dev_urandom.php';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Unset variables after use
+ $RandomCompatUrandom = null;
+ $RandomCompat_basedir = null;
+ }
+
+ /**
+ * mcrypt_create_iv()
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> if (
</span><span class="cx" style="display: block; padding: 0 10px"> !function_exists('random_bytes') &&
</span><span class="cx" style="display: block; padding: 0 10px"> PHP_VERSION_ID >= 50307 &&
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -113,6 +137,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $RandomCompat_disabled_classes = null;
</span><span class="cx" style="display: block; padding: 0 10px"> $RandomCompatCOMtest = null;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ /**
+ * openssl_random_pseudo_bytes()
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> if (
</span><span class="cx" style="display: block; padding: 0 10px"> !function_exists('random_bytes') &&
</span><span class="cx" style="display: block; padding: 0 10px"> extension_loaded('openssl') &&
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -129,12 +157,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // See random_bytes_openssl.php
</span><span class="cx" style="display: block; padding: 0 10px"> require_once $RandomCompatDIR.'/random_bytes_openssl.php';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ /**
+ * throw new Exception
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> if (!function_exists('random_bytes')) {
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * We don't have any more options, so let's throw an exception right now
</span><span class="cx" style="display: block; padding: 0 10px"> * and hope the developer won't let it fail silently.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function random_bytes()
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ function random_bytes($length)
</ins><span class="cx" style="display: block; padding: 0 10px"> {
</span><span class="cx" style="display: block; padding: 0 10px"> throw new Exception(
</span><span class="cx" style="display: block; padding: 0 10px"> 'There is no suitable CSPRNG installed on your system'
</span></span></pre>
</div>
</div>
</body>
</html>