<!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>[55699] trunk/src/wp-includes/sodium_compat: Upgrade/Install: Update sodium_compat to v1.20.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/55699">55699</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/55699","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>2023-04-30 14:06:51 +0000 (Sun, 30 Apr 2023)</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.20.0.
The latest version of sodium_compat includes a fix for the Poly1305 implementation.
References:
* [https://github.com/paragonie/sodium_compat/releases/tag/v1.20.0 sodium_compat 1.20.0 release notes]
* [https://github.com/paragonie/sodium_compat/compare/v1.19.0...v1.20.0 Full list of changes in sodium_compat 1.20.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>, <a href="https://core.trac.wordpress.org/changeset/54150">[54150]</a>, <a href="https://core.trac.wordpress.org/changeset/54310">[54310]</a>.
Props jrf, costdev, paragoninitiativeenterprises, mukesh27.
Fixes <a href="https://core.trac.wordpress.org/ticket/58224">#58224</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludessodium_compatLICENSE">trunk/src/wp-includes/sodium_compat/LICENSE</a></li>
<li><a href="#trunksrcwpincludessodium_compatlibphp72compatphp">trunk/src/wp-includes/sodium_compat/lib/php72compat.php</a></li>
<li><a href="#trunksrcwpincludessodium_compatsrcCorePoly1305Statephp">trunk/src/wp-includes/sodium_compat/src/Core/Poly1305/State.php</a></li>
<li><a href="#trunksrcwpincludessodium_compatsrcCore32Poly1305Statephp">trunk/src/wp-includes/sodium_compat/src/Core32/Poly1305/State.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludessodium_compatLICENSE"></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/LICENSE</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/sodium_compat/LICENSE 2023-04-29 18:28:37 UTC (rev 55698)
+++ trunk/src/wp-includes/sodium_compat/LICENSE 2023-04-30 14:06:51 UTC (rev 55699)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,6 +1,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ISC License
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-Copyright (c) 2016-2022, Paragon Initiative Enterprises <security at paragonie dot com>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+Copyright (c) 2016-2023, Paragon Initiative Enterprises <security at paragonie dot com>
</ins><span class="cx" style="display: block; padding: 0 10px"> Copyright (c) 2013-2019, Frank Denis <j at pureftpd dot org>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> Permission to use, copy, modify, and/or distribute this software for any
</span></span></pre></div>
<a id="trunksrcwpincludessodium_compatlibphp72compatphp"></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/php72compat.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/sodium_compat/lib/php72compat.php 2023-04-29 18:28:37 UTC (rev 55698)
+++ trunk/src/wp-includes/sodium_compat/lib/php72compat.php 2023-04-30 14:06:51 UTC (rev 55699)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1360,6 +1360,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return void
</span><span class="cx" style="display: block; padding: 0 10px"> * @throws SodiumException
</span><span class="cx" style="display: block; padding: 0 10px"> * @throws TypeError
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ *
+ * @psalm-suppress ReferenceConstraintViolation
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function sodium_memzero(&$string)
</span><span class="cx" style="display: block; padding: 0 10px"> {
</span></span></pre></div>
<a id="trunksrcwpincludessodium_compatsrcCorePoly1305Statephp"></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/Poly1305/State.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/Poly1305/State.php 2023-04-29 18:28:37 UTC (rev 55698)
+++ trunk/src/wp-includes/sodium_compat/src/Core/Poly1305/State.php 2023-04-30 14:06:51 UTC (rev 55699)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -210,43 +210,43 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /* h *= r */
</span><span class="cx" style="display: block; padding: 0 10px"> $d0 = (
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- self::mul($h0, $r0, 25) +
- self::mul($s4, $h1, 26) +
- self::mul($s3, $h2, 26) +
- self::mul($s2, $h3, 26) +
- self::mul($s1, $h4, 26)
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ self::mul($h0, $r0, 27) +
+ self::mul($s4, $h1, 27) +
+ self::mul($s3, $h2, 27) +
+ self::mul($s2, $h3, 27) +
+ self::mul($s1, $h4, 27)
</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"> $d1 = (
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- self::mul($h0, $r1, 25) +
- self::mul($h1, $r0, 25) +
- self::mul($s4, $h2, 26) +
- self::mul($s3, $h3, 26) +
- self::mul($s2, $h4, 26)
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ self::mul($h0, $r1, 27) +
+ self::mul($h1, $r0, 27) +
+ self::mul($s4, $h2, 27) +
+ self::mul($s3, $h3, 27) +
+ self::mul($s2, $h4, 27)
</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"> $d2 = (
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- self::mul($h0, $r2, 25) +
- self::mul($h1, $r1, 25) +
- self::mul($h2, $r0, 25) +
- self::mul($s4, $h3, 26) +
- self::mul($s3, $h4, 26)
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ self::mul($h0, $r2, 27) +
+ self::mul($h1, $r1, 27) +
+ self::mul($h2, $r0, 27) +
+ self::mul($s4, $h3, 27) +
+ self::mul($s3, $h4, 27)
</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"> $d3 = (
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- self::mul($h0, $r3, 25) +
- self::mul($h1, $r2, 25) +
- self::mul($h2, $r1, 25) +
- self::mul($h3, $r0, 25) +
- self::mul($s4, $h4, 26)
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ self::mul($h0, $r3, 27) +
+ self::mul($h1, $r2, 27) +
+ self::mul($h2, $r1, 27) +
+ self::mul($h3, $r0, 27) +
+ self::mul($s4, $h4, 27)
</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"> $d4 = (
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- self::mul($h0, $r4, 25) +
- self::mul($h1, $r3, 25) +
- self::mul($h2, $r2, 25) +
- self::mul($h3, $r1, 25) +
- self::mul($h4, $r0, 25)
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ self::mul($h0, $r4, 27) +
+ self::mul($h1, $r3, 27) +
+ self::mul($h2, $r2, 27) +
+ self::mul($h3, $r1, 27) +
+ self::mul($h4, $r0, 27)
</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"> /* (partial) h %= p */
</span></span></pre></div>
<a id="trunksrcwpincludessodium_compatsrcCore32Poly1305Statephp"></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/Poly1305/State.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/Poly1305/State.php 2023-04-29 18:28:37 UTC (rev 55698)
+++ trunk/src/wp-includes/sodium_compat/src/Core32/Poly1305/State.php 2023-04-30 14:06:51 UTC (rev 55699)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -255,39 +255,39 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /* h *= r */
</span><span class="cx" style="display: block; padding: 0 10px"> $d0 = $zero
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ->addInt64($h0->mulInt64($r0, 25))
- ->addInt64($s4->mulInt64($h1, 26))
- ->addInt64($s3->mulInt64($h2, 26))
- ->addInt64($s2->mulInt64($h3, 26))
- ->addInt64($s1->mulInt64($h4, 26));
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ->addInt64($h0->mulInt64($r0, 27))
+ ->addInt64($s4->mulInt64($h1, 27))
+ ->addInt64($s3->mulInt64($h2, 27))
+ ->addInt64($s2->mulInt64($h3, 27))
+ ->addInt64($s1->mulInt64($h4, 27));
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $d1 = $zero
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ->addInt64($h0->mulInt64($r1, 25))
- ->addInt64($h1->mulInt64($r0, 25))
- ->addInt64($s4->mulInt64($h2, 26))
- ->addInt64($s3->mulInt64($h3, 26))
- ->addInt64($s2->mulInt64($h4, 26));
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ->addInt64($h0->mulInt64($r1, 27))
+ ->addInt64($h1->mulInt64($r0, 27))
+ ->addInt64($s4->mulInt64($h2, 27))
+ ->addInt64($s3->mulInt64($h3, 27))
+ ->addInt64($s2->mulInt64($h4, 27));
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $d2 = $zero
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ->addInt64($h0->mulInt64($r2, 25))
- ->addInt64($h1->mulInt64($r1, 25))
- ->addInt64($h2->mulInt64($r0, 25))
- ->addInt64($s4->mulInt64($h3, 26))
- ->addInt64($s3->mulInt64($h4, 26));
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ->addInt64($h0->mulInt64($r2, 27))
+ ->addInt64($h1->mulInt64($r1, 27))
+ ->addInt64($h2->mulInt64($r0, 27))
+ ->addInt64($s4->mulInt64($h3, 27))
+ ->addInt64($s3->mulInt64($h4, 27));
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $d3 = $zero
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ->addInt64($h0->mulInt64($r3, 25))
- ->addInt64($h1->mulInt64($r2, 25))
- ->addInt64($h2->mulInt64($r1, 25))
- ->addInt64($h3->mulInt64($r0, 25))
- ->addInt64($s4->mulInt64($h4, 26));
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ->addInt64($h0->mulInt64($r3, 27))
+ ->addInt64($h1->mulInt64($r2, 27))
+ ->addInt64($h2->mulInt64($r1, 27))
+ ->addInt64($h3->mulInt64($r0, 27))
+ ->addInt64($s4->mulInt64($h4, 27));
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $d4 = $zero
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ->addInt64($h0->mulInt64($r4, 25))
- ->addInt64($h1->mulInt64($r3, 25))
- ->addInt64($h2->mulInt64($r2, 25))
- ->addInt64($h3->mulInt64($r1, 25))
- ->addInt64($h4->mulInt64($r0, 25));
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ->addInt64($h0->mulInt64($r4, 27))
+ ->addInt64($h1->mulInt64($r3, 27))
+ ->addInt64($h2->mulInt64($r2, 27))
+ ->addInt64($h3->mulInt64($r1, 27))
+ ->addInt64($h4->mulInt64($r0, 27));
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /* (partial) h %= p */
</span><span class="cx" style="display: block; padding: 0 10px"> $c = $d0->shiftRight(26);
</span></span></pre>
</div>
</div>
</body>
</html>