Changeset 49741

Timestamp:

12/03/2020 05:39:03 PM (4 years ago)

Author:

SergeyBiryukov

Message:

Upgrade/Install: Update sodium_compat to v1.14.0.

This includes improved PHP 8 support and more inclusive language.

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

Follow-up to [48121], [49056], [49057].

Props jrf.
Fixes #51925.

Location:

trunk/src/wp-includes/sodium_compat

Files:

• composer.json (modified) (1 diff)
• src/Core/SipHash.php (modified) (5 diffs)
• src/Core/Util.php (modified) (2 diffs)
• src/File.php (modified) (2 diffs)
• src/PHP52/SplFixedArray.php (modified) (2 diffs)

trunk/src/wp-includes/sodium_compat/composer.json

@@ -55 +55 @@
   },
   "require-dev": {
-    "phpunit/phpunit": "^3|^4|^5|^6|^7"
+    "phpunit/phpunit": "^3|^4|^5|^6|^7|^8|^9"
   },
   "suggest": {

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

@@ -15 +15 @@
      * @internal You should not use this directly from another application
      *
-     * @param int[] $v
-     * @return int[]
+     * @param array<array-key, int> $v
+     * @return array<array-key, int>
+     *
      */
     public static function sipRound(array $v)
@@ -27 +28 @@
 
         #  v1=ROTL(v1,13);
-        list($v[2], $v[3]) = self::rotl_64($v[2], $v[3], 13);
+        list($v[2], $v[3]) = self::rotl_64((int) $v[2], (int) $v[3], 13);
 
         #  v1 ^= v0;
-        $v[2] ^= $v[0];
-        $v[3] ^= $v[1];
+        $v[2] = (int) $v[2] ^ (int) $v[0];
+        $v[3] = (int) $v[3] ^ (int) $v[1];
 
         #  v0=ROTL(v0,32);
@@ -38 +39 @@
         # v2 += v3;
         list($v[4], $v[5]) = self::add(
-            array($v[4], $v[5]),
-            array($v[6], $v[7])
+            array((int) $v[4], (int) $v[5]),
+            array((int) $v[6], (int) $v[7])
         );
 
         # v3=ROTL(v3,16);
-        list($v[6], $v[7]) = self::rotl_64($v[6], $v[7], 16);
+        list($v[6], $v[7]) = self::rotl_64((int) $v[6], (int) $v[7], 16);
 
         #  v3 ^= v2;
-        $v[6] ^= $v[4];
-        $v[7] ^= $v[5];
+        $v[6] = (int) $v[6] ^ (int) $v[4];
+        $v[7] = (int) $v[7] ^ (int) $v[5];
 
         # v0 += v3;
@@ -59 +60 @@
 
         # v3 ^= v0;
-        $v[6] ^= $v[0];
-        $v[7] ^= $v[1];
+        $v[6] = (int) $v[6] ^ (int) $v[0];
+        $v[7] = (int) $v[7] ^ (int) $v[1];
 
         # v2 += v1;
@@ -72 +73 @@
 
         #  v1 ^= v2;;
-        $v[2] ^= $v[4];
-        $v[3] ^= $v[5];
+        $v[2] = (int) $v[2] ^ (int) $v[4];
+        $v[3] = (int) $v[3] ^ (int) $v[5];
 
         # v2=ROTL(v2,32)

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

@@ -904 +904 @@
      * @internal You should not use this directly from another application
      *
+     * Note: MB_OVERLOAD_STRING === 2, but we don't reference the constant
+     * (for nuisance-free PHP 8 support)
+     *
      * @return bool
      */
@@ -914 +917 @@
                 && defined('MB_OVERLOAD_STRING')
                 &&
-            ((int) (ini_get('mbstring.func_overload')) & MB_OVERLOAD_STRING);
+            ((int) (ini_get('mbstring.func_overload')) & 2);
+            // MB_OVERLOAD_STRING === 2
         }
         /** @var bool $mbstring */

trunk/src/wp-includes/sodium_compat/src/File.php

@@ -244 +244 @@
             ParagonIE_Sodium_Compat::memzero($ephKeypair);
         } catch (SodiumException $ex) {
+            /** @psalm-suppress PossiblyUndefinedVariable */
             unset($ephKeypair);
         }
@@ -542 +543 @@
             ParagonIE_Sodium_Compat::memzero($key);
         } catch (SodiumException $ex) {
+            /** @psalm-suppress PossiblyUndefinedVariable */
             unset($key);
         }

trunk/src/wp-includes/sodium_compat/src/PHP52/SplFixedArray.php

@@ -103 +103 @@
     public function offsetGet($index)
     {
+        /** @psalm-suppress MixedReturnStatement */
         return $this->internalArray[(int) $index];
     }
@@ -143 +144 @@
     public function current()
     {
+        /** @psalm-suppress MixedReturnStatement */
         return current($this->internalArray);
     }