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

Timestamp:

10/06/2025 03:46:40 PM (6 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/ChaCha20/Ctx.php (modified) (2 diffs)

trunk/src/wp-includes/sodium_compat/src/Core/ChaCha20/Ctx.php

@@ -51 +51 @@
         $this->container[11] = self::load_4(self::substr($key, 28, 4));
 
-        if (empty($counter)) {
-            $this->container[12] = 0;
-            $this->container[13] = 0;
-        } else {
-            $this->container[12] = self::load_4(self::substr($counter, 0, 4));
-            $this->container[13] = self::load_4(self::substr($counter, 4, 4));
-        }
+        $counter = $this->initCounter($counter);
+        $this->container[12] = self::load_4(self::substr($counter, 0, 4));
+        $this->container[13] = self::load_4(self::substr($counter, 4, 4));
         $this->container[14] = self::load_4(self::substr($iv, 0, 4));
         $this->container[15] = self::load_4(self::substr($iv, 4, 4));
@@ -121 +117 @@
             : null;
     }
+
+    /**
+     * Initialize (pad) a counter value.
+     * @throws SodiumException
+     *
+     * @param string $ctr
+     * @return string
+     */
+    public function initCounter(
+        #[SensitiveParameter]
+        $ctr
+    ) {
+        $len = self::strlen($ctr);
+        if ($len === 0) {
+            return str_repeat("\0", 8);
+        }
+        if ($len < 8) {
+            return $ctr . str_repeat("\0", 8 - $len);
+        }
+        if ($len > 8) {
+            throw new SodiumException("counter cannot be more than 8 bytes");
+        }
+        return $ctr;
+    }
 }