Upstream
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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 [49741], [51002], [51591], [52988], [54150], [54310].

Props jrf, costdev, paragoninitiativeenterprises, mukesh27.
Fixes #58224.
Built from https://develop.svn.wordpress.org/trunk@55699


git-svn-id: http://core.svn.wordpress.org/trunk@55211 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Sergey Biryukov 2023-04-30 14:08:23 +00:00
parent 9954d0a927
commit a8390f5f7c
5 changed files with 54 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wp-includes/sodium_compat/LICENSE
View File

@ -1,6 +1,6 @@
ISC License ISC License
Copyright (c) 2016-2022, Paragon Initiative Enterprises <security at paragonie dot com> Copyright (c) 2016-2023, Paragon Initiative Enterprises <security at paragonie dot com>
Copyright (c) 2013-2019, Frank Denis <j at pureftpd dot org> Copyright (c) 2013-2019, Frank Denis <j at pureftpd dot org>
Permission to use, copy, modify, and/or distribute this software for any Permission to use, copy, modify, and/or distribute this software for any

2
wp-includes/sodium_compat/lib/php72compat.php
View File

@ -1360,6 +1360,8 @@ if (!is_callable('sodium_memzero')) {
* @return void * @return void
* @throws SodiumException * @throws SodiumException
* @throws TypeError * @throws TypeError
*
* @psalm-suppress ReferenceConstraintViolation
*/ */
function sodium_memzero(&$string) function sodium_memzero(&$string)
{ {

50
wp-includes/sodium_compat/src/Core/Poly1305/State.php
View File

@ -210,43 +210,43 @@ class ParagonIE_Sodium_Core_Poly1305_State extends ParagonIE_Sodium_Core_Util
/* h *= r */ /* h *= r */
$d0 = ( $d0 = (
self::mul($h0, $r0, 25) + self::mul($h0, $r0, 27) +
self::mul($s4, $h1, 26) + self::mul($s4, $h1, 27) +
self::mul($s3, $h2, 26) + self::mul($s3, $h2, 27) +
self::mul($s2, $h3, 26) + self::mul($s2, $h3, 27) +
self::mul($s1, $h4, 26) self::mul($s1, $h4, 27)
); );
$d1 = ( $d1 = (
self::mul($h0, $r1, 25) + self::mul($h0, $r1, 27) +
self::mul($h1, $r0, 25) + self::mul($h1, $r0, 27) +
self::mul($s4, $h2, 26) + self::mul($s4, $h2, 27) +
self::mul($s3, $h3, 26) + self::mul($s3, $h3, 27) +
self::mul($s2, $h4, 26) self::mul($s2, $h4, 27)
); );
$d2 = ( $d2 = (
self::mul($h0, $r2, 25) + self::mul($h0, $r2, 27) +
self::mul($h1, $r1, 25) + self::mul($h1, $r1, 27) +
self::mul($h2, $r0, 25) + self::mul($h2, $r0, 27) +
self::mul($s4, $h3, 26) + self::mul($s4, $h3, 27) +
self::mul($s3, $h4, 26) self::mul($s3, $h4, 27)
); );
$d3 = ( $d3 = (
self::mul($h0, $r3, 25) + self::mul($h0, $r3, 27) +
self::mul($h1, $r2, 25) + self::mul($h1, $r2, 27) +
self::mul($h2, $r1, 25) + self::mul($h2, $r1, 27) +
self::mul($h3, $r0, 25) + self::mul($h3, $r0, 27) +
self::mul($s4, $h4, 26) self::mul($s4, $h4, 27)
); );
$d4 = ( $d4 = (
self::mul($h0, $r4, 25) + self::mul($h0, $r4, 27) +
self::mul($h1, $r3, 25) + self::mul($h1, $r3, 27) +
self::mul($h2, $r2, 25) + self::mul($h2, $r2, 27) +
self::mul($h3, $r1, 25) + self::mul($h3, $r1, 27) +
self::mul($h4, $r0, 25) self::mul($h4, $r0, 27)
); );
/* (partial) h %= p */ /* (partial) h %= p */

50
wp-includes/sodium_compat/src/Core32/Poly1305/State.php
View File

@ -255,39 +255,39 @@ class ParagonIE_Sodium_Core32_Poly1305_State extends ParagonIE_Sodium_Core32_Uti
/* h *= r */ /* h *= r */
$d0 = $zero $d0 = $zero
->addInt64($h0->mulInt64($r0, 25)) ->addInt64($h0->mulInt64($r0, 27))
->addInt64($s4->mulInt64($h1, 26)) ->addInt64($s4->mulInt64($h1, 27))
->addInt64($s3->mulInt64($h2, 26)) ->addInt64($s3->mulInt64($h2, 27))
->addInt64($s2->mulInt64($h3, 26)) ->addInt64($s2->mulInt64($h3, 27))
->addInt64($s1->mulInt64($h4, 26)); ->addInt64($s1->mulInt64($h4, 27));
$d1 = $zero $d1 = $zero
->addInt64($h0->mulInt64($r1, 25)) ->addInt64($h0->mulInt64($r1, 27))
->addInt64($h1->mulInt64($r0, 25)) ->addInt64($h1->mulInt64($r0, 27))
->addInt64($s4->mulInt64($h2, 26)) ->addInt64($s4->mulInt64($h2, 27))
->addInt64($s3->mulInt64($h3, 26)) ->addInt64($s3->mulInt64($h3, 27))
->addInt64($s2->mulInt64($h4, 26)); ->addInt64($s2->mulInt64($h4, 27));
$d2 = $zero $d2 = $zero
->addInt64($h0->mulInt64($r2, 25)) ->addInt64($h0->mulInt64($r2, 27))
->addInt64($h1->mulInt64($r1, 25)) ->addInt64($h1->mulInt64($r1, 27))
->addInt64($h2->mulInt64($r0, 25)) ->addInt64($h2->mulInt64($r0, 27))
->addInt64($s4->mulInt64($h3, 26)) ->addInt64($s4->mulInt64($h3, 27))
->addInt64($s3->mulInt64($h4, 26)); ->addInt64($s3->mulInt64($h4, 27));
$d3 = $zero $d3 = $zero
->addInt64($h0->mulInt64($r3, 25)) ->addInt64($h0->mulInt64($r3, 27))
->addInt64($h1->mulInt64($r2, 25)) ->addInt64($h1->mulInt64($r2, 27))
->addInt64($h2->mulInt64($r1, 25)) ->addInt64($h2->mulInt64($r1, 27))
->addInt64($h3->mulInt64($r0, 25)) ->addInt64($h3->mulInt64($r0, 27))
->addInt64($s4->mulInt64($h4, 26)); ->addInt64($s4->mulInt64($h4, 27));
$d4 = $zero $d4 = $zero
->addInt64($h0->mulInt64($r4, 25)) ->addInt64($h0->mulInt64($r4, 27))
->addInt64($h1->mulInt64($r3, 25)) ->addInt64($h1->mulInt64($r3, 27))
->addInt64($h2->mulInt64($r2, 25)) ->addInt64($h2->mulInt64($r2, 27))
->addInt64($h3->mulInt64($r1, 25)) ->addInt64($h3->mulInt64($r1, 27))
->addInt64($h4->mulInt64($r0, 25)); ->addInt64($h4->mulInt64($r0, 27));
/* (partial) h %= p */ /* (partial) h %= p */
$c = $d0->shiftRight(26); $c = $d0->shiftRight(26);

2
wp-includes/version.php
View File

@ -16,7 +16,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '6.3-alpha-55698'; $wp_version = '6.3-alpha-55699';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.