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

Timestamp:

07/18/2024 12:58:40 PM (21 months ago)

Author:

SergeyBiryukov

Message:

Upgrade/Install: Update sodium_compat to v1.21.1.

The latest version of sodium_compat includes support for AEGIS and preliminary support for PHP 8.4.

Additionally, the PHP 8.2+ SensitiveParameter attribute is now applied where appropriate to functions in the public API. This attribute is used to mark parameters that are sensitive and should be redacted from stack traces.

References:

• ​sodium_compat 1.21.0 release notes
• ​sodium_compat 1.21.1 release notes
• ​Full list of changes in sodium_compat 1.21.1

Follow-up to [49741], [51002], [51591], [52988], [54150], [54310], [55699].

Props jrf, dd32, paragoninitiativeenterprises.
Fixes #61686.

File:

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

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

@@ -10 +10 @@
 abstract class ParagonIE_Sodium_Core_Util
 {
+    const U32_MAX = 0xFFFFFFFF;
+
     /**
      * @param int $integer
@@ -32 +34 @@
             (($negative >> $realSize) & 1)
         );
+    }
+
+    /**
+     * @param string $a
+     * @param string $b
+     * @return string
+     * @throws SodiumException
+     */
+    public static function andStrings($a, $b)
+    {
+        /* Type checks: */
+        if (!is_string($a)) {
+            throw new TypeError('Argument 1 must be a string');
+        }
+        if (!is_string($b)) {
+            throw new TypeError('Argument 2 must be a string');
+        }
+        $len = self::strlen($a);
+        if (self::strlen($b) !== $len) {
+            throw new SodiumException('Both strings must be of equal length to combine with bitwise AND');
+        }
+        return $a & $b;
     }