Changeset 60905 for trunk/src/wp-includes/sodium_compat/src/Core/Util.php

Timestamp:

10/06/2025 03:46:40 PM (7 months ago)

Author:

SergeyBiryukov

Message:

Upgrade/Install: Update sodium_compat to v1.23.0.

The previous version of sodium_compat was overly permissible with sodium_base642bin() when the *_NO_PADDING variants were specified, which was not compatible with ext-sodium. This has been fixed in version 1.22.0.

Version 1.23.0 includes some optimizations by replacing the array in the Curve25519 field element with 10 integer object properties instead. The result is a 7% to 12% speedup for the overall PHPUnit suite.

References:

• ​sodium_compat 1.22.0 release notes
• ​sodium_compat 1.23.0 release notes
• ​Full list of changes in sodium_compat 1.23.0

Follow-up to [55699], [58752], [58753], [60787].

Props paragoninitiativeenterprises, SergeyBiryukov.
Fixes #64079.

File:

• trunk/src/wp-includes/sodium_compat/src/Core/Util.php (modified) (5 diffs)

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

@@ -182 +182 @@
             $left = str_pad($left, $len, "\x00", STR_PAD_RIGHT);
             $right = str_pad($right, $len, "\x00", STR_PAD_RIGHT);
+        } elseif ($leftLen !== $rightLen) {
+            throw new SodiumException("Argument #1 and argument #2 must have the same length");
         }
 
@@ -337 +339 @@
      * @param bool $strictPadding
      * @return string (raw binary)
-     * @throws RangeException
+     *
+     * @throws SodiumException
      * @throws TypeError
      */
@@ -355 +358 @@
         $hex_len = self::strlen($hexString);
         $state = 0;
-        if (($hex_len & 1) !== 0) {
-            if ($strictPadding) {
-                throw new RangeException(
-                    'Expected an even number of hexadecimal characters'
-                );
-            } else {
-                $hexString = '0' . $hexString;
-                ++$hex_len;
-            }
-        }
 
         $chunk = unpack('C*', $hexString);
@@ -391 +384 @@
             $state ^= 1;
         }
+        if ($strictPadding && $state !== 0) {
+            throw new SodiumException(
+                'Expected an even number of hexadecimal characters'
+            );
+        }
         return $bin;
     }
@@ -535 +533 @@
     public static function memcmp($left, $right)
     {
-        if (self::hashEquals($left, $right)) {
-            return 0;
-        }
-        return -1;
+        $e = (int) !self::hashEquals($left, $right);
+        return 0 - $e;
     }