<!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>[54150] trunk/src/wp-includes/sodium_compat: Upgrade/Install: Update sodium_compat to v1.18.0.</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/54150">54150</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/54150","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>SergeyBiryukov</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2022-09-14 00:11:11 +0000 (Wed, 14 Sep 2022)</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'>Upgrade/Install: Update sodium_compat to v1.18.0.
The latest version of sodium_compat includes some improvements, as well as a new feature which will also be included in PHP 8.2.
* Fixed issues with the PHP autoloader:
* [https://github.com/paragonie/sodium_compat/pull/145 <a href="https://core.trac.wordpress.org/ticket/145">#145</a>]: For WordPress, this ensures when Ed25519 is included, so too is the class it inherits from.
* [https://github.com/paragonie/sodium_compat/issues/148 <a href="https://core.trac.wordpress.org/ticket/148">#148</a>], [https://github.com/paragonie/sodium_compat/issues/149 <a href="https://core.trac.wordpress.org/ticket/149">#149</a>]: For PHP 7.4+ with opcache preloading, this ensures the include guards don't fail.
* [https://github.com/paragonie/sodium_compat/pull/144 <a href="https://core.trac.wordpress.org/ticket/144">#144</a>]: Added `sodium_crypto_stream_xchacha20_xor_ic()`
* See [https://github.com/php/php-src/pull/8276 pull request for php-src] (merged in PHP 8.2)
* For motivation: [https://github.com/paragonie/halite/issues/178 paragonie/halite<a href="https://core.trac.wordpress.org/ticket/178">#178</a>]
Release notes:
https://github.com/paragonie/sodium_compat/releases/tag/v1.18.0
A full list of changes in this update can be found on GitHub:
https://github.com/paragonie/sodium_compat/compare/v1.17.1...v1.18.0
Follow-up to <a href="https://core.trac.wordpress.org/changeset/49741">[49741]</a>, <a href="https://core.trac.wordpress.org/changeset/51002">[51002]</a>, <a href="https://core.trac.wordpress.org/changeset/51591">[51591]</a>, <a href="https://core.trac.wordpress.org/changeset/52988">[52988]</a>.
Props jrf, paragoninitiativeenterprises.
Fixes <a href="https://core.trac.wordpress.org/ticket/56564">#56564</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludessodium_compatautoloadphp">trunk/src/wp-includes/sodium_compat/autoload.php</a></li>
<li><a href="#trunksrcwpincludessodium_compatlibstreamxchacha20php">trunk/src/wp-includes/sodium_compat/lib/stream-xchacha20.php</a></li>
<li><a href="#trunksrcwpincludessodium_compatsrcCompatphp">trunk/src/wp-includes/sodium_compat/src/Compat.php</a></li>
<li><a href="#trunksrcwpincludessodium_compatsrcCoreEd25519php">trunk/src/wp-includes/sodium_compat/src/Core/Ed25519.php</a></li>
<li><a href="#trunksrcwpincludessodium_compatsrcCore32Ed25519php">trunk/src/wp-includes/sodium_compat/src/Core32/Ed25519.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludessodium_compatautoloadphp"></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/sodium_compat/autoload.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/sodium_compat/autoload.php 2022-09-13 21:49:14 UTC (rev 54149)
+++ trunk/src/wp-includes/sodium_compat/autoload.php 2022-09-14 00:11:11 UTC (rev 54150)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -42,7 +42,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"> /* Explicitly, always load the Compat class: */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-require_once dirname(__FILE__) . '/src/Compat.php';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+if (!class_exists('ParagonIE_Sodium_Compat', false)) {
+ require_once dirname(__FILE__) . '/src/Compat.php';
+}
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if (!class_exists('SodiumException', false)) {
</span><span class="cx" style="display: block; padding: 0 10px"> require_once dirname(__FILE__) . '/src/SodiumException.php';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -69,4 +71,5 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Older versions of {PHP, ext/sodium} will not define these
</span><span class="cx" style="display: block; padding: 0 10px"> require_once(dirname(__FILE__) . '/lib/php72compat.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">+require_once(dirname(__FILE__) . '/lib/stream-xchacha20.php');
</ins><span class="cx" style="display: block; padding: 0 10px"> require_once(dirname(__FILE__) . '/lib/ristretto255.php');
</span></span></pre></div>
<a id="trunksrcwpincludessodium_compatlibstreamxchacha20php"></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/sodium_compat/lib/stream-xchacha20.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/sodium_compat/lib/stream-xchacha20.php 2022-09-13 21:49:14 UTC (rev 54149)
+++ trunk/src/wp-includes/sodium_compat/lib/stream-xchacha20.php 2022-09-14 00:11:11 UTC (rev 54150)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -41,3 +41,19 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return ParagonIE_Sodium_Compat::crypto_stream_xchacha20_xor($message, $nonce, $key, true);
</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('sodium_crypto_stream_xchacha20_xor_ic')) {
+ /**
+ * @see ParagonIE_Sodium_Compat::crypto_stream_xchacha20_xor_ic()
+ * @param string $message
+ * @param string $nonce
+ * @param int $counter
+ * @param string $key
+ * @return string
+ * @throws SodiumException
+ * @throws TypeError
+ */
+ function sodium_crypto_stream_xchacha20_xor_ic($message, $nonce, $counter, $key)
+ {
+ return ParagonIE_Sodium_Compat::crypto_stream_xchacha20_xor_ic($message, $nonce, $counter, $key, true);
+ }
+}
</ins></span></pre></div>
<a id="trunksrcwpincludessodium_compatsrcCompatphp"></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/sodium_compat/src/Compat.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/sodium_compat/src/Compat.php 2022-09-13 21:49:14 UTC (rev 54149)
+++ trunk/src/wp-includes/sodium_compat/src/Compat.php 2022-09-14 00:11:11 UTC (rev 54150)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3155,6 +3155,55 @@
</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">+ * DANGER! UNAUTHENTICATED ENCRYPTION!
+ *
+ * Unless you are following expert advice, do not use this feature.
+ *
+ * Algorithm: XChaCha20
+ *
+ * This DOES NOT provide ciphertext integrity.
+ *
+ * @param string $message Plaintext message
+ * @param string $nonce Number to be used Once; must be 24 bytes
+ * @param int $counter
+ * @param string $key Encryption key
+ * @return string Encrypted text which is vulnerable to chosen-
+ * ciphertext attacks unless you implement some
+ * other mitigation to the ciphertext (i.e.
+ * Encrypt then MAC)
+ * @param bool $dontFallback
+ * @throws SodiumException
+ * @throws TypeError
+ * @psalm-suppress MixedArgument
+ */
+ public static function crypto_stream_xchacha20_xor_ic($message, $nonce, $counter, $key, $dontFallback = false)
+ {
+ /* Type checks: */
+ ParagonIE_Sodium_Core_Util::declareScalarType($message, 'string', 1);
+ ParagonIE_Sodium_Core_Util::declareScalarType($nonce, 'string', 2);
+ ParagonIE_Sodium_Core_Util::declareScalarType($counter, 'int', 3);
+ ParagonIE_Sodium_Core_Util::declareScalarType($key, 'string', 4);
+
+ /* Input validation: */
+ if (ParagonIE_Sodium_Core_Util::strlen($nonce) !== self::CRYPTO_STREAM_XCHACHA20_NONCEBYTES) {
+ throw new SodiumException('Argument 2 must be CRYPTO_SECRETBOX_XCHACHA20_NONCEBYTES long.');
+ }
+ if (ParagonIE_Sodium_Core_Util::strlen($key) !== self::CRYPTO_STREAM_XCHACHA20_KEYBYTES) {
+ throw new SodiumException('Argument 3 must be CRYPTO_SECRETBOX_XCHACHA20_KEYBYTES long.');
+ }
+
+ if (is_callable('sodium_crypto_stream_xchacha20_xor_ic') && !$dontFallback) {
+ return sodium_crypto_stream_xchacha20_xor_ic($message, $nonce, $counter, $key);
+ }
+
+ $ic = ParagonIE_Sodium_Core_Util::store64_le($counter);
+ if (PHP_INT_SIZE === 4) {
+ return ParagonIE_Sodium_Core32_XChaCha20::streamXorIc($message, $nonce, $key, $ic);
+ }
+ return ParagonIE_Sodium_Core_XChaCha20::streamXorIc($message, $nonce, $key, $ic);
+ }
+
+ /**
</ins><span class="cx" style="display: block; padding: 0 10px"> * Return a secure random key for use with crypto_stream_xchacha20
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @return string
</span></span></pre></div>
<a id="trunksrcwpincludessodium_compatsrcCoreEd25519php"></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/sodium_compat/src/Core/Ed25519.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/sodium_compat/src/Core/Ed25519.php 2022-09-13 21:49:14 UTC (rev 54149)
+++ trunk/src/wp-includes/sodium_compat/src/Core/Ed25519.php 2022-09-14 00:11:11 UTC (rev 54150)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3,6 +3,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if (class_exists('ParagonIE_Sodium_Core_Ed25519', false)) {
</span><span class="cx" style="display: block; padding: 0 10px"> return;
</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 (!class_exists('ParagonIE_Sodium_Core_Curve25519', false)) {
+ require_once dirname(__FILE__) . '/Curve25519.php';
+}
</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"> * Class ParagonIE_Sodium_Core_Ed25519
</span></span></pre></div>
<a id="trunksrcwpincludessodium_compatsrcCore32Ed25519php"></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/sodium_compat/src/Core32/Ed25519.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/sodium_compat/src/Core32/Ed25519.php 2022-09-13 21:49:14 UTC (rev 54149)
+++ trunk/src/wp-includes/sodium_compat/src/Core32/Ed25519.php 2022-09-14 00:11:11 UTC (rev 54150)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3,6 +3,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if (class_exists('ParagonIE_Sodium_Core32_Ed25519', false)) {
</span><span class="cx" style="display: block; padding: 0 10px"> return;
</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 (!class_exists('ParagonIE_Sodium_Core32_Curve25519')) {
+ require_once dirname(__FILE__) . '/Curve25519.php';
+}
</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"> * Class ParagonIE_Sodium_Core32_Ed25519
</span></span></pre>
</div>
</div>
</body>
</html>