Changeset 52988 for trunk/src/wp-includes/sodium_compat/src/Core/BLAKE2b.php

Timestamp:

03/24/2022 03:18:31 PM (3 years ago)

Author:

SergeyBiryukov

Message:

Upgrade/Install: Update sodium_compat to v1.17.1.

The latest version of sodium_compat includes further improvements for PHP 8.1 compatibility.

Release notes:
​https://github.com/paragonie/sodium_compat/releases/tag/v1.17.1

A full list of changes in this update can be found on GitHub:
​https://github.com/paragonie/sodium_compat/compare/v1.17.0...v1.17.1

Follow-up to [49741], [51002], [51591].

Props jrf, paragoninitiativeenterprises.
Fixes #55453.

File:

• trunk/src/wp-includes/sodium_compat/src/Core/BLAKE2b.php (modified) (7 diffs)

trunk/src/wp-includes/sodium_compat/src/Core/BLAKE2b.php

@@ -51 +51 @@
     public static function new64($high, $low)
     {
+        if (PHP_INT_SIZE === 4) {
+            throw new SodiumException("Error, use 32-bit");
+        }
         $i64 = new SplFixedArray(2);
         $i64[0] = $high & 0xffffffff;
@@ -87 +90 @@
     protected static function add64($x, $y)
     {
+        if (PHP_INT_SIZE === 4) {
+            throw new SodiumException("Error, use 32-bit");
+        }
         $l = ($x[1] + $y[1]) & 0xffffffff;
         return self::new64(
@@ -120 +126 @@
     protected static function xor64(SplFixedArray $x, SplFixedArray $y)
     {
+        if (PHP_INT_SIZE === 4) {
+            throw new SodiumException("Error, use 32-bit");
+        }
         if (!is_numeric($x[0])) {
             throw new SodiumException('x[0] is not an integer');
@@ -148 +157 @@
     public static function rotr64($x, $c)
     {
+        if (PHP_INT_SIZE === 4) {
+            throw new SodiumException("Error, use 32-bit");
+        }
         if ($c >= 64) {
             $c %= 64;
@@ -165 +177 @@
         $c = 64 - $c;
 
+        /** @var int $c */
         if ($c < 32) {
-            /** @var int $h0 */
             $h0 = ((int) ($x[0]) << $c) | (
                 (
@@ -174 +186 @@
                 ) >> (32 - $c)
             );
-            /** @var int $l0 */
             $l0 = (int) ($x[1]) << $c;
         } else {
-            /** @var int $h0 */
             $h0 = (int) ($x[1]) << ($c - 32);
         }
@@ -185 +195 @@
 
         if ($c1 < 32) {
-            /** @var int $h1 */
             $h1 = (int) ($x[0]) >> $c1;
-            /** @var int $l1 */
             $l1 = ((int) ($x[1]) >> $c1) | ((int) ($x[0]) & ((1 << $c1) - 1)) << (32 - $c1);
         } else {
-            /** @var int $l1 */
             $l1 = (int) ($x[0]) >> ($c1 - 32);
         }