Upgrade `web-token/jwt-library` to `3.4.x`

diff --git a/wcfsetup/install/files/lib/system/api/composer.json b/wcfsetup/install/files/lib/system/api/composer.json
index b5304b6a3c17d397d69920d2d9d208b1688edf02..2a7106b3fe14e4013295dbc6870fa16c0993d9b7 100644 (file)
--- a/wcfsetup/install/files/lib/system/api/composer.json
+++ b/wcfsetup/install/files/lib/system/api/composer.json
@@ -19,7 +19,7 @@
     "laminas/laminas-diactoros": "^3.3.1",
     "laminas/laminas-httphandlerrunner": "^2.10.0",
     "laminas/laminas-progressbar": "^2.13",
-    "minishlink/web-push": "^v9.0.0-rc2",
+    "minishlink/web-push": "^v9.0.1",
     "nikic/fast-route": "2.0.0-beta1",
     "paragonie/constant_time_encoding": "^3.0",
     "pelago/emogrifier": "^7.2.0",
@@ -33,7 +33,7 @@
     "sebastian/diff": "^5.1.1",
     "symfony/polyfill-php82": "^1.30.0",
     "symfony/polyfill-php83": "^1.30",
-    "web-token/jwt-library": "^3.3.50",
+    "web-token/jwt-library": "3.4.x-dev as 3.3.50",
     "willdurand/negotiation": "^3.1"
   },
   "replace": {
@@ -47,11 +47,5 @@
     "web-token/jwt-signature-algorithm-ecdsa": "*",
     "web-token/jwt-util-ecc": "*"
   },
-  "repositories": [
-    {
-      "type": "vcs",
-      "url": "https://github.com/WoltLab/jwt-library.git"
-    }
-  ],
   "type": "project"
 }

diff --git a/wcfsetup/install/files/lib/system/api/composer.lock b/wcfsetup/install/files/lib/system/api/composer.lock
index f30ffc59417dab18dc0e866990453020d1174786..8efd16f28cdcaef289d428fd8691d20c540928b3 100644 (file)
--- a/wcfsetup/install/files/lib/system/api/composer.lock
+++ b/wcfsetup/install/files/lib/system/api/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "70268093034722fc94f786ec6395a6bf",
+    "content-hash": "df8d36acac2bd2ee12183174cb4558ec",
     "packages": [
         {
             "name": "brick/math",
@@ -1105,30 +1105,35 @@
         },
         {
             "name": "paragonie/sodium_compat",
-            "version": "v1.21.1",
+            "version": "v2.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/paragonie/sodium_compat.git",
-                "reference": "bb312875dcdd20680419564fe42ba1d9564b9e37"
+                "reference": "a673d5f310477027cead2e2f2b6db5d8368157cb"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/paragonie/sodium_compat/zipball/bb312875dcdd20680419564fe42ba1d9564b9e37",
-                "reference": "bb312875dcdd20680419564fe42ba1d9564b9e37",
+                "url": "https://api.github.com/repos/paragonie/sodium_compat/zipball/a673d5f310477027cead2e2f2b6db5d8368157cb",
+                "reference": "a673d5f310477027cead2e2f2b6db5d8368157cb",
                 "shasum": ""
             },
             "require": {
-                "paragonie/random_compat": ">=1",
-                "php": "^5.2.4|^5.3|^5.4|^5.5|^5.6|^7|^8"
+                "php": "^8.1",
+                "php-64bit": "*"
             },
             "require-dev": {
-                "phpunit/phpunit": "^3|^4|^5|^6|^7|^8|^9"
+                "phpunit/phpunit": "^7|^8|^9",
+                "vimeo/psalm": "^4|^5"
             },
             "suggest": {
-                "ext-libsodium": "PHP < 7.0: Better performance, password hashing (Argon2i), secure memory management (memzero), and better security.",
-                "ext-sodium": "PHP >= 7.0: Better performance, password hashing (Argon2i), secure memory management (memzero), and better security."
+                "ext-sodium": "Better performance, password hashing (Argon2i), secure memory management (memzero), and better security."
             },
             "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.0.x-dev"
+                }
+            },
             "autoload": {
                 "files": [
                     "autoload.php"
@@ -1185,9 +1190,9 @@
             ],
             "support": {
                 "issues": "https://github.com/paragonie/sodium_compat/issues",
-                "source": "https://github.com/paragonie/sodium_compat/tree/v1.21.1"
+                "source": "https://github.com/paragonie/sodium_compat/tree/v2.1.0"
             },
-            "time": "2024-04-22T22:05:04+00:00"
+            "time": "2024-09-04T12:51:01+00:00"
         },
         {
             "name": "pelago/emogrifier",
@@ -1267,6 +1272,55 @@
             },
             "time": "2023-12-06T02:00:20+00:00"
         },
+        {
+            "name": "psr/cache",
+            "version": "3.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/php-fig/cache.git",
+                "reference": "aa5030cfa5405eccfdcb1083ce040c2cb8d253bf"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/php-fig/cache/zipball/aa5030cfa5405eccfdcb1083ce040c2cb8d253bf",
+                "reference": "aa5030cfa5405eccfdcb1083ce040c2cb8d253bf",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=8.0.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Psr\\Cache\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "PHP-FIG",
+                    "homepage": "https://www.php-fig.org/"
+                }
+            ],
+            "description": "Common interface for caching libraries",
+            "keywords": [
+                "cache",
+                "psr",
+                "psr-6"
+            ],
+            "support": {
+                "source": "https://github.com/php-fig/cache/tree/3.0.0"
+            },
+            "time": "2021-02-03T23:26:27+00:00"
+        },
         {
             "name": "psr/clock",
             "version": "1.0.0",
@@ -2457,25 +2511,26 @@
         },
         {
             "name": "web-token/jwt-library",
-            "version": "3.3.50",
+            "version": "3.4.x-dev",
             "source": {
                 "type": "git",
-                "url": "https://github.com/WoltLab/jwt-library.git",
-                "reference": "18b89d806835d351ebebab3eeb8103a45cfd10b5"
+                "url": "https://github.com/web-token/jwt-library.git",
+                "reference": "1a25c8ced3e2b3c31d32dcfad215cbd8cb812f28"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/WoltLab/jwt-library/zipball/18b89d806835d351ebebab3eeb8103a45cfd10b5",
-                "reference": "18b89d806835d351ebebab3eeb8103a45cfd10b5",
+                "url": "https://api.github.com/repos/web-token/jwt-library/zipball/1a25c8ced3e2b3c31d32dcfad215cbd8cb812f28",
+                "reference": "1a25c8ced3e2b3c31d32dcfad215cbd8cb812f28",
                 "shasum": ""
             },
             "require": {
                 "brick/math": "^0.9|^0.10|^0.11|^0.12",
                 "ext-json": "*",
                 "ext-mbstring": "*",
-                "paragonie/constant_time_encoding": "^3.0",
-                "paragonie/sodium_compat": "^1.20",
+                "paragonie/constant_time_encoding": "^2.6|^3.0",
+                "paragonie/sodium_compat": "^1.20|^2.0",
                 "php": ">=8.1",
+                "psr/cache": "^3.0",
                 "psr/clock": "^1.0",
                 "psr/http-client": "^1.0",
                 "psr/http-factory": "^1.0",
@@ -2502,6 +2557,7 @@
                     "Jose\\Component\\": ""
                 }
             },
+            "notification-url": "https://packagist.org/downloads/",
             "license": [
                 "MIT"
             ],
@@ -2518,14 +2574,11 @@
             "description": "JWT library",
             "homepage": "https://github.com/web-token",
             "keywords": [
-                "Bundle",
-                "JWA",
+                "JOSE",
                 "JWE",
                 "JWK",
                 "JWKSet",
                 "JWS",
-                "JWT",
-                "Jose",
                 "Jot",
                 "RFC7515",
                 "RFC7516",
@@ -2533,22 +2586,26 @@
                 "RFC7518",
                 "RFC7519",
                 "RFC7520",
-                "Symfony"
+                "bundle",
+                "jwa",
+                "jwt",
+                "symfony"
             ],
             "support": {
-                "source": "https://github.com/WoltLab/jwt-library/tree/3.3.50"
+                "issues": "https://github.com/web-token/jwt-library/issues",
+                "source": "https://github.com/web-token/jwt-library/tree/3.4.x"
             },
             "funding": [
                 {
-                    "type": "github",
-                    "url": "https://github.com/Spomky"
+                    "url": "https://github.com/Spomky",
+                    "type": "github"
                 },
                 {
-                    "type": "patreon",
-                    "url": "https://www.patreon.com/FlorentMorselli"
+                    "url": "https://www.patreon.com/FlorentMorselli",
+                    "type": "patreon"
                 }
             ],
-            "time": "2024-06-25T07:58:10+00:00"
+            "time": "2024-07-02T16:35:11+00:00"
         },
         {
             "name": "webmozart/assert",
@@ -2666,16 +2723,23 @@
         }
     ],
     "packages-dev": [],
-    "aliases": [],
+    "aliases": [
+        {
+            "package": "web-token/jwt-library",
+            "version": "3.4.9999999.9999999-dev",
+            "alias": "3.3.50",
+            "alias_normalized": "3.3.50.0"
+        }
+    ],
     "minimum-stability": "stable",
     "stability-flags": {
-        "minishlink/web-push": 5,
-        "nikic/fast-route": 10
+        "nikic/fast-route": 10,
+        "web-token/jwt-library": 20
     },
     "prefer-stable": false,
     "prefer-lowest": false,
-    "platform": [],
-    "platform-dev": [],
+    "platform": {},
+    "platform-dev": {},
     "platform-overrides": {
         "php": "8.1.2",
         "ext-gd": "0"

diff --git a/wcfsetup/install/files/lib/system/api/composer/autoload_classmap.php b/wcfsetup/install/files/lib/system/api/composer/autoload_classmap.php
index 3b1e9909766244bfe14b34b4acaa31f7d057f3da..42240f9276a8fa0bf90cebacc7e5ab8533404155 100644 (file)
--- a/wcfsetup/install/files/lib/system/api/composer/autoload_classmap.php
+++ b/wcfsetup/install/files/lib/system/api/composer/autoload_classmap.php
@@ -795,6 +795,7 @@ return array(
     'Jose\\Component\\Core\\JWK' => $vendorDir . '/web-token/jwt-library/Core/JWK.php',
     'Jose\\Component\\Core\\JWKSet' => $vendorDir . '/web-token/jwt-library/Core/JWKSet.php',
     'Jose\\Component\\Core\\JWT' => $vendorDir . '/web-token/jwt-library/Core/JWT.php',
+    'Jose\\Component\\Core\\Util\\Base64UrlSafe' => $vendorDir . '/web-token/jwt-library/Core/Util/Base64UrlSafe.php',
     'Jose\\Component\\Core\\Util\\BigInteger' => $vendorDir . '/web-token/jwt-library/Core/Util/BigInteger.php',
     'Jose\\Component\\Core\\Util\\ECKey' => $vendorDir . '/web-token/jwt-library/Core/Util/ECKey.php',
     'Jose\\Component\\Core\\Util\\ECSignature' => $vendorDir . '/web-token/jwt-library/Core/Util/ECSignature.php',
@@ -1121,6 +1122,10 @@ return array(
     'Pelago\\Emogrifier\\HtmlProcessor\\HtmlPruner' => $vendorDir . '/pelago/emogrifier/src/HtmlProcessor/HtmlPruner.php',
     'Pelago\\Emogrifier\\Utilities\\ArrayIntersector' => $vendorDir . '/pelago/emogrifier/src/Utilities/ArrayIntersector.php',
     'Pelago\\Emogrifier\\Utilities\\CssConcatenator' => $vendorDir . '/pelago/emogrifier/src/Utilities/CssConcatenator.php',
+    'Psr\\Cache\\CacheException' => $vendorDir . '/psr/cache/src/CacheException.php',
+    'Psr\\Cache\\CacheItemInterface' => $vendorDir . '/psr/cache/src/CacheItemInterface.php',
+    'Psr\\Cache\\CacheItemPoolInterface' => $vendorDir . '/psr/cache/src/CacheItemPoolInterface.php',
+    'Psr\\Cache\\InvalidArgumentException' => $vendorDir . '/psr/cache/src/InvalidArgumentException.php',
     'Psr\\Clock\\ClockInterface' => $vendorDir . '/psr/clock/src/ClockInterface.php',
     'Psr\\EventDispatcher\\EventDispatcherInterface' => $vendorDir . '/psr/event-dispatcher/src/EventDispatcherInterface.php',
     'Psr\\EventDispatcher\\ListenerProviderInterface' => $vendorDir . '/psr/event-dispatcher/src/ListenerProviderInterface.php',

diff --git a/wcfsetup/install/files/lib/system/api/composer/autoload_psr4.php b/wcfsetup/install/files/lib/system/api/composer/autoload_psr4.php
index 375c5bcbb80247a7b789b9970e9a0e903bf00568..8fd7f94482d23b7976c6c55284e69ca6a324b1ea 100644 (file)
--- a/wcfsetup/install/files/lib/system/api/composer/autoload_psr4.php
+++ b/wcfsetup/install/files/lib/system/api/composer/autoload_psr4.php
@@ -20,6 +20,7 @@ return array(
     'Psr\\Http\\Client\\' => array($vendorDir . '/psr/http-client/src'),
     'Psr\\EventDispatcher\\' => array($vendorDir . '/psr/event-dispatcher/src'),
     'Psr\\Clock\\' => array($vendorDir . '/psr/clock/src'),
+    'Psr\\Cache\\' => array($vendorDir . '/psr/cache/src'),
     'Pelago\\Emogrifier\\' => array($vendorDir . '/pelago/emogrifier/src'),
     'ParagonIE\\ConstantTime\\' => array($vendorDir . '/paragonie/constant_time_encoding/src'),
     'Negotiation\\' => array($vendorDir . '/willdurand/negotiation/src/Negotiation'),

diff --git a/wcfsetup/install/files/lib/system/api/composer/autoload_static.php b/wcfsetup/install/files/lib/system/api/composer/autoload_static.php
index 0b29f7992232a07a6b54632419ce4022729fd925..509ae9cd45c8ed02bbe8bc66e4e82ad65a482529 100644 (file)
--- a/wcfsetup/install/files/lib/system/api/composer/autoload_static.php
+++ b/wcfsetup/install/files/lib/system/api/composer/autoload_static.php
@@ -47,6 +47,7 @@ class ComposerStaticInita1f5f7c74275d47a45049a2936db1d0d
             'Psr\\Http\\Client\\' => 16,
             'Psr\\EventDispatcher\\' => 20,
             'Psr\\Clock\\' => 10,
+            'Psr\\Cache\\' => 10,
             'Pelago\\Emogrifier\\' => 18,
             'ParagonIE\\ConstantTime\\' => 23,
         ),
@@ -150,6 +151,10 @@ class ComposerStaticInita1f5f7c74275d47a45049a2936db1d0d
         array (
             0 => __DIR__ . '/..' . '/psr/clock/src',
         ),
+        'Psr\\Cache\\' => 
+        array (
+            0 => __DIR__ . '/..' . '/psr/cache/src',
+        ),
         'Pelago\\Emogrifier\\' => 
         array (
             0 => __DIR__ . '/..' . '/pelago/emogrifier/src',
@@ -1027,6 +1032,7 @@ class ComposerStaticInita1f5f7c74275d47a45049a2936db1d0d
         'Jose\\Component\\Core\\JWK' => __DIR__ . '/..' . '/web-token/jwt-library/Core/JWK.php',
         'Jose\\Component\\Core\\JWKSet' => __DIR__ . '/..' . '/web-token/jwt-library/Core/JWKSet.php',
         'Jose\\Component\\Core\\JWT' => __DIR__ . '/..' . '/web-token/jwt-library/Core/JWT.php',
+        'Jose\\Component\\Core\\Util\\Base64UrlSafe' => __DIR__ . '/..' . '/web-token/jwt-library/Core/Util/Base64UrlSafe.php',
         'Jose\\Component\\Core\\Util\\BigInteger' => __DIR__ . '/..' . '/web-token/jwt-library/Core/Util/BigInteger.php',
         'Jose\\Component\\Core\\Util\\ECKey' => __DIR__ . '/..' . '/web-token/jwt-library/Core/Util/ECKey.php',
         'Jose\\Component\\Core\\Util\\ECSignature' => __DIR__ . '/..' . '/web-token/jwt-library/Core/Util/ECSignature.php',
@@ -1353,6 +1359,10 @@ class ComposerStaticInita1f5f7c74275d47a45049a2936db1d0d
         'Pelago\\Emogrifier\\HtmlProcessor\\HtmlPruner' => __DIR__ . '/..' . '/pelago/emogrifier/src/HtmlProcessor/HtmlPruner.php',
         'Pelago\\Emogrifier\\Utilities\\ArrayIntersector' => __DIR__ . '/..' . '/pelago/emogrifier/src/Utilities/ArrayIntersector.php',
         'Pelago\\Emogrifier\\Utilities\\CssConcatenator' => __DIR__ . '/..' . '/pelago/emogrifier/src/Utilities/CssConcatenator.php',
+        'Psr\\Cache\\CacheException' => __DIR__ . '/..' . '/psr/cache/src/CacheException.php',
+        'Psr\\Cache\\CacheItemInterface' => __DIR__ . '/..' . '/psr/cache/src/CacheItemInterface.php',
+        'Psr\\Cache\\CacheItemPoolInterface' => __DIR__ . '/..' . '/psr/cache/src/CacheItemPoolInterface.php',
+        'Psr\\Cache\\InvalidArgumentException' => __DIR__ . '/..' . '/psr/cache/src/InvalidArgumentException.php',
         'Psr\\Clock\\ClockInterface' => __DIR__ . '/..' . '/psr/clock/src/ClockInterface.php',
         'Psr\\EventDispatcher\\EventDispatcherInterface' => __DIR__ . '/..' . '/psr/event-dispatcher/src/EventDispatcherInterface.php',
         'Psr\\EventDispatcher\\ListenerProviderInterface' => __DIR__ . '/..' . '/psr/event-dispatcher/src/ListenerProviderInterface.php',

diff --git a/wcfsetup/install/files/lib/system/api/composer/installed.json b/wcfsetup/install/files/lib/system/api/composer/installed.json
index 351d1eb825bbc98a9ca03b0456fc17c32bb60fcf..fac9390a2fd6b9077f444e203d851d359cedff7a 100644 (file)
--- a/wcfsetup/install/files/lib/system/api/composer/installed.json
+++ b/wcfsetup/install/files/lib/system/api/composer/installed.json
@@ -1144,32 +1144,37 @@
         },
         {
             "name": "paragonie/sodium_compat",
-            "version": "v1.21.1",
-            "version_normalized": "1.21.1.0",
+            "version": "v2.1.0",
+            "version_normalized": "2.1.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/paragonie/sodium_compat.git",
-                "reference": "bb312875dcdd20680419564fe42ba1d9564b9e37"
+                "reference": "a673d5f310477027cead2e2f2b6db5d8368157cb"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/paragonie/sodium_compat/zipball/bb312875dcdd20680419564fe42ba1d9564b9e37",
-                "reference": "bb312875dcdd20680419564fe42ba1d9564b9e37",
+                "url": "https://api.github.com/repos/paragonie/sodium_compat/zipball/a673d5f310477027cead2e2f2b6db5d8368157cb",
+                "reference": "a673d5f310477027cead2e2f2b6db5d8368157cb",
                 "shasum": ""
             },
             "require": {
-                "paragonie/random_compat": ">=1",
-                "php": "^5.2.4|^5.3|^5.4|^5.5|^5.6|^7|^8"
+                "php": "^8.1",
+                "php-64bit": "*"
             },
             "require-dev": {
-                "phpunit/phpunit": "^3|^4|^5|^6|^7|^8|^9"
+                "phpunit/phpunit": "^7|^8|^9",
+                "vimeo/psalm": "^4|^5"
             },
             "suggest": {
-                "ext-libsodium": "PHP < 7.0: Better performance, password hashing (Argon2i), secure memory management (memzero), and better security.",
-                "ext-sodium": "PHP >= 7.0: Better performance, password hashing (Argon2i), secure memory management (memzero), and better security."
+                "ext-sodium": "Better performance, password hashing (Argon2i), secure memory management (memzero), and better security."
             },
-            "time": "2024-04-22T22:05:04+00:00",
+            "time": "2024-09-04T12:51:01+00:00",
             "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.0.x-dev"
+                }
+            },
             "installation-source": "dist",
             "autoload": {
                 "files": [
@@ -1227,7 +1232,7 @@
             ],
             "support": {
                 "issues": "https://github.com/paragonie/sodium_compat/issues",
-                "source": "https://github.com/paragonie/sodium_compat/tree/v1.21.1"
+                "source": "https://github.com/paragonie/sodium_compat/tree/v2.1.0"
             },
             "install-path": "../paragonie/sodium_compat"
         },
@@ -1312,6 +1317,58 @@
             },
             "install-path": "../pelago/emogrifier"
         },
+        {
+            "name": "psr/cache",
+            "version": "3.0.0",
+            "version_normalized": "3.0.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/php-fig/cache.git",
+                "reference": "aa5030cfa5405eccfdcb1083ce040c2cb8d253bf"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/php-fig/cache/zipball/aa5030cfa5405eccfdcb1083ce040c2cb8d253bf",
+                "reference": "aa5030cfa5405eccfdcb1083ce040c2cb8d253bf",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=8.0.0"
+            },
+            "time": "2021-02-03T23:26:27+00:00",
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "installation-source": "dist",
+            "autoload": {
+                "psr-4": {
+                    "Psr\\Cache\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "PHP-FIG",
+                    "homepage": "https://www.php-fig.org/"
+                }
+            ],
+            "description": "Common interface for caching libraries",
+            "keywords": [
+                "cache",
+                "psr",
+                "psr-6"
+            ],
+            "support": {
+                "source": "https://github.com/php-fig/cache/tree/3.0.0"
+            },
+            "install-path": "../psr/cache"
+        },
         {
             "name": "psr/clock",
             "version": "1.0.0",
@@ -2559,26 +2616,27 @@
         },
         {
             "name": "web-token/jwt-library",
-            "version": "3.3.50",
-            "version_normalized": "3.3.50.0",
+            "version": "3.4.x-dev",
+            "version_normalized": "3.4.9999999.9999999-dev",
             "source": {
                 "type": "git",
-                "url": "https://github.com/WoltLab/jwt-library.git",
-                "reference": "18b89d806835d351ebebab3eeb8103a45cfd10b5"
+                "url": "https://github.com/web-token/jwt-library.git",
+                "reference": "1a25c8ced3e2b3c31d32dcfad215cbd8cb812f28"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/WoltLab/jwt-library/zipball/18b89d806835d351ebebab3eeb8103a45cfd10b5",
-                "reference": "18b89d806835d351ebebab3eeb8103a45cfd10b5",
+                "url": "https://api.github.com/repos/web-token/jwt-library/zipball/1a25c8ced3e2b3c31d32dcfad215cbd8cb812f28",
+                "reference": "1a25c8ced3e2b3c31d32dcfad215cbd8cb812f28",
                 "shasum": ""
             },
             "require": {
                 "brick/math": "^0.9|^0.10|^0.11|^0.12",
                 "ext-json": "*",
                 "ext-mbstring": "*",
-                "paragonie/constant_time_encoding": "^3.0",
-                "paragonie/sodium_compat": "^1.20",
+                "paragonie/constant_time_encoding": "^2.6|^3.0",
+                "paragonie/sodium_compat": "^1.20|^2.0",
                 "php": ">=8.1",
+                "psr/cache": "^3.0",
                 "psr/clock": "^1.0",
                 "psr/http-client": "^1.0",
                 "psr/http-factory": "^1.0",
@@ -2599,14 +2657,15 @@
                 "spomky-labs/aes-key-wrap": "For all Key Wrapping algorithms (A128KW, A192KW, A256KW, A128GCMKW, A192GCMKW, A256GCMKW, PBES2-HS256+A128KW, PBES2-HS384+A192KW, PBES2-HS512+A256KW...)",
                 "symfony/http-client": "To enable JKU/X5U support."
             },
-            "time": "2024-06-25T07:58:10+00:00",
+            "time": "2024-07-02T16:35:11+00:00",
             "type": "library",
-            "installation-source": "source",
+            "installation-source": "dist",
             "autoload": {
                 "psr-4": {
                     "Jose\\Component\\": ""
                 }
             },
+            "notification-url": "https://packagist.org/downloads/",
             "license": [
                 "MIT"
             ],
@@ -2623,14 +2682,11 @@
             "description": "JWT library",
             "homepage": "https://github.com/web-token",
             "keywords": [
-                "Bundle",
-                "JWA",
+                "JOSE",
                 "JWE",
                 "JWK",
                 "JWKSet",
                 "JWS",
-                "JWT",
-                "Jose",
                 "Jot",
                 "RFC7515",
                 "RFC7516",
@@ -2638,19 +2694,23 @@
                 "RFC7518",
                 "RFC7519",
                 "RFC7520",
-                "Symfony"
+                "bundle",
+                "jwa",
+                "jwt",
+                "symfony"
             ],
             "support": {
-                "source": "https://github.com/WoltLab/jwt-library/tree/3.3.50"
+                "issues": "https://github.com/web-token/jwt-library/issues",
+                "source": "https://github.com/web-token/jwt-library/tree/3.4.x"
             },
             "funding": [
                 {
-                    "type": "github",
-                    "url": "https://github.com/Spomky"
+                    "url": "https://github.com/Spomky",
+                    "type": "github"
                 },
                 {
-                    "type": "patreon",
-                    "url": "https://www.patreon.com/FlorentMorselli"
+                    "url": "https://www.patreon.com/FlorentMorselli",
+                    "type": "patreon"
                 }
             ],
             "install-path": "../web-token/jwt-library"
@@ -2776,6 +2836,6 @@
             "install-path": "../willdurand/negotiation"
         }
     ],
-    "dev": false,
+    "dev": true,
     "dev-package-names": []
 }

diff --git a/wcfsetup/install/files/lib/system/api/composer/installed.php b/wcfsetup/install/files/lib/system/api/composer/installed.php
index 0e4c28ec32a185a835027449e93f9692bccac303..1ef045f7f02d2a402b952d3ba54189ab066405fe 100644 (file)
--- a/wcfsetup/install/files/lib/system/api/composer/installed.php
+++ b/wcfsetup/install/files/lib/system/api/composer/installed.php
@@ -1,19 +1,19 @@
 <?php return array(
     'root' => array(
         'name' => '__root__',
-        'pretty_version' => 'dev-master',
-        'version' => 'dev-master',
-        'reference' => '37708311277ea8a294ac6ee74bfe8f055446016b',
+        'pretty_version' => '6.1.x-dev',
+        'version' => '6.1.9999999.9999999-dev',
+        'reference' => 'a3e52ecf7029e45ad8f926f9c62c92d691d4dd74',
         'type' => 'project',
         'install_path' => __DIR__ . '/../',
         'aliases' => array(),
-        'dev' => false,
+        'dev' => true,
     ),
     'versions' => array(
         '__root__' => array(
-            'pretty_version' => 'dev-master',
-            'version' => 'dev-master',
-            'reference' => '37708311277ea8a294ac6ee74bfe8f055446016b',
+            'pretty_version' => '6.1.x-dev',
+            'version' => '6.1.9999999.9999999-dev',
+            'reference' => 'a3e52ecf7029e45ad8f926f9c62c92d691d4dd74',
             'type' => 'project',
             'install_path' => __DIR__ . '/../',
             'aliases' => array(),
@@ -167,9 +167,9 @@
             ),
         ),
         'paragonie/sodium_compat' => array(
-            'pretty_version' => 'v1.21.1',
-            'version' => '1.21.1.0',
-            'reference' => 'bb312875dcdd20680419564fe42ba1d9564b9e37',
+            'pretty_version' => 'v2.1.0',
+            'version' => '2.1.0.0',
+            'reference' => 'a673d5f310477027cead2e2f2b6db5d8368157cb',
             'type' => 'library',
             'install_path' => __DIR__ . '/../paragonie/sodium_compat',
             'aliases' => array(),
@@ -184,6 +184,15 @@
             'aliases' => array(),
             'dev_requirement' => false,
         ),
+        'psr/cache' => array(
+            'pretty_version' => '3.0.0',
+            'version' => '3.0.0.0',
+            'reference' => 'aa5030cfa5405eccfdcb1083ce040c2cb8d253bf',
+            'type' => 'library',
+            'install_path' => __DIR__ . '/../psr/cache',
+            'aliases' => array(),
+            'dev_requirement' => false,
+        ),
         'psr/clock' => array(
             'pretty_version' => '1.0.0',
             'version' => '1.0.0.0',
@@ -406,12 +415,14 @@
             ),
         ),
         'web-token/jwt-library' => array(
-            'pretty_version' => '3.3.50',
-            'version' => '3.3.50.0',
-            'reference' => '18b89d806835d351ebebab3eeb8103a45cfd10b5',
+            'pretty_version' => '3.4.x-dev',
+            'version' => '3.4.9999999.9999999-dev',
+            'reference' => '1a25c8ced3e2b3c31d32dcfad215cbd8cb812f28',
             'type' => 'library',
             'install_path' => __DIR__ . '/../web-token/jwt-library',
-            'aliases' => array(),
+            'aliases' => array(
+                0 => '3.3.50',
+            ),
             'dev_requirement' => false,
         ),
         'web-token/jwt-signature' => array(

diff --git a/wcfsetup/install/files/lib/system/api/composer/platform_check.php b/wcfsetup/install/files/lib/system/api/composer/platform_check.php
index 4c3a5d68f144c5aff4a1f9e2fcd2d4bc3be133b5..f71b2f899c996ae45a62e851bdb5205a90b4698c 100644 (file)
--- a/wcfsetup/install/files/lib/system/api/composer/platform_check.php
+++ b/wcfsetup/install/files/lib/system/api/composer/platform_check.php
@@ -8,6 +8,10 @@ if (!(PHP_VERSION_ID >= 80100)) {
     $issues[] = 'Your Composer dependencies require a PHP version ">= 8.1.0". You are running ' . PHP_VERSION . '.';
 }
 
+if (PHP_INT_SIZE !== 8) {
+    $issues[] = 'Your Composer dependencies require a 64-bit build of PHP.';
+}
+
 if ($issues) {
     if (!headers_sent()) {
         header('HTTP/1.1 500 Internal Server Error');

diff --git a/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/LICENSE b/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/LICENSE
index af760a7b73160e53bce159541ca39e329ad30481..5729115bff0e9a5c03750f39f6c50b7a90c508a9 100644 (file)
--- a/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/LICENSE
+++ b/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/LICENSE
@@ -1,6 +1,6 @@
 ISC License
 
-Copyright (c) 2016-2023, Paragon Initiative Enterprises <security at paragonie dot com>
+Copyright (c) 2016-2024, Paragon Initiative Enterprises <security at paragonie dot com>
 Copyright (c) 2013-2019, Frank Denis <j at pureftpd dot org>
 
 Permission to use, copy, modify, and/or distribute this software for any

diff --git a/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/README.md b/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/README.md
index 36cc3c2860351a75fca2469ddd5e6d0620027bc5..99461fb5436794f6d0af55fd007c8c499b58a6a8 100644 (file)
--- a/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/README.md
+++ b/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/README.md
@@ -2,7 +2,6 @@
 
 [![Build Status](https://github.com/paragonie/sodium_compat/actions/workflows/ci.yml/badge.svg)](https://github.com/paragonie/sodium_compat/actions)
 [![Psalm Status](https://github.com/paragonie/sodium_compat/actions/workflows/psalm.yml/badge.svg)](https://github.com/paragonie/sodium_compat/actions)
-[![Windows Build Status](https://ci.appveyor.com/api/projects/status/itcx1vgmfqiawgbe?svg=true)](https://ci.appveyor.com/project/paragonie-scott/sodium-compat)
 [![Latest Stable Version](https://poser.pugx.org/paragonie/sodium_compat/v/stable)](https://packagist.org/packages/paragonie/sodium_compat)
 [![Latest Unstable Version](https://poser.pugx.org/paragonie/sodium_compat/v/unstable)](https://packagist.org/packages/paragonie/sodium_compat)
 [![License](https://poser.pugx.org/paragonie/sodium_compat/license)](https://packagist.org/packages/paragonie/sodium_compat)
@@ -17,8 +16,8 @@ and transparently use the PHP extension instead of our implementation.
 ## Major Versions and Branches
 
 sodium_compat v1.21.0 was the last v1.x release from the master branch. From now
-on, all future releases that support PHP 5.2 - 5.6 and 32-bit integers will be
-[in the `v1.x` branch](v1.x).
+on, all future releases that support PHP 5.2 - 8.0 and 32-bit integers will be
+[in the `v1.x` branch](https://github.com/paragonie/sodium_compat/tree/v1.x).
 
 Newer versions of sodium_compat (i.e., v2.0.0) will continue to live in the master
 branch, unless a new major version is needed. The goal of this work is to improve
@@ -32,7 +31,7 @@ for the latest in version information.
 | sodium_compat version | PHP versions supported | 32-bit support? | Branch                                                        |
 |-----------------------|------------------------|-----------------|---------------------------------------------------------------|
 | `v1.x.y`              | 5.2.4 - LATEST         | YES             | [v1.x](https://github.com/paragonie/sodium_compat/tree/v1.x)  |
-| `v2.x.y`              | 7.2 - LATEST           | NO              | **master**                                                    |
+| `v2.x.y`              | 8.1 - LATEST           | NO              | **master**                                                    |
 
 If you need 32-bit PHP support (`PHP_INT_SIZE == 4`), continue using sodium_compat v1.x.
 If you want improved performance and smaller dependencies, use v2.x.
@@ -161,32 +160,6 @@ if (sodium_crypto_sign_verify_detached($signature, $message, $alice_pk)) {
 }
 ```
 
-## Polyfill For the Old PECL Extension API
-
-If you're using PHP 5.3.0 or newer and do not have the PECL extension installed,
-you can just use the [standard ext/sodium API features as-is](https://paragonie.com/book/pecl-libsodium)
-and the polyfill will work its magic.
-
-```php
-<?php
-require_once "/path/to/sodium_compat/autoload.php";
-
-$alice_kp = \Sodium\crypto_sign_keypair();
-$alice_sk = \Sodium\crypto_sign_secretkey($alice_kp);
-$alice_pk = \Sodium\crypto_sign_publickey($alice_kp);
-
-$message = 'This is a test message.';
-$signature = \Sodium\crypto_sign_detached($message, $alice_sk);
-if (\Sodium\crypto_sign_verify_detached($signature, $message, $alice_pk)) {
-    echo 'OK', PHP_EOL;
-} else {
-    throw new Exception('Invalid signature');
-}
-```
-
-The polyfill does not expose this API on PHP < 5.3, or if you have the PHP
-extension installed already.
-
 ## General-Use Polyfill
 
 If your users are on PHP < 5.3, or you want to write code that will work
@@ -212,7 +185,7 @@ if (ParagonIE_Sodium_Compat::crypto_sign_verify_detached($signature, $message, $
 }
 ```
 
-Generally: If you replace `\Sodium\ ` with `ParagonIE_Sodium_Compat::`, any
+Generally: If you replace `sodium_` with `ParagonIE_Sodium_Compat::`, any
 code already written for the libsodium PHP extension should work with our
 polyfill without additional code changes.
 
@@ -254,26 +227,6 @@ if (ParagonIE_Sodium_Compat::polyfill_is_fast()) {
 }
 ```
 
-### Help, my PHP only has 32-Bit Integers! It's super slow!
-
-If the `PHP_INT_SIZE` constant equals `4` instead of `8` (PHP 5 on Windows,
-Linux on i386, etc.), you will run into **significant performance issues**.
-
-In particular: public-key cryptography (encryption and signatures)
-is affected. There is nothing we can do about that.
-
-The root cause of these performance issues has to do with implementing cryptography
-algorithms in constant-time using 16-bit limbs (to avoid overflow) in pure PHP.
-
-To mitigate these performance issues, simply install PHP 7.2 or newer and enable
-the `sodium` extension.
-
-Affected users are encouraged to install the sodium extension (or libsodium from
-older version of PHP).
-
-Windows users on PHP 5 may be able to simply upgrade to PHP 7 and the slowdown
-will be greatly reduced.
-
 ## Documentation
 
 First, you'll want to read the [Libsodium Quick Reference](https://paragonie.com/blog/2017/06/libsodium-quick-reference-quick-comparison-similar-functions-and-which-one-use).

diff --git a/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/autoload-php7.php b/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/autoload-php7.php
deleted file mode 100644 (file)
index 4824860..0000000
--- a/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/autoload-php7.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-/*
- This file should only ever be loaded on PHP 7+
- */
-if (PHP_VERSION_ID < 70000) {
-    return;
-}
-
-spl_autoload_register(function ($class) {
-    $namespace = 'ParagonIE_Sodium_';
-    // Does the class use the namespace prefix?
-    $len = strlen($namespace);
-    if (strncmp($namespace, $class, $len) !== 0) {
-        // no, move to the next registered autoloader
-        return false;
-    }
-
-    // Get the relative class name
-    $relative_class = substr($class, $len);
-
-    // Replace the namespace prefix with the base directory, replace namespace
-    // separators with directory separators in the relative class name, append
-    // with .php
-    $file = dirname(__FILE__) . '/src/' . str_replace('_', '/', $relative_class) . '.php';
-    // if the file exists, require it
-    if (file_exists($file)) {
-        require_once $file;
-        return true;
-    }
-    return false;
-});

diff --git a/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/autoload.php b/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/autoload.php
index bfd9e4a034e29d86a5861250f7ec58de1e4ef20e..b85ef86800d4dde1ed6632587080ee1ff397e7ea 100644 (file)
--- a/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/autoload.php
+++ b/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/autoload.php
@@ -1,45 +1,28 @@
 <?php
 
-if (PHP_VERSION_ID < 70000) {
-    if (!is_callable('sodiumCompatAutoloader')) {
-        /**
-         * Sodium_Compat autoloader.
-         *
-         * @param string $class Class name to be autoloaded.
-         *
-         * @return bool         Stop autoloading?
-         */
-        function sodiumCompatAutoloader($class)
-        {
-            $namespace = 'ParagonIE_Sodium_';
-            // Does the class use the namespace prefix?
-            $len = strlen($namespace);
-            if (strncmp($namespace, $class, $len) !== 0) {
-                // no, move to the next registered autoloader
-                return false;
-            }
-
-            // Get the relative class name
-            $relative_class = substr($class, $len);
+spl_autoload_register(function ($class) {
+    $namespace = 'ParagonIE_Sodium_';
+    // Does the class use the namespace prefix?
+    $len = strlen($namespace);
+    if (strncmp($namespace, $class, $len) !== 0) {
+        // no, move to the next registered autoloader
+        return false;
+    }
 
-            // Replace the namespace prefix with the base directory, replace namespace
-            // separators with directory separators in the relative class name, append
-            // with .php
-            $file = dirname(__FILE__) . '/src/' . str_replace('_', '/', $relative_class) . '.php';
-            // if the file exists, require it
-            if (file_exists($file)) {
-                require_once $file;
-                return true;
-            }
-            return false;
-        }
+    // Get the relative class name
+    $relative_class = substr($class, $len);
 
-        // Now that we have an autoloader, let's register it!
-        spl_autoload_register('sodiumCompatAutoloader');
+    // Replace the namespace prefix with the base directory, replace namespace
+    // separators with directory separators in the relative class name, append
+    // with .php
+    $file = dirname(__FILE__) . '/src/' . str_replace('_', '/', $relative_class) . '.php';
+    // if the file exists, require it
+    if (file_exists($file)) {
+        require_once $file;
+        return true;
     }
-} else {
-    require_once dirname(__FILE__) . '/autoload-php7.php';
-}
+    return false;
+});
 
 /* Explicitly, always load the Compat class: */
 if (!class_exists('ParagonIE_Sodium_Compat', false)) {
@@ -49,26 +32,17 @@ if (!class_exists('ParagonIE_Sodium_Compat', false)) {
 if (!class_exists('SodiumException', false)) {
     require_once dirname(__FILE__) . '/src/SodiumException.php';
 }
-if (PHP_VERSION_ID >= 50300) {
-    // Namespaces didn't exist before 5.3.0, so don't even try to use this
-    // unless PHP >= 5.3.0
-    require_once dirname(__FILE__) . '/lib/namespaced.php';
-    require_once dirname(__FILE__) . '/lib/sodium_compat.php';
-    if (!defined('SODIUM_CRYPTO_AEAD_AEGIS128L_KEYBYTES')) {
-        require_once dirname(__FILE__) . '/lib/php84compat_const.php';
-    }
-} else {
-    require_once dirname(__FILE__) . '/src/PHP52/SplFixedArray.php';
+
+require_once dirname(__FILE__) . '/lib/namespaced.php';
+if (!defined('SODIUM_CRYPTO_AEAD_AEGIS128L_KEYBYTES')) {
+    require_once dirname(__FILE__) . '/lib/php84compat_const.php';
 }
-if (PHP_VERSION_ID < 70200 || !extension_loaded('sodium')) {
-    if (PHP_VERSION_ID >= 50300 && !defined('SODIUM_CRYPTO_SCALARMULT_BYTES')) {
+
+if (!extension_loaded('sodium')) {
+    if (!defined('SODIUM_CRYPTO_SCALARMULT_BYTES')) {
         require_once dirname(__FILE__) . '/lib/php72compat_const.php';
     }
-    if (PHP_VERSION_ID >= 70000) {
-        assert(class_exists('ParagonIE_Sodium_Compat'), 'Possible filesystem/autoloader bug?');
-    } else {
-        assert(class_exists('ParagonIE_Sodium_Compat'));
-    }
+    assert(class_exists('ParagonIE_Sodium_Compat'), 'Possible filesystem/autoloader bug?');
     require_once(dirname(__FILE__) . '/lib/php72compat.php');
 } elseif (!function_exists('sodium_crypto_stream_xchacha20_xor')) {
     // Older versions of {PHP, ext/sodium} will not define these

diff --git a/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/composer-php52.json b/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/composer-php52.json
deleted file mode 100644 (file)
index 9547d0d..0000000
--- a/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/composer-php52.json
+++ /dev/null
@@ -1,87 +0,0 @@
-{
-  "name": "paragonie/sodium_compat",
-  "description": "Pure PHP implementation of libsodium; uses the PHP extension if it exists",
-  "keywords": [
-    "PHP",
-    "cryptography",
-    "elliptic curve",
-    "elliptic curve cryptography",
-    "Pure-PHP cryptography",
-    "side-channel resistant",
-    "Curve25519",
-    "X25519",
-    "ECDH",
-    "Elliptic Curve Diffie-Hellman",
-    "Ed25519",
-    "RFC 7748",
-    "RFC 8032",
-    "EdDSA",
-    "Edwards-curve Digital Signature Algorithm",
-    "ChaCha20",
-    "Salsa20",
-    "Xchacha20",
-    "Xsalsa20",
-    "Poly1305",
-    "BLAKE2b",
-    "public-key cryptography",
-    "secret-key cryptography",
-    "AEAD",
-    "Chapoly",
-    "Salpoly",
-    "ChaCha20-Poly1305",
-    "XSalsa20-Poly1305",
-    "XChaCha20-Poly1305",
-    "encryption",
-    "authentication",
-    "libsodium"
-  ],
-  "license": "ISC",
-  "authors": [
-    {
-      "name": "Paragon Initiative Enterprises",
-      "email": "security@paragonie.com"
-    },
-    {
-      "name": "Frank Denis",
-      "email": "jedisct1@pureftpd.org"
-    }
-  ],
-  "autoload": {
-    "files": ["autoload.php"]
-  },
-  "repositories": [
-    {
-      "type": "git",
-      "url": "https://github.com/garex/phpunit"
-    },
-    {
-      "type": "git",
-      "url": "https://github.com/garex/phpunit-mock-objects"
-    }
-  ],
-  "require": {
-    "php": "^5.2.4|^5.3|^5.4|^5.5|^5.6|^7|^8",
-    "xrstf/composer-php52": "1.*",
-    "paragonie/random_compat": ">=1"
-  },
-  "minimum-stability": "dev",
-  "require-dev": {
-    "phpunit/phpunit-php52": "dev-3.6.12-php52",
-    "phpunit/phpunit-mock-objects-php52": "dev-1.1.0-php52"
-  },
-  "scripts": {
-    "post-install-cmd": [
-      "xrstf\\Composer52\\Generator::onPostInstallCmd"
-    ],
-    "post-update-cmd": [
-      "xrstf\\Composer52\\Generator::onPostInstallCmd"
-    ],
-    "post-autoload-dump": [
-      "xrstf\\Composer52\\Generator::onPostInstallCmd"
-    ]
-  },
-  "suggest": {
-    "ext-libsodium": "PHP < 7.0: Better performance, password hashing (Argon2i), secure memory management (memzero), and better security.",
-    "ext-sodium": "PHP >= 7.0: Better performance, password hashing (Argon2i), secure memory management (memzero), and better security."
-  }
-}

diff --git a/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/composer.json b/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/composer.json
index 21d6327ef34cedbb4f7727d70108d0afb2aed2fc..61033b4b1fa6b53a698864bc7bb0a4d3e779f912 100644 (file)
--- a/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/composer.json
+++ b/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/composer.json
@@ -50,17 +50,22 @@
     "files": ["autoload.php"]
   },
   "require": {
-    "php": "^5.2.4|^5.3|^5.4|^5.5|^5.6|^7|^8",
-    "paragonie/random_compat": ">=1"
+    "php": "^8.1",
+    "php-64bit": "*"
   },
   "require-dev": {
-    "phpunit/phpunit": "^3|^4|^5|^6|^7|^8|^9"
+    "phpunit/phpunit": "^7|^8|^9",
+    "vimeo/psalm": "^4|^5"
+  },
+  "extra": {
+      "branch-alias": {
+          "dev-master": "2.0.x-dev"
+      }
   },
   "scripts": {
     "test": "phpunit"
   },
   "suggest": {
-    "ext-libsodium": "PHP < 7.0: Better performance, password hashing (Argon2i), secure memory management (memzero), and better security.",
-    "ext-sodium": "PHP >= 7.0: Better performance, password hashing (Argon2i), secure memory management (memzero), and better security."
+    "ext-sodium": "Better performance, password hashing (Argon2i), secure memory management (memzero), and better security."
   }
 }

diff --git a/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/lib/constants.php b/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/lib/constants.php
deleted file mode 100644 (file)
index b6a120e..0000000
--- a/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/lib/constants.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-namespace Sodium;
-
-require_once dirname(dirname(__FILE__)) . '/autoload.php';
-
-use ParagonIE_Sodium_Compat;
-
-const CRYPTO_AEAD_AES256GCM_KEYBYTES = ParagonIE_Sodium_Compat::CRYPTO_AEAD_AES256GCM_KEYBYTES;
-const CRYPTO_AEAD_AES256GCM_NSECBYTES = ParagonIE_Sodium_Compat::CRYPTO_AEAD_AES256GCM_NSECBYTES;
-const CRYPTO_AEAD_AES256GCM_NPUBBYTES = ParagonIE_Sodium_Compat::CRYPTO_AEAD_AES256GCM_NPUBBYTES;
-const CRYPTO_AEAD_AES256GCM_ABYTES = ParagonIE_Sodium_Compat::CRYPTO_AEAD_AES256GCM_ABYTES;
-const CRYPTO_AEAD_CHACHA20POLY1305_KEYBYTES = ParagonIE_Sodium_Compat::CRYPTO_AEAD_CHACHA20POLY1305_KEYBYTES;
-const CRYPTO_AEAD_CHACHA20POLY1305_NSECBYTES = ParagonIE_Sodium_Compat::CRYPTO_AEAD_CHACHA20POLY1305_NSECBYTES;
-const CRYPTO_AEAD_CHACHA20POLY1305_NPUBBYTES = ParagonIE_Sodium_Compat::CRYPTO_AEAD_CHACHA20POLY1305_NPUBBYTES;
-const CRYPTO_AEAD_CHACHA20POLY1305_ABYTES = ParagonIE_Sodium_Compat::CRYPTO_AEAD_CHACHA20POLY1305_ABYTES;
-const CRYPTO_AEAD_CHACHA20POLY1305_IETF_KEYBYTES = ParagonIE_Sodium_Compat::CRYPTO_AEAD_CHACHA20POLY1305_IETF_KEYBYTES;
-const CRYPTO_AEAD_CHACHA20POLY1305_IETF_NSECBYTES = ParagonIE_Sodium_Compat::CRYPTO_AEAD_CHACHA20POLY1305_IETF_NSECBYTES;
-const CRYPTO_AEAD_CHACHA20POLY1305_IETF_NPUBBYTES = ParagonIE_Sodium_Compat::CRYPTO_AEAD_CHACHA20POLY1305_IETF_NPUBBYTES;
-const CRYPTO_AEAD_CHACHA20POLY1305_IETF_ABYTES = ParagonIE_Sodium_Compat::CRYPTO_AEAD_CHACHA20POLY1305_IETF_ABYTES;
-const CRYPTO_AUTH_BYTES = ParagonIE_Sodium_Compat::CRYPTO_AUTH_BYTES;
-const CRYPTO_AUTH_KEYBYTES = ParagonIE_Sodium_Compat::CRYPTO_AUTH_KEYBYTES;
-const CRYPTO_BOX_SEALBYTES = ParagonIE_Sodium_Compat::CRYPTO_BOX_SEALBYTES;
-const CRYPTO_BOX_SECRETKEYBYTES = ParagonIE_Sodium_Compat::CRYPTO_BOX_SECRETKEYBYTES;
-const CRYPTO_BOX_PUBLICKEYBYTES = ParagonIE_Sodium_Compat::CRYPTO_BOX_PUBLICKEYBYTES;
-const CRYPTO_BOX_KEYPAIRBYTES = ParagonIE_Sodium_Compat::CRYPTO_BOX_KEYPAIRBYTES;
-const CRYPTO_BOX_MACBYTES = ParagonIE_Sodium_Compat::CRYPTO_BOX_MACBYTES;
-const CRYPTO_BOX_NONCEBYTES = ParagonIE_Sodium_Compat::CRYPTO_BOX_NONCEBYTES;
-const CRYPTO_BOX_SEEDBYTES = ParagonIE_Sodium_Compat::CRYPTO_BOX_SEEDBYTES;
-const CRYPTO_KX_BYTES = ParagonIE_Sodium_Compat::CRYPTO_KX_BYTES;
-const CRYPTO_KX_SEEDBYTES = ParagonIE_Sodium_Compat::CRYPTO_KX_SEEDBYTES;
-const CRYPTO_KX_PUBLICKEYBYTES = ParagonIE_Sodium_Compat::CRYPTO_KX_PUBLICKEYBYTES;
-const CRYPTO_KX_SECRETKEYBYTES = ParagonIE_Sodium_Compat::CRYPTO_KX_SECRETKEYBYTES;
-const CRYPTO_GENERICHASH_BYTES = ParagonIE_Sodium_Compat::CRYPTO_GENERICHASH_BYTES;
-const CRYPTO_GENERICHASH_BYTES_MIN = ParagonIE_Sodium_Compat::CRYPTO_GENERICHASH_BYTES_MIN;
-const CRYPTO_GENERICHASH_BYTES_MAX = ParagonIE_Sodium_Compat::CRYPTO_GENERICHASH_BYTES_MAX;
-const CRYPTO_GENERICHASH_KEYBYTES = ParagonIE_Sodium_Compat::CRYPTO_GENERICHASH_KEYBYTES;
-const CRYPTO_GENERICHASH_KEYBYTES_MIN = ParagonIE_Sodium_Compat::CRYPTO_GENERICHASH_KEYBYTES_MIN;
-const CRYPTO_GENERICHASH_KEYBYTES_MAX = ParagonIE_Sodium_Compat::CRYPTO_GENERICHASH_KEYBYTES_MAX;
-const CRYPTO_SCALARMULT_BYTES = ParagonIE_Sodium_Compat::CRYPTO_SCALARMULT_BYTES;
-const CRYPTO_SCALARMULT_SCALARBYTES = ParagonIE_Sodium_Compat::CRYPTO_SCALARMULT_SCALARBYTES;
-const CRYPTO_SHORTHASH_BYTES = ParagonIE_Sodium_Compat::CRYPTO_SHORTHASH_BYTES;
-const CRYPTO_SHORTHASH_KEYBYTES = ParagonIE_Sodium_Compat::CRYPTO_SHORTHASH_KEYBYTES;
-const CRYPTO_SECRETBOX_KEYBYTES = ParagonIE_Sodium_Compat::CRYPTO_SECRETBOX_KEYBYTES;
-const CRYPTO_SECRETBOX_MACBYTES = ParagonIE_Sodium_Compat::CRYPTO_SECRETBOX_MACBYTES;
-const CRYPTO_SECRETBOX_NONCEBYTES = ParagonIE_Sodium_Compat::CRYPTO_SECRETBOX_NONCEBYTES;
-const CRYPTO_SIGN_BYTES = ParagonIE_Sodium_Compat::CRYPTO_SIGN_BYTES;
-const CRYPTO_SIGN_SEEDBYTES = ParagonIE_Sodium_Compat::CRYPTO_SIGN_SEEDBYTES;
-const CRYPTO_SIGN_PUBLICKEYBYTES = ParagonIE_Sodium_Compat::CRYPTO_SIGN_PUBLICKEYBYTES;
-const CRYPTO_SIGN_SECRETKEYBYTES = ParagonIE_Sodium_Compat::CRYPTO_SIGN_SECRETKEYBYTES;
-const CRYPTO_SIGN_KEYPAIRBYTES = ParagonIE_Sodium_Compat::CRYPTO_SIGN_KEYPAIRBYTES;
-const CRYPTO_STREAM_KEYBYTES = ParagonIE_Sodium_Compat::CRYPTO_STREAM_KEYBYTES;
-const CRYPTO_STREAM_NONCEBYTES = ParagonIE_Sodium_Compat::CRYPTO_STREAM_NONCEBYTES;

diff --git a/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/lib/namespaced.php b/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/lib/namespaced.php
index 77551fd4c5e93bb671af3adcfed7914fb7cc7464..93864ba5b6198786221ccbbc2011926cea7e13bb 100644 (file)
--- a/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/lib/namespaced.php
+++ b/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/lib/namespaced.php
@@ -1,11 +1,8 @@
 <?php
+declare(strict_types=1);
 
 require_once dirname(dirname(__FILE__)) . '/autoload.php';
 
-if (PHP_VERSION_ID < 50300) {
-    return;
-}
-
 /*
  * This file is just for convenience, to allow developers to reduce verbosity when
  * they add this project to their libraries.

diff --git a/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/lib/php72compat.php b/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/lib/php72compat.php
index b9da5e036505b044fbce0b1f4340f4a6af5053ec..efdcd103983f36284a663fea48bc07f2d3bc40bd 100644 (file)
--- a/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/lib/php72compat.php
+++ b/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/lib/php72compat.php
@@ -1,6 +1,7 @@
 <?php
+declare(strict_types=1);
 
-require_once dirname(dirname(__FILE__)) . '/autoload.php';
+require_once dirname(__DIR__) . '/autoload.php';
 
 /**
  * This file will monkey patch the pure-PHP implementation in place of the
@@ -117,10 +118,9 @@ if (!is_callable('sodium_add')) {
      */
     function sodium_add(
         #[\SensitiveParameter]
-        &$string1,
-        #[\SensitiveParameter]
-        $string2
-    ) {
+        string &$string1,
+        string $string2
+    ): void {
         ParagonIE_Sodium_Compat::add($string1, $string2);
     }
 }
@@ -136,10 +136,10 @@ if (!is_callable('sodium_base642bin')) {
      */
     function sodium_base642bin(
         #[\SensitiveParameter]
-        $string,
-        $variant,
-        $ignore =''
-    ) {
+        string $string,
+        int $variant,
+        string $ignore = ''
+    ): string {
         return ParagonIE_Sodium_Compat::base642bin($string, $variant, $ignore);
     }
 }
@@ -154,9 +154,9 @@ if (!is_callable('sodium_bin2base64')) {
      */
     function sodium_bin2base64(
         #[\SensitiveParameter]
-        $string,
-        $variant
-    ) {
+        string $string,
+        int $variant
+    ): string {
         return ParagonIE_Sodium_Compat::bin2base64($string, $variant);
     }
 }
@@ -170,8 +170,8 @@ if (!is_callable('sodium_bin2hex')) {
      */
     function sodium_bin2hex(
         #[\SensitiveParameter]
-        $string
-    ) {
+        string $string
+    ): string {
         return ParagonIE_Sodium_Compat::bin2hex($string);
     }
 }
@@ -186,10 +186,10 @@ if (!is_callable('sodium_compare')) {
      */
     function sodium_compare(
         #[\SensitiveParameter]
-        $string1,
+        string $string1,
         #[\SensitiveParameter]
-        $string2
-    ) {
+        string $string2
+    ): int {
         return ParagonIE_Sodium_Compat::compare($string1, $string2);
     }
 }
@@ -201,29 +201,22 @@ if (!is_callable('sodium_crypto_aead_aes256gcm_decrypt')) {
      * @param string $nonce
      * @param string $key
      * @return string|bool
+     *
+     * @throws SodiumException
      */
     function sodium_crypto_aead_aes256gcm_decrypt(
-        $ciphertext,
-        $additional_data,
-        $nonce,
+        string $ciphertext,
+        string $additional_data,
+        string $nonce,
         #[\SensitiveParameter]
-        $key
-    ) {
-        try {
-            return ParagonIE_Sodium_Compat::crypto_aead_aes256gcm_decrypt(
-                $ciphertext,
-                $additional_data,
-                $nonce,
-                $key
-            );
-        } catch (Error $ex) {
-            return false;
-        } catch (Exception $ex) {
-            if (($ex instanceof SodiumException) && ($ex->getMessage() === 'AES-256-GCM is not available')) {
-                throw $ex;
-            }
-            return false;
-        }
+        string $key
+    ): string|bool {
+        return ParagonIE_Sodium_Compat::crypto_aead_aes256gcm_decrypt(
+            $ciphertext,
+            $additional_data,
+            $nonce,
+            $key
+        );
     }
 }
 if (!is_callable('sodium_crypto_aead_aes256gcm_encrypt')) {
@@ -239,12 +232,12 @@ if (!is_callable('sodium_crypto_aead_aes256gcm_encrypt')) {
      */
     function sodium_crypto_aead_aes256gcm_encrypt(
         #[\SensitiveParameter]
-        $message,
-        $additional_data,
-        $nonce,
+        string $message,
+        string $additional_data,
+        string $nonce,
         #[\SensitiveParameter]
-        $key
-    ) {
+        string $key
+    ): string {
         return ParagonIE_Sodium_Compat::crypto_aead_aes256gcm_encrypt($message, $additional_data, $nonce, $key);
     }
 }
@@ -253,7 +246,7 @@ if (!is_callable('sodium_crypto_aead_aes256gcm_is_available')) {
      * @see ParagonIE_Sodium_Compat::crypto_aead_aes256gcm_is_available()
      * @return bool
      */
-    function sodium_crypto_aead_aes256gcm_is_available()
+    function sodium_crypto_aead_aes256gcm_is_available(): bool
     {
         return ParagonIE_Sodium_Compat::crypto_aead_aes256gcm_is_available();
     }
@@ -268,12 +261,12 @@ if (!is_callable('sodium_crypto_aead_chacha20poly1305_decrypt')) {
      * @return string|bool
      */
     function sodium_crypto_aead_chacha20poly1305_decrypt(
-        $ciphertext,
-        $additional_data,
-        $nonce,
+        string $ciphertext,
+        string $additional_data,
+        string $nonce,
         #[\SensitiveParameter]
-        $key
-    ) {
+        string $key
+    ): string|bool {
         try {
             return ParagonIE_Sodium_Compat::crypto_aead_chacha20poly1305_decrypt(
                 $ciphertext,
@@ -281,9 +274,7 @@ if (!is_callable('sodium_crypto_aead_chacha20poly1305_decrypt')) {
                 $nonce,
                 $key
             );
-        } catch (Error $ex) {
-            return false;
-        } catch (Exception $ex) {
+        } catch (Throwable) {
             return false;
         }
     }
@@ -301,12 +292,12 @@ if (!is_callable('sodium_crypto_aead_chacha20poly1305_encrypt')) {
      */
     function sodium_crypto_aead_chacha20poly1305_encrypt(
         #[\SensitiveParameter]
-        $message,
-        $additional_data,
-        $nonce,
+        string $message,
+        string $additional_data,
+        string $nonce,
         #[\SensitiveParameter]
-        $key
-    ) {
+        string $key
+    ): string {
         return ParagonIE_Sodium_Compat::crypto_aead_chacha20poly1305_encrypt(
             $message,
             $additional_data,
@@ -321,7 +312,7 @@ if (!is_callable('sodium_crypto_aead_chacha20poly1305_keygen')) {
      * @return string
      * @throws Exception
      */
-    function sodium_crypto_aead_chacha20poly1305_keygen()
+    function sodium_crypto_aead_chacha20poly1305_keygen(): string
     {
         return ParagonIE_Sodium_Compat::crypto_aead_chacha20poly1305_keygen();
     }
@@ -334,26 +325,22 @@ if (!is_callable('sodium_crypto_aead_chacha20poly1305_ietf_decrypt')) {
      * @param string $nonce
      * @param string $key
      * @return string|bool
+     *
+     * @throws SodiumException
      */
     function sodium_crypto_aead_chacha20poly1305_ietf_decrypt(
-        $message,
-        $additional_data,
-        $nonce,
+        string $message,
+        string $additional_data,
+        string $nonce,
         #[\SensitiveParameter]
-        $key
-    ) {
-        try {
-            return ParagonIE_Sodium_Compat::crypto_aead_chacha20poly1305_ietf_decrypt(
-                $message,
-                $additional_data,
-                $nonce,
-                $key
-            );
-        } catch (Error $ex) {
-            return false;
-        } catch (Exception $ex) {
-            return false;
-        }
+        string $key
+    ): string|bool {
+        return ParagonIE_Sodium_Compat::crypto_aead_chacha20poly1305_ietf_decrypt(
+            $message,
+            $additional_data,
+            $nonce,
+            $key
+        );
     }
 }
 if (!is_callable('sodium_crypto_aead_chacha20poly1305_ietf_encrypt')) {
@@ -369,12 +356,12 @@ if (!is_callable('sodium_crypto_aead_chacha20poly1305_ietf_encrypt')) {
      */
     function sodium_crypto_aead_chacha20poly1305_ietf_encrypt(
         #[\SensitiveParameter]
-        $message,
-        $additional_data,
-        $nonce,
+        string $message,
+        string $additional_data,
+        string $nonce,
         #[\SensitiveParameter]
-        $key
-    ) {
+        string $key
+    ): string {
         return ParagonIE_Sodium_Compat::crypto_aead_chacha20poly1305_ietf_encrypt(
             $message,
             $additional_data,
@@ -389,7 +376,7 @@ if (!is_callable('sodium_crypto_aead_chacha20poly1305_ietf_keygen')) {
      * @return string
      * @throws Exception
      */
-    function sodium_crypto_aead_chacha20poly1305_ietf_keygen()
+    function sodium_crypto_aead_chacha20poly1305_ietf_keygen(): string
     {
         return ParagonIE_Sodium_Compat::crypto_aead_chacha20poly1305_ietf_keygen();
     }
@@ -402,14 +389,14 @@ if (!is_callable('sodium_crypto_aead_xchacha20poly1305_ietf_decrypt')) {
      * @param string $nonce
      * @param string $key
      * @return string|bool
+     * @throws SodiumException
      */
     function sodium_crypto_aead_xchacha20poly1305_ietf_decrypt(
-        $ciphertext,
-        $additional_data,
-        $nonce,
-        #[\SensitiveParameter]
-        $key
-    ) {
+        string $ciphertext,
+        string $additional_data,
+        string $nonce,
+        string $key
+    ): string|bool {
         try {
             return ParagonIE_Sodium_Compat::crypto_aead_xchacha20poly1305_ietf_decrypt(
                 $ciphertext,
@@ -418,9 +405,7 @@ if (!is_callable('sodium_crypto_aead_xchacha20poly1305_ietf_decrypt')) {
                 $key,
                 true
             );
-        } catch (Error $ex) {
-            return false;
-        } catch (Exception $ex) {
+        } catch (Throwable) {
             return false;
         }
     }
@@ -438,11 +423,11 @@ if (!is_callable('sodium_crypto_aead_xchacha20poly1305_ietf_encrypt')) {
      */
     function sodium_crypto_aead_xchacha20poly1305_ietf_encrypt(
         #[\SensitiveParameter]
-        $message,
-        $additional_data,
-        $nonce,
+        string $message,
+        string $additional_data,
+        string $nonce,
         #[\SensitiveParameter]
-        $key
+        string $key
     ) {
         return ParagonIE_Sodium_Compat::crypto_aead_xchacha20poly1305_ietf_encrypt(
             $message,
@@ -459,7 +444,7 @@ if (!is_callable('sodium_crypto_aead_xchacha20poly1305_ietf_keygen')) {
      * @return string
      * @throws Exception
      */
-    function sodium_crypto_aead_xchacha20poly1305_ietf_keygen()
+    function sodium_crypto_aead_xchacha20poly1305_ietf_keygen(): string
     {
         return ParagonIE_Sodium_Compat::crypto_aead_xchacha20poly1305_ietf_keygen();
     }
@@ -474,10 +459,10 @@ if (!is_callable('sodium_crypto_auth')) {
      * @throws TypeError
      */
     function sodium_crypto_auth(
-        $message,
+        string $message,
         #[\SensitiveParameter]
-        $key
-    ) {
+        string $key
+    ): string {
         return ParagonIE_Sodium_Compat::crypto_auth($message, $key);
     }
 }
@@ -487,7 +472,7 @@ if (!is_callable('sodium_crypto_auth_keygen')) {
      * @return string
      * @throws Exception
      */
-    function sodium_crypto_auth_keygen()
+    function sodium_crypto_auth_keygen(): string
     {
         return ParagonIE_Sodium_Compat::crypto_auth_keygen();
     }
@@ -503,11 +488,11 @@ if (!is_callable('sodium_crypto_auth_verify')) {
      * @throws TypeError
      */
     function sodium_crypto_auth_verify(
-        $mac,
-        $message,
+        string $mac,
+        string $message,
         #[\SensitiveParameter]
-        $key
-    ) {
+        string $key
+    ): bool {
         return ParagonIE_Sodium_Compat::crypto_auth_verify($mac, $message, $key);
     }
 }
@@ -523,11 +508,11 @@ if (!is_callable('sodium_crypto_box')) {
      */
     function sodium_crypto_box(
         #[\SensitiveParameter]
-        $message,
-        $nonce,
+        string $message,
+        string $nonce,
         #[\SensitiveParameter]
-        $key_pair
-    ) {
+        string $key_pair
+    ): string {
         return ParagonIE_Sodium_Compat::crypto_box($message, $nonce, $key_pair);
     }
 }
@@ -538,7 +523,7 @@ if (!is_callable('sodium_crypto_box_keypair')) {
      * @throws SodiumException
      * @throws TypeError
      */
-    function sodium_crypto_box_keypair()
+    function sodium_crypto_box_keypair(): string
     {
         return ParagonIE_Sodium_Compat::crypto_box_keypair();
     }
@@ -554,9 +539,9 @@ if (!is_callable('sodium_crypto_box_keypair_from_secretkey_and_publickey')) {
      */
     function sodium_crypto_box_keypair_from_secretkey_and_publickey(
         #[\SensitiveParameter]
-        $secret_key,
-        $public_key
-    ) {
+        string $secret_key,
+        string $public_key
+    ): string {
         return ParagonIE_Sodium_Compat::crypto_box_keypair_from_secretkey_and_publickey($secret_key, $public_key);
     }
 }
@@ -567,18 +552,18 @@ if (!is_callable('sodium_crypto_box_open')) {
      * @param string $nonce
      * @param string $key_pair
      * @return string|bool
+     *
+     * @throws SodiumException
      */
     function sodium_crypto_box_open(
-        $ciphertext,
-        $nonce,
+        string $ciphertext,
+        string $nonce,
         #[\SensitiveParameter]
-        $key_pair
-    ) {
+        string $key_pair
+    ): string|bool {
         try {
             return ParagonIE_Sodium_Compat::crypto_box_open($ciphertext, $nonce, $key_pair);
-        } catch (Error $ex) {
-            return false;
-        } catch (Exception $ex) {
+        } catch (Throwable) {
             return false;
         }
     }
@@ -593,8 +578,8 @@ if (!is_callable('sodium_crypto_box_publickey')) {
      */
     function sodium_crypto_box_publickey(
         #[\SensitiveParameter]
-        $key_pair
-    ) {
+        string $key_pair
+    ): string {
         return ParagonIE_Sodium_Compat::crypto_box_publickey($key_pair);
     }
 }
@@ -608,8 +593,8 @@ if (!is_callable('sodium_crypto_box_publickey_from_secretkey')) {
      */
     function sodium_crypto_box_publickey_from_secretkey(
         #[\SensitiveParameter]
-        $secret_key
-    ) {
+        string $secret_key
+    ): string {
         return ParagonIE_Sodium_Compat::crypto_box_publickey_from_secretkey($secret_key);
     }
 }
@@ -624,9 +609,9 @@ if (!is_callable('sodium_crypto_box_seal')) {
      */
     function sodium_crypto_box_seal(
         #[\SensitiveParameter]
-        $message,
-        $public_key
-    ) {
+        string $message,
+        string $public_key
+    ): string {
         return ParagonIE_Sodium_Compat::crypto_box_seal($message, $public_key);
     }
 }
@@ -639,16 +624,13 @@ if (!is_callable('sodium_crypto_box_seal_open')) {
      * @throws SodiumException
      */
     function sodium_crypto_box_seal_open(
-        $message,
+        string $message,
         #[\SensitiveParameter]
-        $key_pair
-    ) {
+        string $key_pair
+    ): string|bool {
         try {
             return ParagonIE_Sodium_Compat::crypto_box_seal_open($message, $key_pair);
-        } catch (SodiumException $ex) {
-            if ($ex->getMessage() === 'Argument 2 must be CRYPTO_BOX_KEYPAIRBYTES long.') {
-                throw $ex;
-            }
+        } catch (Throwable) {
             return false;
         }
     }
@@ -663,8 +645,8 @@ if (!is_callable('sodium_crypto_box_secretkey')) {
      */
     function sodium_crypto_box_secretkey(
         #[\SensitiveParameter]
-        $key_pair
-    ) {
+        string $key_pair
+    ): string {
         return ParagonIE_Sodium_Compat::crypto_box_secretkey($key_pair);
     }
 }
@@ -678,8 +660,8 @@ if (!is_callable('sodium_crypto_box_seed_keypair')) {
      */
     function sodium_crypto_box_seed_keypair(
         #[\SensitiveParameter]
-        $seed
-    ) {
+        string $seed
+    ): string {
         return ParagonIE_Sodium_Compat::crypto_box_seed_keypair($seed);
     }
 }
@@ -694,25 +676,27 @@ if (!is_callable('sodium_crypto_generichash')) {
      * @throws TypeError
      */
     function sodium_crypto_generichash(
-        $message,
+        string $message,
         #[\SensitiveParameter]
-        $key = null,
-        $length = 32
-    ) {
+        ?string $key = null,
+        int $length = 32
+    ): string {
         return ParagonIE_Sodium_Compat::crypto_generichash($message, $key, $length);
     }
 }
 if (!is_callable('sodium_crypto_generichash_final')) {
     /**
      * @see ParagonIE_Sodium_Compat::crypto_generichash_final()
-     * @param string|null $state
+     * @param string $state
      * @param int $outputLength
      * @return string
      * @throws SodiumException
      * @throws TypeError
      */
-    function sodium_crypto_generichash_final(&$state, $outputLength = 32)
-    {
+    function sodium_crypto_generichash_final(
+        string &$state,
+        int $outputLength = 32
+    ): string {
         return ParagonIE_Sodium_Compat::crypto_generichash_final($state, $outputLength);
     }
 }
@@ -727,9 +711,9 @@ if (!is_callable('sodium_crypto_generichash_init')) {
      */
     function sodium_crypto_generichash_init(
         #[\SensitiveParameter]
-        $key = null,
-        $length = 32
-    ) {
+        ?string $key = null,
+        int $length = 32
+    ): string {
         return ParagonIE_Sodium_Compat::crypto_generichash_init($key, $length);
     }
 }
@@ -739,7 +723,7 @@ if (!is_callable('sodium_crypto_generichash_keygen')) {
      * @return string
      * @throws Exception
      */
-    function sodium_crypto_generichash_keygen()
+    function sodium_crypto_generichash_keygen(): string
     {
         return ParagonIE_Sodium_Compat::crypto_generichash_keygen();
     }
@@ -747,17 +731,14 @@ if (!is_callable('sodium_crypto_generichash_keygen')) {
 if (!is_callable('sodium_crypto_generichash_update')) {
     /**
      * @see ParagonIE_Sodium_Compat::crypto_generichash_update()
-     * @param string|null $state
+     * @param string $state
      * @param string $message
      * @return void
      * @throws SodiumException
      * @throws TypeError
      */
-    function sodium_crypto_generichash_update(
-        #[\SensitiveParameter]
-        &$state,
-        $message = ''
-    ) {
+    function sodium_crypto_generichash_update(string &$state, string $message = ''): void
+    {
         ParagonIE_Sodium_Compat::crypto_generichash_update($state, $message);
     }
 }
@@ -767,7 +748,7 @@ if (!is_callable('sodium_crypto_kdf_keygen')) {
      * @return string
      * @throws Exception
      */
-    function sodium_crypto_kdf_keygen()
+    function sodium_crypto_kdf_keygen(): string
     {
         return ParagonIE_Sodium_Compat::crypto_kdf_keygen();
     }
@@ -783,12 +764,12 @@ if (!is_callable('sodium_crypto_kdf_derive_from_key')) {
      * @throws Exception
      */
     function sodium_crypto_kdf_derive_from_key(
-        $subkey_length,
-        $subkey_id,
-        $context,
+        int $subkey_length,
+        int $subkey_id,
+        string $context,
         #[\SensitiveParameter]
-        $key
-    ) {
+        string $key
+    ): string {
         return ParagonIE_Sodium_Compat::crypto_kdf_derive_from_key(
             $subkey_length,
             $subkey_id,
@@ -810,11 +791,11 @@ if (!is_callable('sodium_crypto_kx')) {
      */
     function sodium_crypto_kx(
         #[\SensitiveParameter]
-        $my_secret,
-        $their_public,
-        $client_public,
-        $server_public
-    ) {
+        string $my_secret,
+        string $their_public,
+        string $client_public,
+        string $server_public
+    ): string {
         return ParagonIE_Sodium_Compat::crypto_kx(
             $my_secret,
             $their_public,
@@ -831,8 +812,8 @@ if (!is_callable('sodium_crypto_kx_seed_keypair')) {
      */
     function sodium_crypto_kx_seed_keypair(
         #[\SensitiveParameter]
-        $seed
-    ) {
+        string $seed
+    ): string {
         return ParagonIE_Sodium_Compat::crypto_kx_seed_keypair($seed);
     }
 }
@@ -841,7 +822,7 @@ if (!is_callable('sodium_crypto_kx_keypair')) {
      * @return string
      * @throws Exception
      */
-    function sodium_crypto_kx_keypair()
+    function sodium_crypto_kx_keypair(): string
     {
         return ParagonIE_Sodium_Compat::crypto_kx_keypair();
     }
@@ -855,9 +836,9 @@ if (!is_callable('sodium_crypto_kx_client_session_keys')) {
      */
     function sodium_crypto_kx_client_session_keys(
         #[\SensitiveParameter]
-        $client_key_pair,
-        $server_key
-    ) {
+        string $client_key_pair,
+        string $server_key
+    ): array {
         return ParagonIE_Sodium_Compat::crypto_kx_client_session_keys($client_key_pair, $server_key);
     }
 }
@@ -870,9 +851,9 @@ if (!is_callable('sodium_crypto_kx_server_session_keys')) {
      */
     function sodium_crypto_kx_server_session_keys(
         #[\SensitiveParameter]
-        $server_key_pair,
-        $client_key
-    ) {
+        string $server_key_pair,
+        string $client_key
+    ): array {
         return ParagonIE_Sodium_Compat::crypto_kx_server_session_keys($server_key_pair, $client_key);
     }
 }
@@ -884,8 +865,8 @@ if (!is_callable('sodium_crypto_kx_secretkey')) {
      */
     function sodium_crypto_kx_secretkey(
         #[\SensitiveParameter]
-        $key_pair
-    ) {
+        string $key_pair
+    ): string {
         return ParagonIE_Sodium_Compat::crypto_kx_secretkey($key_pair);
     }
 }
@@ -897,8 +878,8 @@ if (!is_callable('sodium_crypto_kx_publickey')) {
      */
     function sodium_crypto_kx_publickey(
         #[\SensitiveParameter]
-        $key_pair
-    ) {
+        string $key_pair
+    ): string {
         return ParagonIE_Sodium_Compat::crypto_kx_publickey($key_pair);
     }
 }
@@ -916,14 +897,14 @@ if (!is_callable('sodium_crypto_pwhash')) {
      * @throws TypeError
      */
     function sodium_crypto_pwhash(
-        $length,
-        #[\SensitiveParameter]
-        $passwd,
-        $salt,
-        $opslimit,
-        $memlimit,
-        $algo = null
-    ) {
+        int $length,
+        #[\SensitiveParameter]
+        string $passwd,
+        string $salt,
+        int $opslimit,
+        int $memlimit,
+        ?int $algo = null
+    ): string {
         return ParagonIE_Sodium_Compat::crypto_pwhash($length, $passwd, $salt, $opslimit, $memlimit, $algo);
     }
 }
@@ -939,10 +920,10 @@ if (!is_callable('sodium_crypto_pwhash_str')) {
      */
     function sodium_crypto_pwhash_str(
         #[\SensitiveParameter]
-        $passwd,
-        $opslimit,
-        $memlimit
-    ) {
+        string $passwd,
+        int $opslimit,
+        int $memlimit
+    ): string {
         return ParagonIE_Sodium_Compat::crypto_pwhash_str($passwd, $opslimit, $memlimit);
     }
 }
@@ -958,10 +939,10 @@ if (!is_callable('sodium_crypto_pwhash_str_needs_rehash')) {
      */
     function sodium_crypto_pwhash_str_needs_rehash(
         #[\SensitiveParameter]
-        $hash,
-        $opslimit,
-        $memlimit
-    ) {
+        string $hash,
+        int $opslimit,
+        int $memlimit
+    ): bool {
         return ParagonIE_Sodium_Compat::crypto_pwhash_str_needs_rehash($hash, $opslimit, $memlimit);
     }
 }
@@ -976,10 +957,10 @@ if (!is_callable('sodium_crypto_pwhash_str_verify')) {
      */
     function sodium_crypto_pwhash_str_verify(
         #[\SensitiveParameter]
-        $passwd,
+        string $passwd,
         #[\SensitiveParameter]
-        $hash
-    ) {
+        string $hash
+    ): bool {
         return ParagonIE_Sodium_Compat::crypto_pwhash_str_verify($passwd, $hash);
     }
 }
@@ -996,13 +977,13 @@ if (!is_callable('sodium_crypto_pwhash_scryptsalsa208sha256')) {
      * @throws TypeError
      */
     function sodium_crypto_pwhash_scryptsalsa208sha256(
-        $length,
+        int $length,
         #[\SensitiveParameter]
-        $passwd,
-        $salt,
-        $opslimit,
-        $memlimit
-    ) {
+        string $passwd,
+        string $salt,
+        int $opslimit,
+        int $memlimit
+    ): string {
         return ParagonIE_Sodium_Compat::crypto_pwhash_scryptsalsa208sha256(
             $length,
             $passwd,
@@ -1024,10 +1005,10 @@ if (!is_callable('sodium_crypto_pwhash_scryptsalsa208sha256_str')) {
      */
     function sodium_crypto_pwhash_scryptsalsa208sha256_str(
         #[\SensitiveParameter]
-        $passwd,
-        $opslimit,
-        $memlimit
-    ) {
+        string $passwd,
+        int $opslimit,
+        int $memlimit
+    ): string {
         return ParagonIE_Sodium_Compat::crypto_pwhash_scryptsalsa208sha256_str($passwd, $opslimit, $memlimit);
     }
 }
@@ -1042,10 +1023,10 @@ if (!is_callable('sodium_crypto_pwhash_scryptsalsa208sha256_str_verify')) {
      */
     function sodium_crypto_pwhash_scryptsalsa208sha256_str_verify(
         #[\SensitiveParameter]
-        $passwd,
+        string $passwd,
         #[\SensitiveParameter]
-        $hash
-    ) {
+        string $hash
+    ): bool {
         return ParagonIE_Sodium_Compat::crypto_pwhash_scryptsalsa208sha256_str_verify($passwd, $hash);
     }
 }
@@ -1060,9 +1041,9 @@ if (!is_callable('sodium_crypto_scalarmult')) {
      */
     function sodium_crypto_scalarmult(
         #[\SensitiveParameter]
-        $n,
-        $p
-    ) {
+        string $n,
+        string $p
+    ): string {
         return ParagonIE_Sodium_Compat::crypto_scalarmult($n, $p);
     }
 }
@@ -1076,8 +1057,8 @@ if (!is_callable('sodium_crypto_scalarmult_base')) {
      */
     function sodium_crypto_scalarmult_base(
         #[\SensitiveParameter]
-        $n
-    ) {
+        string $n
+    ): string {
         return ParagonIE_Sodium_Compat::crypto_scalarmult_base($n);
     }
 }
@@ -1093,11 +1074,11 @@ if (!is_callable('sodium_crypto_secretbox')) {
      */
     function sodium_crypto_secretbox(
         #[\SensitiveParameter]
-        $message,
-        $nonce,
+        string $message,
+        string $nonce,
         #[\SensitiveParameter]
-        $key
-    ) {
+        string $key
+    ): string {
         return ParagonIE_Sodium_Compat::crypto_secretbox($message, $nonce, $key);
     }
 }
@@ -1107,7 +1088,7 @@ if (!is_callable('sodium_crypto_secretbox_keygen')) {
      * @return string
      * @throws Exception
      */
-    function sodium_crypto_secretbox_keygen()
+    function sodium_crypto_secretbox_keygen(): string
     {
         return ParagonIE_Sodium_Compat::crypto_secretbox_keygen();
     }
@@ -1121,16 +1102,14 @@ if (!is_callable('sodium_crypto_secretbox_open')) {
      * @return string|bool
      */
     function sodium_crypto_secretbox_open(
-        $ciphertext,
-        $nonce,
+        string $ciphertext,
+        string $nonce,
         #[\SensitiveParameter]
-        $key
-    ) {
+        string $key
+    ): string|bool {
         try {
             return ParagonIE_Sodium_Compat::crypto_secretbox_open($ciphertext, $nonce, $key);
-        } catch (Error $ex) {
-            return false;
-        } catch (Exception $ex) {
+        } catch (Throwable) {
             return false;
         }
     }
@@ -1143,8 +1122,8 @@ if (!is_callable('sodium_crypto_secretstream_xchacha20poly1305_init_push')) {
      */
     function sodium_crypto_secretstream_xchacha20poly1305_init_push(
         #[\SensitiveParameter]
-        $key
-    ) {
+        string $key
+    ): array {
         return ParagonIE_Sodium_Compat::crypto_secretstream_xchacha20poly1305_init_push($key);
     }
 }
@@ -1158,13 +1137,12 @@ if (!is_callable('sodium_crypto_secretstream_xchacha20poly1305_push')) {
      * @throws SodiumException
      */
     function sodium_crypto_secretstream_xchacha20poly1305_push(
+        string &$state,
         #[\SensitiveParameter]
-        &$state,
-        #[\SensitiveParameter]
-        $message,
-        $additional_data = '',
-        $tag = 0
-    ) {
+        string $message,
+        string $additional_data = '',
+        int $tag = 0
+    ): string {
         return ParagonIE_Sodium_Compat::crypto_secretstream_xchacha20poly1305_push(
             $state,
             $message,
@@ -1181,10 +1159,10 @@ if (!is_callable('sodium_crypto_secretstream_xchacha20poly1305_init_pull')) {
      * @throws Exception
      */
     function sodium_crypto_secretstream_xchacha20poly1305_init_pull(
-        $header,
+        string $header,
         #[\SensitiveParameter]
-        $key
-    ) {
+        string $key
+    ): string {
         return ParagonIE_Sodium_Compat::crypto_secretstream_xchacha20poly1305_init_pull($header, $key);
     }
 }
@@ -1198,10 +1176,10 @@ if (!is_callable('sodium_crypto_secretstream_xchacha20poly1305_pull')) {
      */
     function sodium_crypto_secretstream_xchacha20poly1305_pull(
         #[\SensitiveParameter]
-        &$state,
-        $ciphertext,
-        $additional_data = ''
-    ) {
+        string &$state,
+        string $ciphertext,
+        string $additional_data = ''
+    ): bool|array {
         return ParagonIE_Sodium_Compat::crypto_secretstream_xchacha20poly1305_pull(
             $state,
             $ciphertext,
@@ -1217,8 +1195,8 @@ if (!is_callable('sodium_crypto_secretstream_xchacha20poly1305_rekey')) {
      */
     function sodium_crypto_secretstream_xchacha20poly1305_rekey(
         #[\SensitiveParameter]
-        &$state
-    ) {
+        string &$state
+    ): void {
         ParagonIE_Sodium_Compat::crypto_secretstream_xchacha20poly1305_rekey($state);
     }
 }
@@ -1227,7 +1205,7 @@ if (!is_callable('sodium_crypto_secretstream_xchacha20poly1305_keygen')) {
      * @return string
      * @throws Exception
      */
-    function sodium_crypto_secretstream_xchacha20poly1305_keygen()
+    function sodium_crypto_secretstream_xchacha20poly1305_keygen(): string
     {
         return ParagonIE_Sodium_Compat::crypto_secretstream_xchacha20poly1305_keygen();
     }
@@ -1242,10 +1220,10 @@ if (!is_callable('sodium_crypto_shorthash')) {
      * @throws TypeError
      */
     function sodium_crypto_shorthash(
-        $message,
+        string $message,
         #[\SensitiveParameter]
-        $key = ''
-    ) {
+        string $key
+    ): string {
         return ParagonIE_Sodium_Compat::crypto_shorthash($message, $key);
     }
 }
@@ -1255,7 +1233,7 @@ if (!is_callable('sodium_crypto_shorthash_keygen')) {
      * @return string
      * @throws Exception
      */
-    function sodium_crypto_shorthash_keygen()
+    function sodium_crypto_shorthash_keygen(): string
     {
         return ParagonIE_Sodium_Compat::crypto_shorthash_keygen();
     }
@@ -1270,10 +1248,10 @@ if (!is_callable('sodium_crypto_sign')) {
      * @throws TypeError
      */
     function sodium_crypto_sign(
-        $message,
+        string $message,
         #[\SensitiveParameter]
-        $secret_key
-    ) {
+        string $secret_key
+    ): string {
         return ParagonIE_Sodium_Compat::crypto_sign($message, $secret_key);
     }
 }
@@ -1287,10 +1265,10 @@ if (!is_callable('sodium_crypto_sign_detached')) {
      * @throws TypeError
      */
     function sodium_crypto_sign_detached(
-        $message,
+        string $message,
         #[\SensitiveParameter]
-        $secret_key
-    ) {
+        string $secret_key
+    ): string {
         return ParagonIE_Sodium_Compat::crypto_sign_detached($message, $secret_key);
     }
 }
@@ -1305,9 +1283,9 @@ if (!is_callable('sodium_crypto_sign_keypair_from_secretkey_and_publickey')) {
      */
     function sodium_crypto_sign_keypair_from_secretkey_and_publickey(
         #[\SensitiveParameter]
-        $secret_key,
-        $public_key
-    ) {
+        string $secret_key,
+        string $public_key
+    ): string {
         return ParagonIE_Sodium_Compat::crypto_sign_keypair_from_secretkey_and_publickey($secret_key, $public_key);
     }
 }
@@ -1318,7 +1296,7 @@ if (!is_callable('sodium_crypto_sign_keypair')) {
      * @throws SodiumException
      * @throws TypeError
      */
-    function sodium_crypto_sign_keypair()
+    function sodium_crypto_sign_keypair(): string
     {
         return ParagonIE_Sodium_Compat::crypto_sign_keypair();
     }
@@ -1330,13 +1308,11 @@ if (!is_callable('sodium_crypto_sign_open')) {
      * @param string $public_key
      * @return string|bool
      */
-    function sodium_crypto_sign_open($signedMessage, $public_key)
+    function sodium_crypto_sign_open(string $signedMessage, string $public_key): string|bool
     {
         try {
             return ParagonIE_Sodium_Compat::crypto_sign_open($signedMessage, $public_key);
-        } catch (Error $ex) {
-            return false;
-        } catch (Exception $ex) {
+        } catch (Exception|Error $ex) {
             return false;
         }
     }
@@ -1351,8 +1327,8 @@ if (!is_callable('sodium_crypto_sign_publickey')) {
      */
     function sodium_crypto_sign_publickey(
         #[\SensitiveParameter]
-        $key_pair
-    ) {
+        string $key_pair
+    ): string {
         return ParagonIE_Sodium_Compat::crypto_sign_publickey($key_pair);
     }
 }
@@ -1366,8 +1342,8 @@ if (!is_callable('sodium_crypto_sign_publickey_from_secretkey')) {
      */
     function sodium_crypto_sign_publickey_from_secretkey(
         #[\SensitiveParameter]
-        $secret_key
-    ) {
+        string $secret_key
+    ): string {
         return ParagonIE_Sodium_Compat::crypto_sign_publickey_from_secretkey($secret_key);
     }
 }
@@ -1381,8 +1357,8 @@ if (!is_callable('sodium_crypto_sign_secretkey')) {
      */
     function sodium_crypto_sign_secretkey(
         #[\SensitiveParameter]
-        $key_pair
-    ) {
+        string $key_pair
+    ): string {
         return ParagonIE_Sodium_Compat::crypto_sign_secretkey($key_pair);
     }
 }
@@ -1396,8 +1372,8 @@ if (!is_callable('sodium_crypto_sign_seed_keypair')) {
      */
     function sodium_crypto_sign_seed_keypair(
         #[\SensitiveParameter]
-        $seed
-    ) {
+        string $seed
+    ): string {
         return ParagonIE_Sodium_Compat::crypto_sign_seed_keypair($seed);
     }
 }
@@ -1411,8 +1387,11 @@ if (!is_callable('sodium_crypto_sign_verify_detached')) {
      * @throws SodiumException
      * @throws TypeError
      */
-    function sodium_crypto_sign_verify_detached($signature, $message, $public_key)
-    {
+    function sodium_crypto_sign_verify_detached(
+        string $signature,
+        string $message,
+        string $public_key
+    ): bool {
         return ParagonIE_Sodium_Compat::crypto_sign_verify_detached($signature, $message, $public_key);
     }
 }
@@ -1424,7 +1403,7 @@ if (!is_callable('sodium_crypto_sign_ed25519_pk_to_curve25519')) {
      * @throws SodiumException
      * @throws TypeError
      */
-    function sodium_crypto_sign_ed25519_pk_to_curve25519($public_key)
+    function sodium_crypto_sign_ed25519_pk_to_curve25519(string $public_key): string
     {
         return ParagonIE_Sodium_Compat::crypto_sign_ed25519_pk_to_curve25519($public_key);
     }
@@ -1439,8 +1418,8 @@ if (!is_callable('sodium_crypto_sign_ed25519_sk_to_curve25519')) {
      */
     function sodium_crypto_sign_ed25519_sk_to_curve25519(
         #[\SensitiveParameter]
-        $secret_key
-    ) {
+        string $secret_key
+    ): string {
         return ParagonIE_Sodium_Compat::crypto_sign_ed25519_sk_to_curve25519($secret_key);
     }
 }
@@ -1455,11 +1434,11 @@ if (!is_callable('sodium_crypto_stream')) {
      * @throws TypeError
      */
     function sodium_crypto_stream(
-        $length,
-        $nonce,
+        int $length,
+        string $nonce,
         #[\SensitiveParameter]
-        $key
-    ) {
+        string $key
+    ): string {
         return ParagonIE_Sodium_Compat::crypto_stream($length, $nonce, $key);
     }
 }
@@ -1469,7 +1448,7 @@ if (!is_callable('sodium_crypto_stream_keygen')) {
      * @return string
      * @throws Exception
      */
-    function sodium_crypto_stream_keygen()
+    function sodium_crypto_stream_keygen(): string
     {
         return ParagonIE_Sodium_Compat::crypto_stream_keygen();
     }
@@ -1486,11 +1465,11 @@ if (!is_callable('sodium_crypto_stream_xor')) {
      */
     function sodium_crypto_stream_xor(
         #[\SensitiveParameter]
-        $message,
-        $nonce,
+        string $message,
+        string $nonce,
         #[\SensitiveParameter]
-        $key
-    ) {
+        string $key
+    ): string {
         return ParagonIE_Sodium_Compat::crypto_stream_xor($message, $nonce, $key);
     }
 }
@@ -1506,9 +1485,9 @@ if (!is_callable('sodium_hex2bin')) {
      */
     function sodium_hex2bin(
         #[\SensitiveParameter]
-        $string,
-        $ignore = ''
-    ) {
+        string $string,
+        string $ignore = ''
+    ): string {
         return ParagonIE_Sodium_Compat::hex2bin($string, $ignore);
     }
 }
@@ -1522,8 +1501,8 @@ if (!is_callable('sodium_increment')) {
      */
     function sodium_increment(
         #[\SensitiveParameter]
-        &$string
-    ) {
+        string &$string
+    ): void {
         ParagonIE_Sodium_Compat::increment($string);
     }
 }
@@ -1532,7 +1511,7 @@ if (!is_callable('sodium_library_version_major')) {
      * @see ParagonIE_Sodium_Compat::library_version_major()
      * @return int
      */
-    function sodium_library_version_major()
+    function sodium_library_version_major(): int
     {
         return ParagonIE_Sodium_Compat::library_version_major();
     }
@@ -1542,7 +1521,7 @@ if (!is_callable('sodium_library_version_minor')) {
      * @see ParagonIE_Sodium_Compat::library_version_minor()
      * @return int
      */
-    function sodium_library_version_minor()
+    function sodium_library_version_minor(): int
     {
         return ParagonIE_Sodium_Compat::library_version_minor();
     }
@@ -1552,7 +1531,7 @@ if (!is_callable('sodium_version_string')) {
      * @see ParagonIE_Sodium_Compat::version_string()
      * @return string
      */
-    function sodium_version_string()
+    function sodium_version_string(): string
     {
         return ParagonIE_Sodium_Compat::version_string();
     }
@@ -1568,10 +1547,10 @@ if (!is_callable('sodium_memcmp')) {
      */
     function sodium_memcmp(
         #[\SensitiveParameter]
-        $string1,
+        string $string1,
         #[\SensitiveParameter]
-        $string2
-    ) {
+        string $string2
+    ): int {
         return ParagonIE_Sodium_Compat::memcmp($string1, $string2);
     }
 }
@@ -1585,10 +1564,10 @@ if (!is_callable('sodium_memzero')) {
      *
      * @psalm-suppress ReferenceConstraintViolation
      */
-    function sodium_memzero(
-        #[\SensitiveParameter]
-        &$string
-    ) {
+    function sodium_memzero
+    (#[\SensitiveParameter]
+     string &$string
+    ): void {
         ParagonIE_Sodium_Compat::memzero($string);
     }
 }
@@ -1603,9 +1582,9 @@ if (!is_callable('sodium_pad')) {
      */
     function sodium_pad(
         #[\SensitiveParameter]
-        $unpadded,
-        $block_size
-    ) {
+        string $unpadded,
+        int $block_size
+    ): string {
         return ParagonIE_Sodium_Compat::pad($unpadded, $block_size, true);
     }
 }
@@ -1620,9 +1599,9 @@ if (!is_callable('sodium_unpad')) {
      */
     function sodium_unpad(
         #[\SensitiveParameter]
-        $padded,
-        $block_size
-    ) {
+        string $padded,
+        int $block_size
+    ): string {
         return ParagonIE_Sodium_Compat::unpad($padded, $block_size, true);
     }
 }
@@ -1633,7 +1612,7 @@ if (!is_callable('sodium_randombytes_buf')) {
      * @return string
      * @throws Exception
      */
-    function sodium_randombytes_buf($amount)
+    function sodium_randombytes_buf(int $amount): string
     {
         return ParagonIE_Sodium_Compat::randombytes_buf($amount);
     }
@@ -1646,7 +1625,7 @@ if (!is_callable('sodium_randombytes_uniform')) {
      * @return int
      * @throws Exception
      */
-    function sodium_randombytes_uniform($upperLimit)
+    function sodium_randombytes_uniform(int $upperLimit): int
     {
         return ParagonIE_Sodium_Compat::randombytes_uniform($upperLimit);
     }
@@ -1658,7 +1637,7 @@ if (!is_callable('sodium_randombytes_random16')) {
      * @return int
      * @throws Exception
      */
-    function sodium_randombytes_random16()
+    function sodium_randombytes_random16(): int
     {
         return ParagonIE_Sodium_Compat::randombytes_random16();
     }

diff --git a/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/lib/php72compat_const.php b/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/lib/php72compat_const.php
index baa0f1e1cc46da7fe8acbab7213c7d4908ebf1f0..5a876a67fbeb297ecfc9b0aef77dca897b170f59 100644 (file)
--- a/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/lib/php72compat_const.php
+++ b/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/lib/php72compat_const.php
@@ -1,5 +1,5 @@
 <?php
-
+declare(strict_types=1);
 const SODIUM_LIBRARY_MAJOR_VERSION = 9;
 const SODIUM_LIBRARY_MINOR_VERSION = 1;
 const SODIUM_LIBRARY_VERSION = '1.0.8';

diff --git a/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/lib/php84compat.php b/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/lib/php84compat.php
index ee172a08d0fc703b290765e67fab1728eeb1178e..a52e67a25e42dbc54fdb7e660bf5f0de8e12da8b 100644 (file)
--- a/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/lib/php84compat.php
+++ b/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/lib/php84compat.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 require_once dirname(dirname(__FILE__)) . '/autoload.php';
 
@@ -31,16 +32,16 @@ if (!is_callable('sodium_crypto_aead_aegis128l_decrypt')) {
      * @param string $additional_data
      * @param string $nonce
      * @param string $key
-     * @return string
+     * @return string|bool
      * @throws SodiumException
      */
     function sodium_crypto_aead_aegis128l_decrypt(
-        $ciphertext,
-        $additional_data,
-        $nonce,
+        string $ciphertext,
+        string $additional_data,
+        string $nonce,
         #[\SensitiveParameter]
-        $key
-    ) {
+        string $key
+    ): string|bool {
         return ParagonIE_Sodium_Compat::crypto_aead_aegis128l_decrypt(
             $ciphertext,
             $additional_data,
@@ -62,12 +63,12 @@ if (!is_callable('sodium_crypto_aead_aegis128l_encrypt')) {
      */
     function sodium_crypto_aead_aegis128l_encrypt(
         #[\SensitiveParameter]
-        $message,
-        $additional_data,
-        $nonce,
+        string $message,
+        string $additional_data,
+        string $nonce,
         #[\SensitiveParameter]
-        $key
-    ) {
+        string $key
+    ): string {
         return ParagonIE_Sodium_Compat::crypto_aead_aegis128l_encrypt(
             $message,
             $additional_data,
@@ -83,16 +84,16 @@ if (!is_callable('sodium_crypto_aead_aegis256_decrypt')) {
      * @param string $additional_data
      * @param string $nonce
      * @param string $key
-     * @return string
+     * @return string|bool
      * @throws SodiumException
      */
     function sodium_crypto_aead_aegis256_decrypt(
-        $ciphertext,
-        $additional_data,
-        $nonce,
+        string $ciphertext,
+        string $additional_data,
+        string $nonce,
         #[\SensitiveParameter]
-        $key
-    ) {
+        string $key
+    ): string|bool {
         return ParagonIE_Sodium_Compat::crypto_aead_aegis256_decrypt(
             $ciphertext,
             $additional_data,
@@ -114,12 +115,12 @@ if (!is_callable('sodium_crypto_aead_aegis256_encrypt')) {
      */
     function sodium_crypto_aead_aegis256_encrypt(
         #[\SensitiveParameter]
-        $message,
-        $additional_data,
-        $nonce,
+        string $message,
+        string $additional_data,
+        string $nonce,
         #[\SensitiveParameter]
-        $key
-    ) {
+        string $key
+    ): string {
         return ParagonIE_Sodium_Compat::crypto_aead_aegis256_encrypt(
             $message,
             $additional_data,

diff --git a/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/lib/php84compat_const.php b/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/lib/php84compat_const.php
index ee1ed9112e1d2d6b5c5777c2ba9437444ab0089f..7f508b629e1a7c42f507124b850acfeaf2c701b5 100644 (file)
--- a/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/lib/php84compat_const.php
+++ b/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/lib/php84compat_const.php
@@ -1,9 +1,9 @@
 <?php
+declare(strict_types=1);
 const SODIUM_CRYPTO_AEAD_AEGIS128L_KEYBYTES = 16;
 const SODIUM_CRYPTO_AEAD_AEGIS128L_NSECBYTES = 0;
 const SODIUM_CRYPTO_AEAD_AEGIS128L_NPUBBYTES = 32;
 const SODIUM_CRYPTO_AEAD_AEGIS128L_ABYTES = 32;
-
 const SODIUM_CRYPTO_AEAD_AEGIS256_KEYBYTES = 32;
 const SODIUM_CRYPTO_AEAD_AEGIS256_NSECBYTES = 0;
 const SODIUM_CRYPTO_AEAD_AEGIS256_NPUBBYTES = 32;

diff --git a/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/lib/ristretto255.php b/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/lib/ristretto255.php
index 587b4f6939ac600de90ffaa884e50e0fe7590d44..b71f1dc741df8d0c9474561bf3329e4da1e1f557 100644 (file)
--- a/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/lib/ristretto255.php
+++ b/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/lib/ristretto255.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 if (!defined('SODIUM_CRYPTO_CORE_RISTRETTO255_BYTES')) {
     define(
@@ -49,10 +50,10 @@ if (!is_callable('sodium_crypto_core_ristretto255_add')) {
      */
     function sodium_crypto_core_ristretto255_add(
         #[\SensitiveParameter]
-        $p,
+        string $p,
         #[\SensitiveParameter]
-        $q
-    ) {
+        string $q
+    ): string {
         return ParagonIE_Sodium_Compat::ristretto255_add($p, $q, true);
     }
 }
@@ -66,8 +67,8 @@ if (!is_callable('sodium_crypto_core_ristretto255_from_hash')) {
      */
     function sodium_crypto_core_ristretto255_from_hash(
         #[\SensitiveParameter]
-        $s
-    ) {
+        string $s
+    ): string {
         return ParagonIE_Sodium_Compat::ristretto255_from_hash($s, true);
     }
 }
@@ -81,8 +82,8 @@ if (!is_callable('sodium_crypto_core_ristretto255_is_valid_point')) {
      */
     function sodium_crypto_core_ristretto255_is_valid_point(
         #[\SensitiveParameter]
-        $s
-    ) {
+        string $s
+    ): bool {
         return ParagonIE_Sodium_Compat::ristretto255_is_valid_point($s, true);
     }
 }
@@ -93,7 +94,7 @@ if (!is_callable('sodium_crypto_core_ristretto255_random')) {
      * @return string
      * @throws SodiumException
      */
-    function sodium_crypto_core_ristretto255_random()
+    function sodium_crypto_core_ristretto255_random(): string
     {
         return ParagonIE_Sodium_Compat::ristretto255_random(true);
     }
@@ -109,10 +110,10 @@ if (!is_callable('sodium_crypto_core_ristretto255_scalar_add')) {
      */
     function sodium_crypto_core_ristretto255_scalar_add(
         #[\SensitiveParameter]
-        $x,
+        string $x,
         #[\SensitiveParameter]
-        $y
-    ) {
+        string $y
+    ): string {
         return ParagonIE_Sodium_Compat::ristretto255_scalar_add($x, $y, true);
     }
 }
@@ -126,8 +127,8 @@ if (!is_callable('sodium_crypto_core_ristretto255_scalar_complement')) {
      */
     function sodium_crypto_core_ristretto255_scalar_complement(
         #[\SensitiveParameter]
-        $s
-    ) {
+        string $s
+    ): string {
         return ParagonIE_Sodium_Compat::ristretto255_scalar_complement($s, true);
     }
 }
@@ -141,8 +142,8 @@ if (!is_callable('sodium_crypto_core_ristretto255_scalar_invert')) {
      */
     function sodium_crypto_core_ristretto255_scalar_invert(
         #[\SensitiveParameter]
-        $p
-    ) {
+        string $p
+    ): string {
         return ParagonIE_Sodium_Compat::ristretto255_scalar_invert($p, true);
     }
 }
@@ -157,10 +158,10 @@ if (!is_callable('sodium_crypto_core_ristretto255_scalar_mul')) {
      */
     function sodium_crypto_core_ristretto255_scalar_mul(
         #[\SensitiveParameter]
-        $x,
+        string $x,
         #[\SensitiveParameter]
-        $y
-    ) {
+        string $y
+    ): string {
         return ParagonIE_Sodium_Compat::ristretto255_scalar_mul($x, $y, true);
     }
 }
@@ -174,8 +175,8 @@ if (!is_callable('sodium_crypto_core_ristretto255_scalar_negate')) {
      */
     function sodium_crypto_core_ristretto255_scalar_negate(
         #[\SensitiveParameter]
-        $s
-    ) {
+        string $s
+    ): string {
         return ParagonIE_Sodium_Compat::ristretto255_scalar_negate($s, true);
     }
 }
@@ -186,7 +187,7 @@ if (!is_callable('sodium_crypto_core_ristretto255_scalar_random')) {
      * @return string
      * @throws SodiumException
      */
-    function sodium_crypto_core_ristretto255_scalar_random()
+    function sodium_crypto_core_ristretto255_scalar_random(): string
     {
         return ParagonIE_Sodium_Compat::ristretto255_scalar_random(true);
     }
@@ -201,8 +202,8 @@ if (!is_callable('sodium_crypto_core_ristretto255_scalar_reduce')) {
      */
     function sodium_crypto_core_ristretto255_scalar_reduce(
         #[\SensitiveParameter]
-        $s
-    ) {
+        string $s
+    ): string {
         return ParagonIE_Sodium_Compat::ristretto255_scalar_reduce($s, true);
     }
 }
@@ -217,10 +218,10 @@ if (!is_callable('sodium_crypto_core_ristretto255_scalar_sub')) {
      */
     function sodium_crypto_core_ristretto255_scalar_sub(
         #[\SensitiveParameter]
-        $x,
+        string $x,
         #[\SensitiveParameter]
-        $y
-    ) {
+        string $y
+    ): string {
         return ParagonIE_Sodium_Compat::ristretto255_scalar_sub($x, $y, true);
     }
 }
@@ -235,10 +236,10 @@ if (!is_callable('sodium_crypto_core_ristretto255_sub')) {
      */
     function sodium_crypto_core_ristretto255_sub(
         #[\SensitiveParameter]
-        $p,
+        string $p,
         #[\SensitiveParameter]
-        $q
-    ) {
+        string $q
+    ): string {
         return ParagonIE_Sodium_Compat::ristretto255_sub($p, $q, true);
     }
 }
@@ -253,10 +254,10 @@ if (!is_callable('sodium_crypto_scalarmult_ristretto255')) {
      */
     function sodium_crypto_scalarmult_ristretto255(
         #[\SensitiveParameter]
-        $n,
+        string $n,
         #[\SensitiveParameter]
-        $p
-    ) {
+        string $p
+    ): string {
         return ParagonIE_Sodium_Compat::scalarmult_ristretto255($n, $p, true);
     }
 }
@@ -270,8 +271,8 @@ if (!is_callable('sodium_crypto_scalarmult_ristretto255_base')) {
      */
     function sodium_crypto_scalarmult_ristretto255_base(
         #[\SensitiveParameter]
-        $n
-    ) {
+        string $n
+    ): string {
         return ParagonIE_Sodium_Compat::scalarmult_ristretto255_base($n, true);
     }
-}
\ No newline at end of file
+}

diff --git a/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/lib/sodium_compat.php b/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/lib/sodium_compat.php
deleted file mode 100644 (file)
index 72a561d..0000000
--- a/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/lib/sodium_compat.php
+++ /dev/null
@@ -1,999 +0,0 @@
-<?php
-namespace Sodium;
-
-require_once dirname(dirname(__FILE__)) . '/autoload.php';
-
-use ParagonIE_Sodium_Compat;
-
-/**
- * This file will monkey patch the pure-PHP implementation in place of the
- * PECL functions, but only if they do not already exist.
- *
- * Thus, the functions just proxy to the appropriate ParagonIE_Sodium_Compat
- * method.
- */
-if (!is_callable('\\Sodium\\bin2hex')) {
-    /**
-     * @see ParagonIE_Sodium_Compat::bin2hex()
-     * @param string $string
-     * @return string
-     * @throws \SodiumException
-     * @throws \TypeError
-     */
-    function bin2hex(
-        #[\SensitiveParameter]
-        $string
-    ) {
-        return ParagonIE_Sodium_Compat::bin2hex($string);
-    }
-}
-if (!is_callable('\\Sodium\\compare')) {
-    /**
-     * @see ParagonIE_Sodium_Compat::compare()
-     * @param string $a
-     * @param string $b
-     * @return int
-     * @throws \SodiumException
-     * @throws \TypeError
-     */
-    function compare(
-        #[\SensitiveParameter]
-        $a,
-        #[\SensitiveParameter]
-        $b
-    ) {
-        return ParagonIE_Sodium_Compat::compare($a, $b);
-    }
-}
-if (!is_callable('\\Sodium\\crypto_aead_aes256gcm_decrypt')) {
-    /**
-     * @see ParagonIE_Sodium_Compat::crypto_aead_aes256gcm_decrypt()
-     * @param string $message
-     * @param string $assocData
-     * @param string $nonce
-     * @param string $key
-     * @return string|bool
-     */
-    function crypto_aead_aes256gcm_decrypt(
-        $message,
-        $assocData,
-        $nonce,
-        #[\SensitiveParameter]
-        $key
-    ) {
-        try {
-            return ParagonIE_Sodium_Compat::crypto_aead_aes256gcm_decrypt($message, $assocData, $nonce, $key);
-        } catch (\TypeError $ex) {
-            return false;
-        } catch (\SodiumException $ex) {
-            return false;
-        }
-    }
-}
-if (!is_callable('\\Sodium\\crypto_aead_aes256gcm_encrypt')) {
-    /**
-     * @see ParagonIE_Sodium_Compat::crypto_aead_aes256gcm_encrypt()
-     * @param string $message
-     * @param string $assocData
-     * @param string $nonce
-     * @param string $key
-     * @return string
-     * @throws \SodiumException
-     * @throws \TypeError
-     */
-    function crypto_aead_aes256gcm_encrypt(
-        #[\SensitiveParameter]
-        $message,
-        $assocData,
-        $nonce,
-        #[\SensitiveParameter]
-        $key
-    ) {
-        return ParagonIE_Sodium_Compat::crypto_aead_aes256gcm_encrypt($message, $assocData, $nonce, $key);
-    }
-}
-if (!is_callable('\\Sodium\\crypto_aead_aes256gcm_is_available')) {
-    /**
-     * @see ParagonIE_Sodium_Compat::crypto_aead_aes256gcm_is_available()
-     * @return bool
-     */
-    function crypto_aead_aes256gcm_is_available()
-    {
-        return ParagonIE_Sodium_Compat::crypto_aead_aes256gcm_is_available();
-    }
-}
-if (!is_callable('\\Sodium\\crypto_aead_chacha20poly1305_decrypt')) {
-    /**
-     * @see ParagonIE_Sodium_Compat::crypto_aead_chacha20poly1305_decrypt()
-     * @param string $message
-     * @param string $assocData
-     * @param string $nonce
-     * @param string $key
-     * @return string|bool
-     */
-    function crypto_aead_chacha20poly1305_decrypt(
-        $message,
-        $assocData,
-        $nonce,
-        #[\SensitiveParameter]
-        $key
-    ) {
-        try {
-            return ParagonIE_Sodium_Compat::crypto_aead_chacha20poly1305_decrypt($message, $assocData, $nonce, $key);
-        } catch (\TypeError $ex) {
-            return false;
-        } catch (\SodiumException $ex) {
-            return false;
-        }
-    }
-}
-if (!is_callable('\\Sodium\\crypto_aead_chacha20poly1305_encrypt')) {
-    /**
-     * @see ParagonIE_Sodium_Compat::crypto_aead_chacha20poly1305_encrypt()
-     * @param string $message
-     * @param string $assocData
-     * @param string $nonce
-     * @param string $key
-     * @return string
-     * @throws \SodiumException
-     * @throws \TypeError
-     */
-    function crypto_aead_chacha20poly1305_encrypt(
-        #[\SensitiveParameter]
-        $message,
-        $assocData,
-        $nonce,
-        #[\SensitiveParameter]
-        $key
-    ) {
-        return ParagonIE_Sodium_Compat::crypto_aead_chacha20poly1305_encrypt($message, $assocData, $nonce, $key);
-    }
-}
-if (!is_callable('\\Sodium\\crypto_aead_chacha20poly1305_ietf_decrypt')) {
-    /**
-     * @see ParagonIE_Sodium_Compat::crypto_aead_chacha20poly1305_ietf_decrypt()
-     * @param string $message
-     * @param string $assocData
-     * @param string $nonce
-     * @param string $key
-     * @return string|bool
-     */
-    function crypto_aead_chacha20poly1305_ietf_decrypt(
-        $message,
-        $assocData,
-        $nonce,
-        #[\SensitiveParameter]
-        $key
-    ) {
-        try {
-            return ParagonIE_Sodium_Compat::crypto_aead_chacha20poly1305_ietf_decrypt($message, $assocData, $nonce, $key);
-        } catch (\TypeError $ex) {
-            return false;
-        } catch (\SodiumException $ex) {
-            return false;
-        }
-    }
-}
-if (!is_callable('\\Sodium\\crypto_aead_chacha20poly1305_ietf_encrypt')) {
-    /**
-     * @see ParagonIE_Sodium_Compat::crypto_aead_chacha20poly1305_ietf_encrypt()
-     * @param string $message
-     * @param string $assocData
-     * @param string $nonce
-     * @param string $key
-     * @return string
-     * @throws \SodiumException
-     * @throws \TypeError
-     */
-    function crypto_aead_chacha20poly1305_ietf_encrypt(
-        #[\SensitiveParameter]
-        $message,
-        $assocData,
-        $nonce,
-        #[\SensitiveParameter]
-        $key
-    ) {
-        return ParagonIE_Sodium_Compat::crypto_aead_chacha20poly1305_ietf_encrypt($message, $assocData, $nonce, $key);
-    }
-}
-if (!is_callable('\\Sodium\\crypto_auth')) {
-    /**
-     * @see ParagonIE_Sodium_Compat::crypto_auth()
-     * @param string $message
-     * @param string $key
-     * @return string
-     * @throws \SodiumException
-     * @throws \TypeError
-     */
-    function crypto_auth(
-        $message,
-        #[\SensitiveParameter]
-        $key
-    ) {
-        return ParagonIE_Sodium_Compat::crypto_auth($message, $key);
-    }
-}
-if (!is_callable('\\Sodium\\crypto_auth_verify')) {
-    /**
-     * @see ParagonIE_Sodium_Compat::crypto_auth_verify()
-     * @param string $mac
-     * @param string $message
-     * @param string $key
-     * @return bool
-     * @throws \SodiumException
-     * @throws \TypeError
-     */
-    function crypto_auth_verify(
-        $mac,
-        $message,
-        #[\SensitiveParameter]
-        $key
-    ) {
-        return ParagonIE_Sodium_Compat::crypto_auth_verify($mac, $message, $key);
-    }
-}
-if (!is_callable('\\Sodium\\crypto_box')) {
-    /**
-     * @see ParagonIE_Sodium_Compat::crypto_box()
-     * @param string $message
-     * @param string $nonce
-     * @param string $kp
-     * @return string
-     * @throws \SodiumException
-     * @throws \TypeError
-     */
-    function crypto_box(
-        #[\SensitiveParameter]
-        $message,
-        $nonce,
-        #[\SensitiveParameter]
-        $kp
-    ) {
-        return ParagonIE_Sodium_Compat::crypto_box($message, $nonce, $kp);
-    }
-}
-if (!is_callable('\\Sodium\\crypto_box_keypair')) {
-    /**
-     * @see ParagonIE_Sodium_Compat::crypto_box_keypair()
-     * @return string
-     * @throws \SodiumException
-     * @throws \TypeError
-     */
-    function crypto_box_keypair()
-    {
-        return ParagonIE_Sodium_Compat::crypto_box_keypair();
-    }
-}
-if (!is_callable('\\Sodium\\crypto_box_keypair_from_secretkey_and_publickey')) {
-    /**
-     * @see ParagonIE_Sodium_Compat::crypto_box_keypair_from_secretkey_and_publickey()
-     * @param string $sk
-     * @param string $pk
-     * @return string
-     * @throws \SodiumException
-     * @throws \TypeError
-     */
-    function crypto_box_keypair_from_secretkey_and_publickey(
-        #[\SensitiveParameter]
-        $sk,
-        $pk
-    ) {
-        return ParagonIE_Sodium_Compat::crypto_box_keypair_from_secretkey_and_publickey($sk, $pk);
-    }
-}
-if (!is_callable('\\Sodium\\crypto_box_open')) {
-    /**
-     * @see ParagonIE_Sodium_Compat::crypto_box_open()
-     * @param string $message
-     * @param string $nonce
-     * @param string $kp
-     * @return string|bool
-     */
-    function crypto_box_open(
-        #[\SensitiveParameter]
-        $message,
-        $nonce,
-        #[\SensitiveParameter]
-        $kp
-    ) {
-        try {
-            return ParagonIE_Sodium_Compat::crypto_box_open($message, $nonce, $kp);
-        } catch (\TypeError $ex) {
-            return false;
-        } catch (\SodiumException $ex) {
-            return false;
-        }
-    }
-}
-if (!is_callable('\\Sodium\\crypto_box_publickey')) {
-    /**
-     * @see ParagonIE_Sodium_Compat::crypto_box_publickey()
-     * @param string $keypair
-     * @return string
-     * @throws \SodiumException
-     * @throws \TypeError
-     */
-    function crypto_box_publickey(
-        #[\SensitiveParameter]
-        $keypair
-    ) {
-        return ParagonIE_Sodium_Compat::crypto_box_publickey($keypair);
-    }
-}
-if (!is_callable('\\Sodium\\crypto_box_publickey_from_secretkey')) {
-    /**
-     * @see ParagonIE_Sodium_Compat::crypto_box_publickey_from_secretkey()
-     * @param string $sk
-     * @return string
-     * @throws \SodiumException
-     * @throws \TypeError
-     */
-    function crypto_box_publickey_from_secretkey(
-        #[\SensitiveParameter]
-        $sk
-    ) {
-        return ParagonIE_Sodium_Compat::crypto_box_publickey_from_secretkey($sk);
-    }
-}
-if (!is_callable('\\Sodium\\crypto_box_seal')) {
-    /**
-     * @see ParagonIE_Sodium_Compat::crypto_box_seal_open()
-     * @param string $message
-     * @param string $publicKey
-     * @return string
-     * @throws \SodiumException
-     * @throws \TypeError
-     */
-    function crypto_box_seal(
-        #[\SensitiveParameter]
-        $message,
-        $publicKey
-    ) {
-        return ParagonIE_Sodium_Compat::crypto_box_seal($message, $publicKey);
-    }
-}
-if (!is_callable('\\Sodium\\crypto_box_seal_open')) {
-    /**
-     * @see ParagonIE_Sodium_Compat::crypto_box_seal_open()
-     * @param string $message
-     * @param string $kp
-     * @return string|bool
-     */
-    function crypto_box_seal_open(
-        $message,
-        #[\SensitiveParameter]
-        $kp
-    ) {
-        try {
-            return ParagonIE_Sodium_Compat::crypto_box_seal_open($message, $kp);
-        } catch (\TypeError $ex) {
-            return false;
-        } catch (\SodiumException $ex) {
-            return false;
-        }
-    }
-}
-if (!is_callable('\\Sodium\\crypto_box_secretkey')) {
-    /**
-     * @see ParagonIE_Sodium_Compat::crypto_box_secretkey()
-     * @param string $keypair
-     * @return string
-     * @throws \SodiumException
-     * @throws \TypeError
-     */
-    function crypto_box_secretkey(
-        #[\SensitiveParameter]
-        $keypair
-    ) {
-        return ParagonIE_Sodium_Compat::crypto_box_secretkey($keypair);
-    }
-}
-if (!is_callable('\\Sodium\\crypto_generichash')) {
-    /**
-     * @see ParagonIE_Sodium_Compat::crypto_generichash()
-     * @param string $message
-     * @param string|null $key
-     * @param int $outLen
-     * @return string
-     * @throws \SodiumException
-     * @throws \TypeError
-     */
-    function crypto_generichash(
-        $message,
-        #[\SensitiveParameter]
-        $key = null,
-        $outLen = 32
-    ) {
-        return ParagonIE_Sodium_Compat::crypto_generichash($message, $key, $outLen);
-    }
-}
-if (!is_callable('\\Sodium\\crypto_generichash_final')) {
-    /**
-     * @see ParagonIE_Sodium_Compat::crypto_generichash_final()
-     * @param string|null $ctx
-     * @param int $outputLength
-     * @return string
-     * @throws \SodiumException
-     * @throws \TypeError
-     */
-    function crypto_generichash_final(
-        #[\SensitiveParameter]
-        &$ctx,
-        $outputLength = 32
-    ) {
-        return ParagonIE_Sodium_Compat::crypto_generichash_final($ctx, $outputLength);
-    }
-}
-if (!is_callable('\\Sodium\\crypto_generichash_init')) {
-    /**
-     * @see ParagonIE_Sodium_Compat::crypto_generichash_init()
-     * @param string|null $key
-     * @param int $outLen
-     * @return string
-     * @throws \SodiumException
-     * @throws \TypeError
-     */
-    function crypto_generichash_init(
-        #[\SensitiveParameter]
-        $key = null,
-        $outLen = 32
-    ) {
-        return ParagonIE_Sodium_Compat::crypto_generichash_init($key, $outLen);
-    }
-}
-if (!is_callable('\\Sodium\\crypto_generichash_update')) {
-    /**
-     * @see ParagonIE_Sodium_Compat::crypto_generichash_update()
-     * @param string|null $ctx
-     * @param string $message
-     * @return void
-     * @throws \SodiumException
-     * @throws \TypeError
-     */
-    function crypto_generichash_update(
-        #[\SensitiveParameter]
-        &$ctx,
-        $message = ''
-    ) {
-        ParagonIE_Sodium_Compat::crypto_generichash_update($ctx, $message);
-    }
-}
-if (!is_callable('\\Sodium\\crypto_kx')) {
-    /**
-     * @see ParagonIE_Sodium_Compat::crypto_kx()
-     * @param string $my_secret
-     * @param string $their_public
-     * @param string $client_public
-     * @param string $server_public
-     * @return string
-     * @throws \SodiumException
-     * @throws \TypeError
-     */
-    function crypto_kx(
-        #[\SensitiveParameter]
-        $my_secret,
-        $their_public,
-        $client_public,
-        $server_public
-    ) {
-        return ParagonIE_Sodium_Compat::crypto_kx(
-            $my_secret,
-            $their_public,
-            $client_public,
-            $server_public,
-            true
-        );
-    }
-}
-if (!is_callable('\\Sodium\\crypto_pwhash')) {
-    /**
-     * @see ParagonIE_Sodium_Compat::crypto_pwhash()
-     * @param int $outlen
-     * @param string $passwd
-     * @param string $salt
-     * @param int $opslimit
-     * @param int $memlimit
-     * @return string
-     * @throws \SodiumException
-     * @throws \TypeError
-     */
-    function crypto_pwhash(
-        $outlen,
-        #[\SensitiveParameter]
-        $passwd,
-        $salt,
-        $opslimit,
-        $memlimit
-    ) {
-        return ParagonIE_Sodium_Compat::crypto_pwhash($outlen, $passwd, $salt, $opslimit, $memlimit);
-    }
-}
-if (!is_callable('\\Sodium\\crypto_pwhash_str')) {
-    /**
-     * @see ParagonIE_Sodium_Compat::crypto_pwhash_str()
-     * @param string $passwd
-     * @param int $opslimit
-     * @param int $memlimit
-     * @return string
-     * @throws \SodiumException
-     * @throws \TypeError
-     */
-    function crypto_pwhash_str(
-        #[\SensitiveParameter]
-        $passwd,
-        $opslimit,
-        $memlimit
-    ) {
-        return ParagonIE_Sodium_Compat::crypto_pwhash_str($passwd, $opslimit, $memlimit);
-    }
-}
-if (!is_callable('\\Sodium\\crypto_pwhash_str_verify')) {
-    /**
-     * @see ParagonIE_Sodium_Compat::crypto_pwhash_str_verify()
-     * @param string $passwd
-     * @param string $hash
-     * @return bool
-     * @throws \SodiumException
-     * @throws \TypeError
-     */
-    function crypto_pwhash_str_verify(
-        #[\SensitiveParameter]
-        $passwd,
-        #[\SensitiveParameter]
-        $hash
-    ) {
-        return ParagonIE_Sodium_Compat::crypto_pwhash_str_verify($passwd, $hash);
-    }
-}
-if (!is_callable('\\Sodium\\crypto_pwhash_scryptsalsa208sha256')) {
-    /**
-     * @see ParagonIE_Sodium_Compat::crypto_pwhash_scryptsalsa208sha256()
-     * @param int $outlen
-     * @param string $passwd
-     * @param string $salt
-     * @param int $opslimit
-     * @param int $memlimit
-     * @return string
-     * @throws \SodiumException
-     * @throws \TypeError
-     */
-    function crypto_pwhash_scryptsalsa208sha256(
-        $outlen,
-        #[\SensitiveParameter]
-        $passwd,
-        #[\SensitiveParameter]
-        $salt,
-        $opslimit,
-        $memlimit
-    ) {
-        return ParagonIE_Sodium_Compat::crypto_pwhash_scryptsalsa208sha256($outlen, $passwd, $salt, $opslimit, $memlimit);
-    }
-}
-if (!is_callable('\\Sodium\\crypto_pwhash_scryptsalsa208sha256_str')) {
-    /**
-     * @see ParagonIE_Sodium_Compat::crypto_pwhash_scryptsalsa208sha256_str()
-     * @param string $passwd
-     * @param int $opslimit
-     * @param int $memlimit
-     * @return string
-     * @throws \SodiumException
-     * @throws \TypeError
-     */
-    function crypto_pwhash_scryptsalsa208sha256_str(
-        #[\SensitiveParameter]
-        $passwd,
-        $opslimit,
-        $memlimit
-    ) {
-        return ParagonIE_Sodium_Compat::crypto_pwhash_scryptsalsa208sha256_str($passwd, $opslimit, $memlimit);
-    }
-}
-if (!is_callable('\\Sodium\\crypto_pwhash_scryptsalsa208sha256_str_verify')) {
-    /**
-     * @see ParagonIE_Sodium_Compat::crypto_pwhash_scryptsalsa208sha256_str_verify()
-     * @param string $passwd
-     * @param string $hash
-     * @return bool
-     * @throws \SodiumException
-     * @throws \TypeError
-     */
-    function crypto_pwhash_scryptsalsa208sha256_str_verify(
-        #[\SensitiveParameter]
-        $passwd,
-        #[\SensitiveParameter]
-        $hash
-    ) {
-        return ParagonIE_Sodium_Compat::crypto_pwhash_scryptsalsa208sha256_str_verify($passwd, $hash);
-    }
-}
-if (!is_callable('\\Sodium\\crypto_scalarmult')) {
-    /**
-     * @see ParagonIE_Sodium_Compat::crypto_scalarmult()
-     * @param string $n
-     * @param string $p
-     * @return string
-     * @throws \SodiumException
-     * @throws \TypeError
-     */
-    function crypto_scalarmult(
-        #[\SensitiveParameter]
-        $n,
-        $p
-    ) {
-        return ParagonIE_Sodium_Compat::crypto_scalarmult($n, $p);
-    }
-}
-if (!is_callable('\\Sodium\\crypto_scalarmult_base')) {
-    /**
-     * @see ParagonIE_Sodium_Compat::crypto_scalarmult_base()
-     * @param string $n
-     * @return string
-     * @throws \SodiumException
-     * @throws \TypeError
-     */
-    function crypto_scalarmult_base(
-        #[\SensitiveParameter]
-        $n
-    ) {
-        return ParagonIE_Sodium_Compat::crypto_scalarmult_base($n);
-    }
-}
-if (!is_callable('\\Sodium\\crypto_secretbox')) {
-    /**
-     * @see ParagonIE_Sodium_Compat::crypto_secretbox()
-     * @param string $message
-     * @param string $nonce
-     * @param string $key
-     * @return string
-     * @throws \SodiumException
-     * @throws \TypeError
-     */
-    function crypto_secretbox(
-        #[\SensitiveParameter]
-        $message,
-        $nonce,
-        #[\SensitiveParameter]
-        $key
-    ) {
-        return ParagonIE_Sodium_Compat::crypto_secretbox($message, $nonce, $key);
-    }
-}
-if (!is_callable('\\Sodium\\crypto_secretbox_open')) {
-    /**
-     * @see ParagonIE_Sodium_Compat::crypto_secretbox_open()
-     * @param string $message
-     * @param string $nonce
-     * @param string $key
-     * @return string|bool
-     */
-    function crypto_secretbox_open(
-        $message,
-        $nonce,
-        #[\SensitiveParameter]
-        $key
-    ) {
-        try {
-            return ParagonIE_Sodium_Compat::crypto_secretbox_open($message, $nonce, $key);
-        } catch (\TypeError $ex) {
-            return false;
-        } catch (\SodiumException $ex) {
-            return false;
-        }
-    }
-}
-if (!is_callable('\\Sodium\\crypto_shorthash')) {
-    /**
-     * @see ParagonIE_Sodium_Compat::crypto_shorthash()
-     * @param string $message
-     * @param string $key
-     * @return string
-     * @throws \SodiumException
-     * @throws \TypeError
-     */
-    function crypto_shorthash(
-        $message,
-        #[\SensitiveParameter]
-        $key = ''
-    ) {
-        return ParagonIE_Sodium_Compat::crypto_shorthash($message, $key);
-    }
-}
-if (!is_callable('\\Sodium\\crypto_sign')) {
-    /**
-     * @see ParagonIE_Sodium_Compat::crypto_sign()
-     * @param string $message
-     * @param string $sk
-     * @return string
-     * @throws \SodiumException
-     * @throws \TypeError
-     */
-    function crypto_sign(
-        $message,
-        #[\SensitiveParameter]
-        $sk
-    ) {
-        return ParagonIE_Sodium_Compat::crypto_sign($message, $sk);
-    }
-}
-if (!is_callable('\\Sodium\\crypto_sign_detached')) {
-    /**
-     * @see ParagonIE_Sodium_Compat::crypto_sign_detached()
-     * @param string $message
-     * @param string $sk
-     * @return string
-     * @throws \SodiumException
-     * @throws \TypeError
-     */
-    function crypto_sign_detached(
-        $message,
-        #[\SensitiveParameter]
-        $sk
-    ) {
-        return ParagonIE_Sodium_Compat::crypto_sign_detached($message, $sk);
-    }
-}
-if (!is_callable('\\Sodium\\crypto_sign_keypair')) {
-    /**
-     * @see ParagonIE_Sodium_Compat::crypto_sign_keypair()
-     * @return string
-     * @throws \SodiumException
-     * @throws \TypeError
-     */
-    function crypto_sign_keypair()
-    {
-        return ParagonIE_Sodium_Compat::crypto_sign_keypair();
-    }
-}
-if (!is_callable('\\Sodium\\crypto_sign_open')) {
-    /**
-     * @see ParagonIE_Sodium_Compat::crypto_sign_open()
-     * @param string $signedMessage
-     * @param string $pk
-     * @return string|bool
-     */
-    function crypto_sign_open($signedMessage, $pk)
-    {
-        try {
-            return ParagonIE_Sodium_Compat::crypto_sign_open($signedMessage, $pk);
-        } catch (\TypeError $ex) {
-            return false;
-        } catch (\SodiumException $ex) {
-            return false;
-        }
-    }
-}
-if (!is_callable('\\Sodium\\crypto_sign_publickey')) {
-    /**
-     * @see ParagonIE_Sodium_Compat::crypto_sign_publickey()
-     * @param string $keypair
-     * @return string
-     * @throws \SodiumException
-     * @throws \TypeError
-     */
-    function crypto_sign_publickey(
-        #[\SensitiveParameter]
-        $keypair
-    ) {
-        return ParagonIE_Sodium_Compat::crypto_sign_publickey($keypair);
-    }
-}
-if (!is_callable('\\Sodium\\crypto_sign_publickey_from_secretkey')) {
-    /**
-     * @see ParagonIE_Sodium_Compat::crypto_sign_publickey_from_secretkey()
-     * @param string $sk
-     * @return string
-     * @throws \SodiumException
-     * @throws \TypeError
-     */
-    function crypto_sign_publickey_from_secretkey(
-        #[\SensitiveParameter]
-        $sk
-    ) {
-        return ParagonIE_Sodium_Compat::crypto_sign_publickey_from_secretkey($sk);
-    }
-}
-if (!is_callable('\\Sodium\\crypto_sign_secretkey')) {
-    /**
-     * @see ParagonIE_Sodium_Compat::crypto_sign_secretkey()
-     * @param string $keypair
-     * @return string
-     * @throws \SodiumException
-     * @throws \TypeError
-     */
-    function crypto_sign_secretkey(
-        #[\SensitiveParameter]
-        $keypair
-    ) {
-        return ParagonIE_Sodium_Compat::crypto_sign_secretkey($keypair);
-    }
-}
-if (!is_callable('\\Sodium\\crypto_sign_seed_keypair')) {
-    /**
-     * @see ParagonIE_Sodium_Compat::crypto_sign_seed_keypair()
-     * @param string $seed
-     * @return string
-     * @throws \SodiumException
-     * @throws \TypeError
-     */
-    function crypto_sign_seed_keypair(
-        #[\SensitiveParameter]
-        $seed
-    ) {
-        return ParagonIE_Sodium_Compat::crypto_sign_seed_keypair($seed);
-    }
-}
-if (!is_callable('\\Sodium\\crypto_sign_verify_detached')) {
-    /**
-     * @see ParagonIE_Sodium_Compat::crypto_sign_verify_detached()
-     * @param string $signature
-     * @param string $message
-     * @param string $pk
-     * @return bool
-     * @throws \SodiumException
-     * @throws \TypeError
-     */
-    function crypto_sign_verify_detached($signature, $message, $pk)
-    {
-        return ParagonIE_Sodium_Compat::crypto_sign_verify_detached($signature, $message, $pk);
-    }
-}
-if (!is_callable('\\Sodium\\crypto_sign_ed25519_pk_to_curve25519')) {
-    /**
-     * @see ParagonIE_Sodium_Compat::crypto_sign_ed25519_pk_to_curve25519()
-     * @param string $pk
-     * @return string
-     * @throws \SodiumException
-     * @throws \TypeError
-     */
-    function crypto_sign_ed25519_pk_to_curve25519($pk)
-    {
-        return ParagonIE_Sodium_Compat::crypto_sign_ed25519_pk_to_curve25519($pk);
-    }
-}
-if (!is_callable('\\Sodium\\crypto_sign_ed25519_sk_to_curve25519')) {
-    /**
-     * @see ParagonIE_Sodium_Compat::crypto_sign_ed25519_sk_to_curve25519()
-     * @param string $sk
-     * @return string
-     * @throws \SodiumException
-     * @throws \TypeError
-     */
-    function crypto_sign_ed25519_sk_to_curve25519(
-        #[\SensitiveParameter]
-        $sk
-    ) {
-        return ParagonIE_Sodium_Compat::crypto_sign_ed25519_sk_to_curve25519($sk);
-    }
-}
-if (!is_callable('\\Sodium\\crypto_stream')) {
-    /**
-     * @see ParagonIE_Sodium_Compat::crypto_stream()
-     * @param int $len
-     * @param string $nonce
-     * @param string $key
-     * @return string
-     * @throws \SodiumException
-     * @throws \TypeError
-     */
-    function crypto_stream(
-        $len,
-        $nonce,
-        #[\SensitiveParameter]
-        $key
-    ) {
-        return ParagonIE_Sodium_Compat::crypto_stream($len, $nonce, $key);
-    }
-}
-if (!is_callable('\\Sodium\\crypto_stream_xor')) {
-    /**
-     * @see ParagonIE_Sodium_Compat::crypto_stream_xor()
-     * @param string $message
-     * @param string $nonce
-     * @param string $key
-     * @return string
-     * @throws \SodiumException
-     * @throws \TypeError
-     */
-    function crypto_stream_xor(
-        #[\SensitiveParameter]
-        $message,
-        $nonce,
-        #[\SensitiveParameter]
-        $key
-    ) {
-        return ParagonIE_Sodium_Compat::crypto_stream_xor($message, $nonce, $key);
-    }
-}
-if (!is_callable('\\Sodium\\hex2bin')) {
-    /**
-     * @see ParagonIE_Sodium_Compat::hex2bin()
-     * @param string $string
-     * @return string
-     * @throws \SodiumException
-     * @throws \TypeError
-     */
-    function hex2bin(
-        #[\SensitiveParameter]
-        $string
-    ) {
-        return ParagonIE_Sodium_Compat::hex2bin($string);
-    }
-}
-if (!is_callable('\\Sodium\\memcmp')) {
-    /**
-     * @see ParagonIE_Sodium_Compat::memcmp()
-     * @param string $a
-     * @param string $b
-     * @return int
-     * @throws \SodiumException
-     * @throws \TypeError
-     */
-    function memcmp(
-        #[\SensitiveParameter]
-        $a,
-        #[\SensitiveParameter]
-        $b
-    ) {
-        return ParagonIE_Sodium_Compat::memcmp($a, $b);
-    }
-}
-if (!is_callable('\\Sodium\\memzero')) {
-    /**
-     * @see ParagonIE_Sodium_Compat::memzero()
-     * @param string $str
-     * @return void
-     * @throws \SodiumException
-     * @throws \TypeError
-     *
-     * @psalm-suppress MissingParamType
-     * @psalm-suppress MissingReturnType
-     * @psalm-suppress ReferenceConstraintViolation
-     */
-    function memzero(
-        #[\SensitiveParameter]
-        &$str
-    ) {
-        ParagonIE_Sodium_Compat::memzero($str);
-    }
-}
-if (!is_callable('\\Sodium\\randombytes_buf')) {
-    /**
-     * @see ParagonIE_Sodium_Compat::randombytes_buf()
-     * @param int $amount
-     * @return string
-     * @throws \TypeError
-     */
-    function randombytes_buf($amount)
-    {
-        return ParagonIE_Sodium_Compat::randombytes_buf($amount);
-    }
-}
-
-if (!is_callable('\\Sodium\\randombytes_uniform')) {
-    /**
-     * @see ParagonIE_Sodium_Compat::randombytes_uniform()
-     * @param int $upperLimit
-     * @return int
-     * @throws \SodiumException
-     * @throws \Error
-     */
-    function randombytes_uniform($upperLimit)
-    {
-        return ParagonIE_Sodium_Compat::randombytes_uniform($upperLimit);
-    }
-}
-
-if (!is_callable('\\Sodium\\randombytes_random16')) {
-    /**
-     * @see ParagonIE_Sodium_Compat::randombytes_random16()
-     * @return int
-     */
-    function randombytes_random16()
-    {
-        return ParagonIE_Sodium_Compat::randombytes_random16();
-    }
-}
-
-if (!defined('\\Sodium\\CRYPTO_AUTH_BYTES')) {
-    require_once dirname(__FILE__) . '/constants.php';
-}

diff --git a/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/lib/stream-xchacha20.php b/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/lib/stream-xchacha20.php
index f1c551f91ce48f25ff26e28278dcd1295ac0dd93..93c0a5700275cad016b657f904cb80276ae460c9 100644 (file)
--- a/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/lib/stream-xchacha20.php
+++ b/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/lib/stream-xchacha20.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 if (!is_callable('sodium_crypto_stream_xchacha20')) {
     /**
@@ -11,11 +12,11 @@ if (!is_callable('sodium_crypto_stream_xchacha20')) {
      * @throws TypeError
      */
     function sodium_crypto_stream_xchacha20(
-        $len,
-        $nonce,
+        int $len,
+        string $nonce,
         #[\SensitiveParameter]
-        $key
-    ) {
+        string $key
+    ): string {
         return ParagonIE_Sodium_Compat::crypto_stream_xchacha20($len, $nonce, $key, true);
     }
 }
@@ -25,7 +26,7 @@ if (!is_callable('sodium_crypto_stream_xchacha20_keygen')) {
      * @return string
      * @throws Exception
      */
-    function sodium_crypto_stream_xchacha20_keygen()
+    function sodium_crypto_stream_xchacha20_keygen(): string
     {
         return ParagonIE_Sodium_Compat::crypto_stream_xchacha20_keygen();
     }
@@ -42,11 +43,11 @@ if (!is_callable('sodium_crypto_stream_xchacha20_xor')) {
      */
     function sodium_crypto_stream_xchacha20_xor(
         #[\SensitiveParameter]
-        $message,
-        $nonce,
+        string $message,
+        string $nonce,
         #[\SensitiveParameter]
-        $key
-    ) {
+        string $key
+    ): string {
         return ParagonIE_Sodium_Compat::crypto_stream_xchacha20_xor($message, $nonce, $key, true);
     }
 }
@@ -63,12 +64,12 @@ if (!is_callable('sodium_crypto_stream_xchacha20_xor_ic')) {
      */
     function sodium_crypto_stream_xchacha20_xor_ic(
         #[\SensitiveParameter]
-        $message,
-        $nonce,
-        $counter,
+        string $message,
+        string $nonce,
+        int $counter,
         #[\SensitiveParameter]
-        $key
-    ) {
+        string $key
+    ): string {
         return ParagonIE_Sodium_Compat::crypto_stream_xchacha20_xor_ic($message, $nonce, $counter, $key, true);
     }
 }

diff --git a/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Compat.php b/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Compat.php
index 7c4cd7031f126caffb3b38ed38d9315f8b3582f8..5bbf2a350fee8d9d9642c135aad3f63ef2c8277a 100644 (file)
--- a/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Compat.php
+++ b/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Compat.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 /**
  * Libsodium compatibility layer
@@ -33,7 +34,7 @@ class ParagonIE_Sodium_Compat
      *
      * @var bool
      */
-    public static $disableFallbackForUnitTests = false;
+    public static bool $disableFallbackForUnitTests = false;
 
     /**
      * Use fast multiplication rather than our constant-time multiplication
@@ -42,7 +43,7 @@ class ParagonIE_Sodium_Compat
      *
      * @var bool
      */
-    public static $fastMult = false;
+    public static bool $fastMult = false;
 
     const LIBRARY_MAJOR_VERSION = 9;
     const LIBRARY_MINOR_VERSION = 1;
@@ -164,11 +165,11 @@ class ParagonIE_Sodium_Compat
      * @throws SodiumException
      */
     public static function add(
-        #[\SensitiveParameter]
-        &$val,
-        #[\SensitiveParameter]
-        $addv
-    ) {
+        #[SensitiveParameter]
+        string &$val,
+        #[SensitiveParameter]
+        string $addv
+    ): void {
         $val_len = ParagonIE_Sodium_Core_Util::strlen($val);
         $addv_len = ParagonIE_Sodium_Core_Util::strlen($addv);
         if ($val_len !== $addv_len) {
@@ -194,16 +195,11 @@ class ParagonIE_Sodium_Compat
      * @throws SodiumException
      */
     public static function base642bin(
-        #[\SensitiveParameter]
-        $encoded,
-        $variant,
-        $ignore = ''
-    ) {
-        /* Type checks: */
-        ParagonIE_Sodium_Core_Util::declareScalarType($encoded, 'string', 1);
-
-        /** @var string $encoded */
-        $encoded = (string) $encoded;
+        #[SensitiveParameter]
+        string $encoded,
+        int $variant,
+        string $ignore = ''
+    ): string {
         if (ParagonIE_Sodium_Core_Util::strlen($encoded) === 0) {
             return '';
         }
@@ -214,18 +210,13 @@ class ParagonIE_Sodium_Compat
         }
 
         try {
-            switch ($variant) {
-                case self::BASE64_VARIANT_ORIGINAL:
-                    return ParagonIE_Sodium_Core_Base64_Original::decode($encoded, true);
-                case self::BASE64_VARIANT_ORIGINAL_NO_PADDING:
-                    return ParagonIE_Sodium_Core_Base64_Original::decode($encoded, false);
-                case self::BASE64_VARIANT_URLSAFE:
-                    return ParagonIE_Sodium_Core_Base64_UrlSafe::decode($encoded, true);
-                case self::BASE64_VARIANT_URLSAFE_NO_PADDING:
-                    return ParagonIE_Sodium_Core_Base64_UrlSafe::decode($encoded, false);
-                default:
-                    throw new SodiumException('invalid base64 variant identifier');
-            }
+            return match ($variant) {
+                self::BASE64_VARIANT_ORIGINAL => ParagonIE_Sodium_Core_Base64_Original::decode($encoded, true),
+                self::BASE64_VARIANT_ORIGINAL_NO_PADDING => ParagonIE_Sodium_Core_Base64_Original::decode($encoded),
+                self::BASE64_VARIANT_URLSAFE => ParagonIE_Sodium_Core_Base64_UrlSafe::decode($encoded, true),
+                self::BASE64_VARIANT_URLSAFE_NO_PADDING => ParagonIE_Sodium_Core_Base64_UrlSafe::decode($encoded),
+                default => throw new SodiumException('invalid base64 variant identifier'),
+            };
         } catch (Exception $ex) {
             if ($ex instanceof SodiumException) {
                 throw $ex;
@@ -241,30 +232,21 @@ class ParagonIE_Sodium_Compat
      * @throws SodiumException
      */
     public static function bin2base64(
-        #[\SensitiveParameter]
-        $decoded,
-        $variant
-    ) {
-        /* Type checks: */
-        ParagonIE_Sodium_Core_Util::declareScalarType($decoded, 'string', 1);
-        /** @var string $decoded */
-        $decoded = (string) $decoded;
+        #[SensitiveParameter]
+        string $decoded,
+        int $variant
+    ): string {
         if (ParagonIE_Sodium_Core_Util::strlen($decoded) === 0) {
             return '';
         }
 
-        switch ($variant) {
-            case self::BASE64_VARIANT_ORIGINAL:
-                return ParagonIE_Sodium_Core_Base64_Original::encode($decoded);
-            case self::BASE64_VARIANT_ORIGINAL_NO_PADDING:
-                return ParagonIE_Sodium_Core_Base64_Original::encodeUnpadded($decoded);
-            case self::BASE64_VARIANT_URLSAFE:
-                return ParagonIE_Sodium_Core_Base64_UrlSafe::encode($decoded);
-            case self::BASE64_VARIANT_URLSAFE_NO_PADDING:
-                return ParagonIE_Sodium_Core_Base64_UrlSafe::encodeUnpadded($decoded);
-            default:
-                throw new SodiumException('invalid base64 variant identifier');
-        }
+        return match ($variant) {
+            self::BASE64_VARIANT_ORIGINAL => ParagonIE_Sodium_Core_Base64_Original::encode($decoded),
+            self::BASE64_VARIANT_ORIGINAL_NO_PADDING => ParagonIE_Sodium_Core_Base64_Original::encodeUnpadded($decoded),
+            self::BASE64_VARIANT_URLSAFE => ParagonIE_Sodium_Core_Base64_UrlSafe::encode($decoded),
+            self::BASE64_VARIANT_URLSAFE_NO_PADDING => ParagonIE_Sodium_Core_Base64_UrlSafe::encodeUnpadded($decoded),
+            default => throw new SodiumException('invalid base64 variant identifier'),
+        };
     }
 
     /**
@@ -274,17 +256,13 @@ class ParagonIE_Sodium_Compat
      * @return string        A hexadecimal-encoded string
      * @throws SodiumException
      * @throws TypeError
-     * @psalm-suppress MixedArgument
      */
     public static function bin2hex(
-        #[\SensitiveParameter]
-        $string
-    ) {
-        /* Type checks: */
-        ParagonIE_Sodium_Core_Util::declareScalarType($string, 'string', 1);
-
+        #[SensitiveParameter]
+        string $string
+    ): string {
         if (self::useNewSodiumAPI()) {
-            return (string) sodium_bin2hex($string);
+            return sodium_bin2hex($string);
         }
         if (self::use_fallback('bin2hex')) {
             return (string) call_user_func('\\Sodium\\bin2hex', $string);
@@ -303,20 +281,15 @@ class ParagonIE_Sodium_Compat
      *                      If > 0 if the right operand is less than the left
      * @throws SodiumException
      * @throws TypeError
-     * @psalm-suppress MixedArgument
      */
     public static function compare(
-        #[\SensitiveParameter]
-        $left,
-        #[\SensitiveParameter]
-        $right
-    ) {
-        /* Type checks: */
-        ParagonIE_Sodium_Core_Util::declareScalarType($left, 'string', 1);
-        ParagonIE_Sodium_Core_Util::declareScalarType($right, 'string', 2);
-
+        #[SensitiveParameter]
+        string $left,
+        #[SensitiveParameter]
+        string $right
+    ): int {
         if (self::useNewSodiumAPI()) {
-            return (int) sodium_compare($left, $right);
+            return sodium_compare($left, $right);
         }
         if (self::use_fallback('compare')) {
             return (int) call_user_func('\\Sodium\\compare', $left, $right);
@@ -338,22 +311,14 @@ class ParagonIE_Sodium_Compat
      * @return string            The original plaintext message
      * @throws SodiumException
      * @throws TypeError
-     * @psalm-suppress MixedArgument
-     * @psalm-suppress MixedInferredReturnType
-     * @psalm-suppress MixedReturnStatement
      */
     public static function crypto_aead_aegis128l_decrypt(
-        $ciphertext = '',
-        $assocData = '',
-        $nonce = '',
-        #[\SensitiveParameter]
-        $key = ''
-    ) {
-        ParagonIE_Sodium_Core_Util::declareScalarType($ciphertext, 'string', 1);
-        ParagonIE_Sodium_Core_Util::declareScalarType($assocData, 'string', 2);
-        ParagonIE_Sodium_Core_Util::declareScalarType($nonce, 'string', 3);
-        ParagonIE_Sodium_Core_Util::declareScalarType($key, 'string', 4);
-
+        string $ciphertext = '',
+        string $assocData = '',
+        string $nonce = '',
+        #[SensitiveParameter]
+        string $key = ''
+    ): string {
         /* Input validation: */
         if (ParagonIE_Sodium_Core_Util::strlen($nonce) !== self::CRYPTO_AEAD_AEGIS128L_NPUBBYTES) {
             throw new SodiumException('Nonce must be CRYPTO_AEAD_AEGIS_128L_NPUBBYTES long');
@@ -393,21 +358,15 @@ class ParagonIE_Sodium_Compat
      * @return string           Ciphertext with 32-byte authentication tag appended
      * @throws SodiumException
      * @throws TypeError
-     * @psalm-suppress MixedArgument
      */
     public static function crypto_aead_aegis128l_encrypt(
-        #[\SensitiveParameter]
-        $plaintext = '',
-        $assocData = '',
-        $nonce = '',
-        #[\SensitiveParameter]
-        $key = ''
-    ) {
-        ParagonIE_Sodium_Core_Util::declareScalarType($plaintext, 'string', 1);
-        ParagonIE_Sodium_Core_Util::declareScalarType($assocData, 'string', 2);
-        ParagonIE_Sodium_Core_Util::declareScalarType($nonce, 'string', 3);
-        ParagonIE_Sodium_Core_Util::declareScalarType($key, 'string', 4);
-
+        #[SensitiveParameter]
+        string $plaintext = '',
+        string $assocData = '',
+        string $nonce = '',
+        #[SensitiveParameter]
+        string $key = ''
+    ): string {
         /* Input validation: */
         if (ParagonIE_Sodium_Core_Util::strlen($nonce) !== self::CRYPTO_AEAD_AEGIS128L_NPUBBYTES) {
             throw new SodiumException('Nonce must be CRYPTO_AEAD_AEGIS128L_KEYBYTES long');
@@ -428,7 +387,7 @@ class ParagonIE_Sodium_Compat
      * @throws Exception
      * @throws Error
      */
-    public static function crypto_aead_aegis128l_keygen()
+    public static function crypto_aead_aegis128l_keygen(): string
     {
         return random_bytes(self::CRYPTO_AEAD_AEGIS128L_KEYBYTES);
     }
@@ -444,25 +403,17 @@ class ParagonIE_Sodium_Compat
      * @param string $nonce      Number to be used only Once; must be 32 bytes
      * @param string $key        Encryption key
      *
-     * @return string            The original plaintext message
+     * @return string|bool       The original plaintext message
      * @throws SodiumException
      * @throws TypeError
-     * @psalm-suppress MixedArgument
-     * @psalm-suppress MixedInferredReturnType
-     * @psalm-suppress MixedReturnStatement
      */
     public static function crypto_aead_aegis256_decrypt(
-        $ciphertext = '',
-        $assocData = '',
-        $nonce = '',
-        #[\SensitiveParameter]
-        $key = ''
-    ) {
-        ParagonIE_Sodium_Core_Util::declareScalarType($ciphertext, 'string', 1);
-        ParagonIE_Sodium_Core_Util::declareScalarType($assocData, 'string', 2);
-        ParagonIE_Sodium_Core_Util::declareScalarType($nonce, 'string', 3);
-        ParagonIE_Sodium_Core_Util::declareScalarType($key, 'string', 4);
-
+        string $ciphertext = '',
+        string $assocData = '',
+        string $nonce = '',
+        #[SensitiveParameter]
+        string $key = ''
+    ): string|bool {
         /* Input validation: */
         if (ParagonIE_Sodium_Core_Util::strlen($nonce) !== self::CRYPTO_AEAD_AEGIS256_NPUBBYTES) {
             throw new SodiumException('Nonce must be CRYPTO_AEAD_AEGIS256_NPUBBYTES long');
@@ -502,21 +453,15 @@ class ParagonIE_Sodium_Compat
      * @return string           Ciphertext with 32-byte authentication tag appended
      * @throws SodiumException
      * @throws TypeError
-     * @psalm-suppress MixedArgument
      */
     public static function crypto_aead_aegis256_encrypt(
-        #[\SensitiveParameter]
-        $plaintext = '',
-        $assocData = '',
-        $nonce = '',
-        #[\SensitiveParameter]
-        $key = ''
-    ) {
-        ParagonIE_Sodium_Core_Util::declareScalarType($plaintext, 'string', 1);
-        ParagonIE_Sodium_Core_Util::declareScalarType($assocData, 'string', 2);
-        ParagonIE_Sodium_Core_Util::declareScalarType($nonce, 'string', 3);
-        ParagonIE_Sodium_Core_Util::declareScalarType($key, 'string', 4);
-
+        #[SensitiveParameter]
+        string $plaintext = '',
+        string $assocData = '',
+        string $nonce = '',
+        #[SensitiveParameter]
+        string $key = ''
+    ): string {
         /* Input validation: */
         if (ParagonIE_Sodium_Core_Util::strlen($nonce) !== self::CRYPTO_AEAD_AEGIS256_NPUBBYTES) {
             throw new SodiumException('Nonce must be CRYPTO_AEAD_AEGIS128L_KEYBYTES long');
@@ -537,7 +482,7 @@ class ParagonIE_Sodium_Compat
      * @throws Exception
      * @throws Error
      */
-    public static function crypto_aead_aegis256_keygen()
+    public static function crypto_aead_aegis256_keygen(): string
     {
         return random_bytes(self::CRYPTO_AEAD_AEGIS256_KEYBYTES);
     }
@@ -546,11 +491,8 @@ class ParagonIE_Sodium_Compat
      * Is AES-256-GCM even available to use?
      *
      * @return bool
-     * @psalm-suppress UndefinedFunction
-     * @psalm-suppress MixedInferredReturnType
-     * @psalm-suppress MixedReturnStatement
      */
-    public static function crypto_aead_aes256gcm_is_available()
+    public static function crypto_aead_aes256gcm_is_available(): bool
     {
         if (self::useNewSodiumAPI()) {
             return sodium_crypto_aead_aes256gcm_is_available();
@@ -558,15 +500,11 @@ class ParagonIE_Sodium_Compat
         if (self::use_fallback('crypto_aead_aes256gcm_is_available')) {
             return call_user_func('\\Sodium\\crypto_aead_aes256gcm_is_available');
         }
-        if (PHP_VERSION_ID < 70100) {
-            // OpenSSL doesn't support AEAD before 7.1.0
-            return false;
-        }
         if (!is_callable('openssl_encrypt') || !is_callable('openssl_decrypt')) {
             // OpenSSL isn't installed
             return false;
         }
-        return (bool) in_array('aes-256-gcm', openssl_get_cipher_methods());
+        return in_array('aes-256-gcm', openssl_get_cipher_methods());
     }
 
     /**
@@ -586,25 +524,17 @@ class ParagonIE_Sodium_Compat
      * @return string|bool       The original plaintext message
      * @throws SodiumException
      * @throws TypeError
-     * @psalm-suppress MixedArgument
-     * @psalm-suppress MixedInferredReturnType
-     * @psalm-suppress MixedReturnStatement
      */
     public static function crypto_aead_aes256gcm_decrypt(
-        $ciphertext = '',
-        $assocData = '',
-        $nonce = '',
-        #[\SensitiveParameter]
-        $key = ''
-    ) {
+        string $ciphertext = '',
+        string $assocData = '',
+        string $nonce = '',
+        #[SensitiveParameter]
+        string $key = ''
+    ): string|bool {
         if (!self::crypto_aead_aes256gcm_is_available()) {
             throw new SodiumException('AES-256-GCM is not available');
         }
-        ParagonIE_Sodium_Core_Util::declareScalarType($ciphertext, 'string', 1);
-        ParagonIE_Sodium_Core_Util::declareScalarType($assocData, 'string', 2);
-        ParagonIE_Sodium_Core_Util::declareScalarType($nonce, 'string', 3);
-        ParagonIE_Sodium_Core_Util::declareScalarType($key, 'string', 4);
-
         /* Input validation: */
         if (ParagonIE_Sodium_Core_Util::strlen($nonce) !== self::CRYPTO_AEAD_AES256GCM_NPUBBYTES) {
             throw new SodiumException('Nonce must be CRYPTO_AEAD_AES256GCM_NPUBBYTES long');
@@ -619,9 +549,7 @@ class ParagonIE_Sodium_Compat
             throw new SodiumException('The OpenSSL extension is not installed, or openssl_decrypt() is not available');
         }
 
-        /** @var string $ctext */
         $ctext = ParagonIE_Sodium_Core_Util::substr($ciphertext, 0, -self::CRYPTO_AEAD_AES256GCM_ABYTES);
-        /** @var string $authTag */
         $authTag = ParagonIE_Sodium_Core_Util::substr($ciphertext, -self::CRYPTO_AEAD_AES256GCM_ABYTES, 16);
         return openssl_decrypt(
             $ctext,
@@ -649,23 +577,18 @@ class ParagonIE_Sodium_Compat
      *                          authentication code appended
      * @throws SodiumException
      * @throws TypeError
-     * @psalm-suppress MixedArgument
      */
     public static function crypto_aead_aes256gcm_encrypt(
-        #[\SensitiveParameter]
-        $plaintext = '',
-        $assocData = '',
-        $nonce = '',
-        #[\SensitiveParameter]
-        $key = ''
-    ) {
+        #[SensitiveParameter]
+        string $plaintext = '',
+        string $assocData = '',
+        string $nonce = '',
+        #[SensitiveParameter]
+        string $key = ''
+    ): string {
         if (!self::crypto_aead_aes256gcm_is_available()) {
             throw new SodiumException('AES-256-GCM is not available');
         }
-        ParagonIE_Sodium_Core_Util::declareScalarType($plaintext, 'string', 1);
-        ParagonIE_Sodium_Core_Util::declareScalarType($assocData, 'string', 2);
-        ParagonIE_Sodium_Core_Util::declareScalarType($nonce, 'string', 3);
-        ParagonIE_Sodium_Core_Util::declareScalarType($key, 'string', 4);
 
         /* Input validation: */
         if (ParagonIE_Sodium_Core_Util::strlen($nonce) !== self::CRYPTO_AEAD_AES256GCM_NPUBBYTES) {
@@ -700,7 +623,7 @@ class ParagonIE_Sodium_Compat
      * @throws Exception
      * @throws Error
      */
-    public static function crypto_aead_aes256gcm_keygen()
+    public static function crypto_aead_aes256gcm_keygen(): string
     {
         return random_bytes(self::CRYPTO_AEAD_AES256GCM_KEYBYTES);
     }
@@ -719,26 +642,17 @@ class ParagonIE_Sodium_Compat
      * @param string $nonce      Number to be used only Once; must be 8 bytes
      * @param string $key        Encryption key
      *
-     * @return string            The original plaintext message
+     * @return string|bool       The original plaintext message
      * @throws SodiumException
      * @throws TypeError
-     * @psalm-suppress MixedArgument
-     * @psalm-suppress MixedInferredReturnType
-     * @psalm-suppress MixedReturnStatement
      */
     public static function crypto_aead_chacha20poly1305_decrypt(
-        $ciphertext = '',
-        $assocData = '',
-        $nonce = '',
-        #[\SensitiveParameter]
-        $key = ''
-    ) {
-        /* Type checks: */
-        ParagonIE_Sodium_Core_Util::declareScalarType($ciphertext, 'string', 1);
-        ParagonIE_Sodium_Core_Util::declareScalarType($assocData, 'string', 2);
-        ParagonIE_Sodium_Core_Util::declareScalarType($nonce, 'string', 3);
-        ParagonIE_Sodium_Core_Util::declareScalarType($key, 'string', 4);
-
+        string $ciphertext = '',
+        string $assocData = '',
+        string $nonce = '',
+        #[SensitiveParameter]
+        string $key = ''
+    ): string|bool {
         /* Input validation: */
         if (ParagonIE_Sodium_Core_Util::strlen($nonce) !== self::CRYPTO_AEAD_CHACHA20POLY1305_NPUBBYTES) {
             throw new SodiumException('Nonce must be CRYPTO_AEAD_CHACHA20POLY1305_NPUBBYTES long');
@@ -751,10 +665,6 @@ class ParagonIE_Sodium_Compat
         }
 
         if (self::useNewSodiumAPI()) {
-            /**
-             * @psalm-suppress InvalidReturnStatement
-             * @psalm-suppress FalsableReturnStatement
-             */
             return sodium_crypto_aead_chacha20poly1305_decrypt(
                 $ciphertext,
                 $assocData,
@@ -771,14 +681,6 @@ class ParagonIE_Sodium_Compat
                 $key
             );
         }
-        if (PHP_INT_SIZE === 4) {
-            return ParagonIE_Sodium_Crypto32::aead_chacha20poly1305_decrypt(
-                $ciphertext,
-                $assocData,
-                $nonce,
-                $key
-            );
-        }
         return ParagonIE_Sodium_Crypto::aead_chacha20poly1305_decrypt(
             $ciphertext,
             $assocData,
@@ -805,22 +707,15 @@ class ParagonIE_Sodium_Compat
      *                          authentication code appended
      * @throws SodiumException
      * @throws TypeError
-     * @psalm-suppress MixedArgument
      */
     public static function crypto_aead_chacha20poly1305_encrypt(
-        #[\SensitiveParameter]
-        $plaintext = '',
-        $assocData = '',
-        $nonce = '',
-        #[\SensitiveParameter]
-        $key = ''
-    ) {
-        /* Type checks: */
-        ParagonIE_Sodium_Core_Util::declareScalarType($plaintext, 'string', 1);
-        ParagonIE_Sodium_Core_Util::declareScalarType($assocData, 'string', 2);
-        ParagonIE_Sodium_Core_Util::declareScalarType($nonce, 'string', 3);
-        ParagonIE_Sodium_Core_Util::declareScalarType($key, 'string', 4);
-
+        #[SensitiveParameter]
+        string $plaintext = '',
+        string $assocData = '',
+        string $nonce = '',
+        #[SensitiveParameter]
+        string $key = ''
+    ): string {
         /* Input validation: */
         if (ParagonIE_Sodium_Core_Util::strlen($nonce) !== self::CRYPTO_AEAD_CHACHA20POLY1305_NPUBBYTES) {
             throw new SodiumException('Nonce must be CRYPTO_AEAD_CHACHA20POLY1305_NPUBBYTES long');
@@ -830,7 +725,7 @@ class ParagonIE_Sodium_Compat
         }
 
         if (self::useNewSodiumAPI()) {
-            return (string) sodium_crypto_aead_chacha20poly1305_encrypt(
+            return sodium_crypto_aead_chacha20poly1305_encrypt(
                 $plaintext,
                 $assocData,
                 $nonce,
@@ -846,14 +741,6 @@ class ParagonIE_Sodium_Compat
                 $key
             );
         }
-        if (PHP_INT_SIZE === 4) {
-            return ParagonIE_Sodium_Crypto32::aead_chacha20poly1305_encrypt(
-                $plaintext,
-                $assocData,
-                $nonce,
-                $key
-            );
-        }
         return ParagonIE_Sodium_Crypto::aead_chacha20poly1305_encrypt(
             $plaintext,
             $assocData,
@@ -876,26 +763,17 @@ class ParagonIE_Sodium_Compat
      * @param string $nonce      Number to be used only Once; must be 12 bytes
      * @param string $key        Encryption key
      *
-     * @return string            The original plaintext message
+     * @return string|bool      The original plaintext message
      * @throws SodiumException
      * @throws TypeError
-     * @psalm-suppress MixedArgument
-     * @psalm-suppress MixedInferredReturnType
-     * @psalm-suppress MixedReturnStatement
      */
     public static function crypto_aead_chacha20poly1305_ietf_decrypt(
-        $ciphertext = '',
-        $assocData = '',
-        $nonce = '',
-        #[\SensitiveParameter]
-        $key = ''
-    ) {
-        /* Type checks: */
-        ParagonIE_Sodium_Core_Util::declareScalarType($ciphertext, 'string', 1);
-        ParagonIE_Sodium_Core_Util::declareScalarType($assocData, 'string', 2);
-        ParagonIE_Sodium_Core_Util::declareScalarType($nonce, 'string', 3);
-        ParagonIE_Sodium_Core_Util::declareScalarType($key, 'string', 4);
-
+        string $ciphertext = '',
+        string $assocData = '',
+        string $nonce = '',
+        #[SensitiveParameter]
+        string $key = ''
+    ): string|bool {
         /* Input validation: */
         if (ParagonIE_Sodium_Core_Util::strlen($nonce) !== self::CRYPTO_AEAD_CHACHA20POLY1305_IETF_NPUBBYTES) {
             throw new SodiumException('Nonce must be CRYPTO_AEAD_CHACHA20POLY1305_IETF_NPUBBYTES long');
@@ -908,10 +786,6 @@ class ParagonIE_Sodium_Compat
         }
 
         if (self::useNewSodiumAPI()) {
-            /**
-             * @psalm-suppress InvalidReturnStatement
-             * @psalm-suppress FalsableReturnStatement
-             */
             return sodium_crypto_aead_chacha20poly1305_ietf_decrypt(
                 $ciphertext,
                 $assocData,
@@ -928,14 +802,6 @@ class ParagonIE_Sodium_Compat
                 $key
             );
         }
-        if (PHP_INT_SIZE === 4) {
-            return ParagonIE_Sodium_Crypto32::aead_chacha20poly1305_ietf_decrypt(
-                $ciphertext,
-                $assocData,
-                $nonce,
-                $key
-            );
-        }
         return ParagonIE_Sodium_Crypto::aead_chacha20poly1305_ietf_decrypt(
             $ciphertext,
             $assocData,
@@ -952,7 +818,7 @@ class ParagonIE_Sodium_Compat
      * @throws Exception
      * @throws Error
      */
-    public static function crypto_aead_chacha20poly1305_keygen()
+    public static function crypto_aead_chacha20poly1305_keygen(): string
     {
         return random_bytes(self::CRYPTO_AEAD_CHACHA20POLY1305_KEYBYTES);
     }
@@ -975,24 +841,15 @@ class ParagonIE_Sodium_Compat
      *                          authentication code appended
      * @throws SodiumException
      * @throws TypeError
-     * @psalm-suppress MixedArgument
      */
     public static function crypto_aead_chacha20poly1305_ietf_encrypt(
-        #[\SensitiveParameter]
-        $plaintext = '',
-        $assocData = '',
-        $nonce = '',
-        #[\SensitiveParameter]
-        $key = ''
-    ) {
-        /* Type checks: */
-        ParagonIE_Sodium_Core_Util::declareScalarType($plaintext, 'string', 1);
-        if (!is_null($assocData)) {
-            ParagonIE_Sodium_Core_Util::declareScalarType($assocData, 'string', 2);
-        }
-        ParagonIE_Sodium_Core_Util::declareScalarType($nonce, 'string', 3);
-        ParagonIE_Sodium_Core_Util::declareScalarType($key, 'string', 4);
-
+        #[SensitiveParameter]
+        string $plaintext = '',
+        string $assocData = '',
+        string $nonce = '',
+        #[SensitiveParameter]
+        string $key = ''
+    ): string {
         /* Input validation: */
         if (ParagonIE_Sodium_Core_Util::strlen($nonce) !== self::CRYPTO_AEAD_CHACHA20POLY1305_IETF_NPUBBYTES) {
             throw new SodiumException('Nonce must be CRYPTO_AEAD_CHACHA20POLY1305_IETF_NPUBBYTES long');
@@ -1002,7 +859,7 @@ class ParagonIE_Sodium_Compat
         }
 
         if (self::useNewSodiumAPI()) {
-            return (string) sodium_crypto_aead_chacha20poly1305_ietf_encrypt(
+            return sodium_crypto_aead_chacha20poly1305_ietf_encrypt(
                 $plaintext,
                 $assocData,
                 $nonce,
@@ -1018,14 +875,6 @@ class ParagonIE_Sodium_Compat
                 $key
             );
         }
-        if (PHP_INT_SIZE === 4) {
-            return ParagonIE_Sodium_Crypto32::aead_chacha20poly1305_ietf_encrypt(
-                $plaintext,
-                $assocData,
-                $nonce,
-                $key
-            );
-        }
         return ParagonIE_Sodium_Crypto::aead_chacha20poly1305_ietf_encrypt(
             $plaintext,
             $assocData,
@@ -1042,7 +891,7 @@ class ParagonIE_Sodium_Compat
      * @throws Exception
      * @throws Error
      */
-    public static function crypto_aead_chacha20poly1305_ietf_keygen()
+    public static function crypto_aead_chacha20poly1305_ietf_keygen(): string
     {
         return random_bytes(self::CRYPTO_AEAD_CHACHA20POLY1305_IETF_KEYBYTES);
     }
@@ -1065,26 +914,15 @@ class ParagonIE_Sodium_Compat
      * @return string|bool         The original plaintext message
      * @throws SodiumException
      * @throws TypeError
-     * @psalm-suppress MixedArgument
      */
     public static function crypto_aead_xchacha20poly1305_ietf_decrypt(
-        $ciphertext = '',
-        $assocData = '',
-        $nonce = '',
-        #[\SensitiveParameter]
-        $key = '',
-        $dontFallback = false
-    ) {
-        /* Type checks: */
-        ParagonIE_Sodium_Core_Util::declareScalarType($ciphertext, 'string', 1);
-        if (!is_null($assocData)) {
-            ParagonIE_Sodium_Core_Util::declareScalarType($assocData, 'string', 2);
-        } else {
-            $assocData = '';
-        }
-        ParagonIE_Sodium_Core_Util::declareScalarType($nonce, 'string', 3);
-        ParagonIE_Sodium_Core_Util::declareScalarType($key, 'string', 4);
-
+        string $ciphertext = '',
+        string $assocData = '',
+        string $nonce = '',
+        #[SensitiveParameter]
+        string $key = '',
+        bool $dontFallback = false
+    ): string|bool {
         /* Input validation: */
         if (ParagonIE_Sodium_Core_Util::strlen($nonce) !== self::CRYPTO_AEAD_XCHACHA20POLY1305_IETF_NPUBBYTES) {
             throw new SodiumException('Nonce must be CRYPTO_AEAD_XCHACHA20POLY1305_IETF_NPUBBYTES long');
@@ -1106,14 +944,6 @@ class ParagonIE_Sodium_Compat
             }
         }
 
-        if (PHP_INT_SIZE === 4) {
-            return ParagonIE_Sodium_Crypto32::aead_xchacha20poly1305_ietf_decrypt(
-                $ciphertext,
-                $assocData,
-                $nonce,
-                $key
-            );
-        }
         return ParagonIE_Sodium_Crypto::aead_xchacha20poly1305_ietf_decrypt(
             $ciphertext,
             $assocData,
@@ -1141,27 +971,16 @@ class ParagonIE_Sodium_Compat
      *                          authentication code appended
      * @throws SodiumException
      * @throws TypeError
-     * @psalm-suppress MixedArgument
      */
     public static function crypto_aead_xchacha20poly1305_ietf_encrypt(
-        #[\SensitiveParameter]
-        $plaintext = '',
-        $assocData = '',
-        $nonce = '',
-        #[\SensitiveParameter]
-        $key = '',
-        $dontFallback = false
-    ) {
-        /* Type checks: */
-        ParagonIE_Sodium_Core_Util::declareScalarType($plaintext, 'string', 1);
-        if (!is_null($assocData)) {
-            ParagonIE_Sodium_Core_Util::declareScalarType($assocData, 'string', 2);
-        } else {
-            $assocData = '';
-        }
-        ParagonIE_Sodium_Core_Util::declareScalarType($nonce, 'string', 3);
-        ParagonIE_Sodium_Core_Util::declareScalarType($key, 'string', 4);
-
+        #[SensitiveParameter]
+        string $plaintext = '',
+        string $assocData = '',
+        string $nonce = '',
+        #[SensitiveParameter]
+        string $key = '',
+        bool $dontFallback = false
+    ): string {
         /* Input validation: */
         if (ParagonIE_Sodium_Core_Util::strlen($nonce) !== self::CRYPTO_AEAD_XCHACHA20POLY1305_IETF_NPUBBYTES) {
             throw new SodiumException('Nonce must be CRYPTO_AEAD_XCHACHA20POLY1305_NPUBBYTES long');
@@ -1180,14 +999,6 @@ class ParagonIE_Sodium_Compat
             }
         }
 
-        if (PHP_INT_SIZE === 4) {
-            return ParagonIE_Sodium_Crypto32::aead_xchacha20poly1305_ietf_encrypt(
-                $plaintext,
-                $assocData,
-                $nonce,
-                $key
-            );
-        }
         return ParagonIE_Sodium_Crypto::aead_xchacha20poly1305_ietf_encrypt(
             $plaintext,
             $assocData,
@@ -1204,7 +1015,7 @@ class ParagonIE_Sodium_Compat
      * @throws Exception
      * @throws Error
      */
-    public static function crypto_aead_xchacha20poly1305_ietf_keygen()
+    public static function crypto_aead_xchacha20poly1305_ietf_keygen(): string
     {
         return random_bytes(self::CRYPTO_AEAD_XCHACHA20POLY1305_IETF_KEYBYTES);
     }
@@ -1224,31 +1035,23 @@ class ParagonIE_Sodium_Compat
      * @return string         Message authentication code
      * @throws SodiumException
      * @throws TypeError
-     * @psalm-suppress MixedArgument
      */
     public static function crypto_auth(
-        $message,
-        #[\SensitiveParameter]
-        $key
-    ) {
-        /* Type checks: */
-        ParagonIE_Sodium_Core_Util::declareScalarType($message, 'string', 1);
-        ParagonIE_Sodium_Core_Util::declareScalarType($key, 'string', 2);
-
+        string $message,
+        #[SensitiveParameter]
+        string $key
+    ): string {
         /* Input validation: */
         if (ParagonIE_Sodium_Core_Util::strlen($key) !== self::CRYPTO_AUTH_KEYBYTES) {
             throw new SodiumException('Argument 2 must be CRYPTO_AUTH_KEYBYTES long.');
         }
 
         if (self::useNewSodiumAPI()) {
-            return (string) sodium_crypto_auth($message, $key);
+            return sodium_crypto_auth($message, $key);
         }
         if (self::use_fallback('crypto_auth')) {
             return (string) call_user_func('\\Sodium\\crypto_auth', $message, $key);
         }
-        if (PHP_INT_SIZE === 4) {
-            return ParagonIE_Sodium_Crypto32::auth($message, $key);
-        }
         return ParagonIE_Sodium_Crypto::auth($message, $key);
     }
 
@@ -1257,7 +1060,7 @@ class ParagonIE_Sodium_Compat
      * @throws Exception
      * @throws Error
      */
-    public static function crypto_auth_keygen()
+    public static function crypto_auth_keygen(): string
     {
         return random_bytes(self::CRYPTO_AUTH_KEYBYTES);
     }
@@ -1272,18 +1075,13 @@ class ParagonIE_Sodium_Compat
      * @return bool           TRUE if authenticated, FALSE otherwise
      * @throws SodiumException
      * @throws TypeError
-     * @psalm-suppress MixedArgument
      */
     public static function crypto_auth_verify(
-        $mac,
-        $message,
-        #[\SensitiveParameter]
-        $key
-    ) {
-        /* Type checks: */
-        ParagonIE_Sodium_Core_Util::declareScalarType($mac, 'string', 1);
-        ParagonIE_Sodium_Core_Util::declareScalarType($message, 'string', 2);
-        ParagonIE_Sodium_Core_Util::declareScalarType($key, 'string', 3);
+        string $mac,
+        string $message,
+        #[SensitiveParameter]
+        string $key
+    ): bool {
 
         /* Input validation: */
         if (ParagonIE_Sodium_Core_Util::strlen($mac) !== self::CRYPTO_AUTH_BYTES) {
@@ -1294,14 +1092,11 @@ class ParagonIE_Sodium_Compat
         }
 
         if (self::useNewSodiumAPI()) {
-            return (bool) sodium_crypto_auth_verify($mac, $message, $key);
+            return sodium_crypto_auth_verify($mac, $message, $key);
         }
         if (self::use_fallback('crypto_auth_verify')) {
             return (bool) call_user_func('\\Sodium\\crypto_auth_verify', $mac, $message, $key);
         }
-        if (PHP_INT_SIZE === 4) {
-            return ParagonIE_Sodium_Crypto32::auth_verify($mac, $message, $key);
-        }
         return ParagonIE_Sodium_Crypto::auth_verify($mac, $message, $key);
     }
 
@@ -1320,19 +1115,14 @@ class ParagonIE_Sodium_Compat
      * @return string           Ciphertext with 16-byte Poly1305 MAC
      * @throws SodiumException
      * @throws TypeError
-     * @psalm-suppress MixedArgument
      */
     public static function crypto_box(
-        $plaintext,
-        $nonce,
-        #[\SensitiveParameter]
-        $keypair
-    ) {
-        /* Type checks: */
-        ParagonIE_Sodium_Core_Util::declareScalarType($plaintext, 'string', 1);
-        ParagonIE_Sodium_Core_Util::declareScalarType($nonce, 'string', 2);
-        ParagonIE_Sodium_Core_Util::declareScalarType($keypair, 'string', 3);
-
+        #[SensitiveParameter]
+        string $plaintext,
+        string $nonce,
+        #[SensitiveParameter]
+        string $keypair
+    ): string {
         /* Input validation: */
         if (ParagonIE_Sodium_Core_Util::strlen($nonce) !== self::CRYPTO_BOX_NONCEBYTES) {
             throw new SodiumException('Argument 2 must be CRYPTO_BOX_NONCEBYTES long.');
@@ -1342,14 +1132,11 @@ class ParagonIE_Sodium_Compat
         }
 
         if (self::useNewSodiumAPI()) {
-            return (string) sodium_crypto_box($plaintext, $nonce, $keypair);
+            return sodium_crypto_box($plaintext, $nonce, $keypair);
         }
         if (self::use_fallback('crypto_box')) {
             return (string) call_user_func('\\Sodium\\crypto_box', $plaintext, $nonce, $keypair);
         }
-        if (PHP_INT_SIZE === 4) {
-            return ParagonIE_Sodium_Crypto32::box($plaintext, $nonce, $keypair);
-        }
         return ParagonIE_Sodium_Crypto::box($plaintext, $nonce, $keypair);
     }
 
@@ -1368,31 +1155,23 @@ class ParagonIE_Sodium_Compat
      *                          decrypt
      * @throws SodiumException
      * @throws TypeError
-     * @psalm-suppress MixedArgument
      */
     public static function crypto_box_seal(
-        #[\SensitiveParameter]
-        $plaintext,
-        $publicKey
-    ) {
-        /* Type checks: */
-        ParagonIE_Sodium_Core_Util::declareScalarType($plaintext, 'string', 1);
-        ParagonIE_Sodium_Core_Util::declareScalarType($publicKey, 'string', 2);
-
+        #[SensitiveParameter]
+        string $plaintext,
+        string $publicKey
+    ): string {
         /* Input validation: */
         if (ParagonIE_Sodium_Core_Util::strlen($publicKey) !== self::CRYPTO_BOX_PUBLICKEYBYTES) {
             throw new SodiumException('Argument 2 must be CRYPTO_BOX_PUBLICKEYBYTES long.');
         }
 
         if (self::useNewSodiumAPI()) {
-            return (string) sodium_crypto_box_seal($plaintext, $publicKey);
+            return sodium_crypto_box_seal($plaintext, $publicKey);
         }
         if (self::use_fallback('crypto_box_seal')) {
             return (string) call_user_func('\\Sodium\\crypto_box_seal', $plaintext, $publicKey);
         }
-        if (PHP_INT_SIZE === 4) {
-            return ParagonIE_Sodium_Crypto32::box_seal($plaintext, $publicKey);
-        }
         return ParagonIE_Sodium_Crypto::box_seal($plaintext, $publicKey);
     }
 
@@ -1404,40 +1183,25 @@ class ParagonIE_Sodium_Compat
      *
      * @param string $ciphertext Sealed message to be opened
      * @param string $keypair    Your crypto_box keypair
-     * @return string            The original plaintext message
+     * @return string|bool       The original plaintext message
      * @throws SodiumException
      * @throws TypeError
-     * @psalm-suppress MixedArgument
-     * @psalm-suppress MixedInferredReturnType
-     * @psalm-suppress MixedReturnStatement
      */
     public static function crypto_box_seal_open(
-        $ciphertext,
-        #[\SensitiveParameter]
-        $keypair
-    ) {
-        /* Type checks: */
-        ParagonIE_Sodium_Core_Util::declareScalarType($ciphertext, 'string', 1);
-        ParagonIE_Sodium_Core_Util::declareScalarType($keypair, 'string', 2);
-
+        string $ciphertext,
+        string $keypair
+    ): string|bool {
         /* Input validation: */
         if (ParagonIE_Sodium_Core_Util::strlen($keypair) !== self::CRYPTO_BOX_KEYPAIRBYTES) {
             throw new SodiumException('Argument 2 must be CRYPTO_BOX_KEYPAIRBYTES long.');
         }
 
         if (self::useNewSodiumAPI()) {
-            /**
-             * @psalm-suppress InvalidReturnStatement
-             * @psalm-suppress FalsableReturnStatement
-             */
             return sodium_crypto_box_seal_open($ciphertext, $keypair);
         }
         if (self::use_fallback('crypto_box_seal_open')) {
             return call_user_func('\\Sodium\\crypto_box_seal_open', $ciphertext, $keypair);
         }
-        if (PHP_INT_SIZE === 4) {
-            return ParagonIE_Sodium_Crypto32::box_seal_open($ciphertext, $keypair);
-        }
         return ParagonIE_Sodium_Crypto::box_seal_open($ciphertext, $keypair);
     }
 
@@ -1450,19 +1214,15 @@ class ParagonIE_Sodium_Compat
      *                don't accidentally get them mixed up!
      * @throws SodiumException
      * @throws TypeError
-     * @psalm-suppress MixedArgument
      */
-    public static function crypto_box_keypair()
+    public static function crypto_box_keypair(): string
     {
         if (self::useNewSodiumAPI()) {
-            return (string) sodium_crypto_box_keypair();
+            return sodium_crypto_box_keypair();
         }
         if (self::use_fallback('crypto_box_keypair')) {
             return (string) call_user_func('\\Sodium\\crypto_box_keypair');
         }
-        if (PHP_INT_SIZE === 4) {
-            return ParagonIE_Sodium_Crypto32::box_keypair();
-        }
         return ParagonIE_Sodium_Crypto::box_keypair();
     }
 
@@ -1475,17 +1235,12 @@ class ParagonIE_Sodium_Compat
      * @return string    Keypair
      * @throws SodiumException
      * @throws TypeError
-     * @psalm-suppress MixedArgument
      */
     public static function crypto_box_keypair_from_secretkey_and_publickey(
-        #[\SensitiveParameter]
-        $secretKey,
-        $publicKey
-    ) {
-        /* Type checks: */
-        ParagonIE_Sodium_Core_Util::declareScalarType($secretKey, 'string', 1);
-        ParagonIE_Sodium_Core_Util::declareScalarType($publicKey, 'string', 2);
-
+        #[SensitiveParameter]
+        string $secretKey,
+        string $publicKey
+    ): string {
         /* Input validation: */
         if (ParagonIE_Sodium_Core_Util::strlen($secretKey) !== self::CRYPTO_BOX_SECRETKEYBYTES) {
             throw new SodiumException('Argument 1 must be CRYPTO_BOX_SECRETKEYBYTES long.');
@@ -1495,14 +1250,11 @@ class ParagonIE_Sodium_Compat
         }
 
         if (self::useNewSodiumAPI()) {
-            return (string) sodium_crypto_box_keypair_from_secretkey_and_publickey($secretKey, $publicKey);
+            return sodium_crypto_box_keypair_from_secretkey_and_publickey($secretKey, $publicKey);
         }
         if (self::use_fallback('crypto_box_keypair_from_secretkey_and_publickey')) {
             return (string) call_user_func('\\Sodium\\crypto_box_keypair_from_secretkey_and_publickey', $secretKey, $publicKey);
         }
-        if (PHP_INT_SIZE === 4) {
-            return ParagonIE_Sodium_Crypto32::box_keypair_from_secretkey_and_publickey($secretKey, $publicKey);
-        }
         return ParagonIE_Sodium_Crypto::box_keypair_from_secretkey_and_publickey($secretKey, $publicKey);
     }
 
@@ -1512,24 +1264,16 @@ class ParagonIE_Sodium_Compat
      * @param string $ciphertext Encrypted message
      * @param string $nonce      Number to only be used Once; must be 24 bytes
      * @param string $keypair    Your secret key and the sender's public key
-     * @return string            The original plaintext message
+     * @return string|bool       The original plaintext message
      * @throws SodiumException
      * @throws TypeError
-     * @psalm-suppress MixedArgument
-     * @psalm-suppress MixedInferredReturnType
-     * @psalm-suppress MixedReturnStatement
      */
     public static function crypto_box_open(
-        $ciphertext,
-        $nonce,
-        #[\SensitiveParameter]
-        $keypair
-    ) {
-        /* Type checks: */
-        ParagonIE_Sodium_Core_Util::declareScalarType($ciphertext, 'string', 1);
-        ParagonIE_Sodium_Core_Util::declareScalarType($nonce, 'string', 2);
-        ParagonIE_Sodium_Core_Util::declareScalarType($keypair, 'string', 3);
-
+        string $ciphertext,
+        string $nonce,
+        #[SensitiveParameter]
+        string $keypair
+    ): string|bool {
         /* Input validation: */
         if (ParagonIE_Sodium_Core_Util::strlen($ciphertext) < self::CRYPTO_BOX_MACBYTES) {
             throw new SodiumException('Argument 1 must be at least CRYPTO_BOX_MACBYTES long.');
@@ -1542,18 +1286,11 @@ class ParagonIE_Sodium_Compat
         }
 
         if (self::useNewSodiumAPI()) {
-            /**
-             * @psalm-suppress InvalidReturnStatement
-             * @psalm-suppress FalsableReturnStatement
-             */
             return sodium_crypto_box_open($ciphertext, $nonce, $keypair);
         }
         if (self::use_fallback('crypto_box_open')) {
             return call_user_func('\\Sodium\\crypto_box_open', $ciphertext, $nonce, $keypair);
         }
-        if (PHP_INT_SIZE === 4) {
-            return ParagonIE_Sodium_Crypto32::box_open($ciphertext, $nonce, $keypair);
-        }
         return ParagonIE_Sodium_Crypto::box_open($ciphertext, $nonce, $keypair);
     }
 
@@ -1564,29 +1301,22 @@ class ParagonIE_Sodium_Compat
      * @return string         Your crypto_box public key
      * @throws SodiumException
      * @throws TypeError
-     * @psalm-suppress MixedArgument
      */
     public static function crypto_box_publickey(
-        #[\SensitiveParameter]
-        $keypair
-    ) {
-        /* Type checks: */
-        ParagonIE_Sodium_Core_Util::declareScalarType($keypair, 'string', 1);
-
+        #[SensitiveParameter]
+        string $keypair
+    ): string {
         /* Input validation: */
         if (ParagonIE_Sodium_Core_Util::strlen($keypair) !== self::CRYPTO_BOX_KEYPAIRBYTES) {
             throw new SodiumException('Argument 1 must be CRYPTO_BOX_KEYPAIRBYTES long.');
         }
 
         if (self::useNewSodiumAPI()) {
-            return (string) sodium_crypto_box_publickey($keypair);
+            return sodium_crypto_box_publickey($keypair);
         }
         if (self::use_fallback('crypto_box_publickey')) {
             return (string) call_user_func('\\Sodium\\crypto_box_publickey', $keypair);
         }
-        if (PHP_INT_SIZE === 4) {
-            return ParagonIE_Sodium_Crypto32::box_publickey($keypair);
-        }
         return ParagonIE_Sodium_Crypto::box_publickey($keypair);
     }
 
@@ -1597,29 +1327,21 @@ class ParagonIE_Sodium_Compat
      * @return string           The corresponding X25519 public key
      * @throws SodiumException
      * @throws TypeError
-     * @psalm-suppress MixedArgument
      */
     public static function crypto_box_publickey_from_secretkey(
-        #[\SensitiveParameter]
-        $secretKey
-    ) {
-        /* Type checks: */
-        ParagonIE_Sodium_Core_Util::declareScalarType($secretKey, 'string', 1);
-
+        string $secretKey
+    ): string {
         /* Input validation: */
         if (ParagonIE_Sodium_Core_Util::strlen($secretKey) !== self::CRYPTO_BOX_SECRETKEYBYTES) {
             throw new SodiumException('Argument 1 must be CRYPTO_BOX_SECRETKEYBYTES long.');
         }
 
         if (self::useNewSodiumAPI()) {
-            return (string) sodium_crypto_box_publickey_from_secretkey($secretKey);
+            return sodium_crypto_box_publickey_from_secretkey($secretKey);
         }
         if (self::use_fallback('crypto_box_publickey_from_secretkey')) {
             return (string) call_user_func('\\Sodium\\crypto_box_publickey_from_secretkey', $secretKey);
         }
-        if (PHP_INT_SIZE === 4) {
-            return ParagonIE_Sodium_Crypto32::box_publickey_from_secretkey($secretKey);
-        }
         return ParagonIE_Sodium_Crypto::box_publickey_from_secretkey($secretKey);
     }
 
@@ -1630,29 +1352,22 @@ class ParagonIE_Sodium_Compat
      * @return string         Your crypto_box secret key
      * @throws SodiumException
      * @throws TypeError
-     * @psalm-suppress MixedArgument
      */
     public static function crypto_box_secretkey(
-        #[\SensitiveParameter]
-        $keypair
-    ) {
-        /* Type checks: */
-        ParagonIE_Sodium_Core_Util::declareScalarType($keypair, 'string', 1);
-
+        #[SensitiveParameter]
+        string $keypair
+    ): string {
         /* Input validation: */
         if (ParagonIE_Sodium_Core_Util::strlen($keypair) !== self::CRYPTO_BOX_KEYPAIRBYTES) {
             throw new SodiumException('Argument 1 must be CRYPTO_BOX_KEYPAIRBYTES long.');
         }
 
         if (self::useNewSodiumAPI()) {
-            return (string) sodium_crypto_box_secretkey($keypair);
+            return sodium_crypto_box_secretkey($keypair);
         }
         if (self::use_fallback('crypto_box_secretkey')) {
             return (string) call_user_func('\\Sodium\\crypto_box_secretkey', $keypair);
         }
-        if (PHP_INT_SIZE === 4) {
-            return ParagonIE_Sodium_Crypto32::box_secretkey($keypair);
-        }
         return ParagonIE_Sodium_Crypto::box_secretkey($keypair);
     }
 
@@ -1663,25 +1378,17 @@ class ParagonIE_Sodium_Compat
      * @return string
      * @throws SodiumException
      * @throws TypeError
-     * @psalm-suppress MixedArgument
-     * @psalm-suppress UndefinedFunction
      */
     public static function crypto_box_seed_keypair(
-        #[\SensitiveParameter]
-        $seed
-    ) {
-        /* Type checks: */
-        ParagonIE_Sodium_Core_Util::declareScalarType($seed, 'string', 1);
-
+        #[SensitiveParameter]
+        string $seed
+    ): string {
         if (self::useNewSodiumAPI()) {
-            return (string) sodium_crypto_box_seed_keypair($seed);
+            return sodium_crypto_box_seed_keypair($seed);
         }
         if (self::use_fallback('crypto_box_seed_keypair')) {
             return (string) call_user_func('\\Sodium\\crypto_box_seed_keypair', $seed);
         }
-        if (PHP_INT_SIZE === 4) {
-            return ParagonIE_Sodium_Crypto32::box_seed_keypair($seed);
-        }
         return ParagonIE_Sodium_Crypto::box_seed_keypair($seed);
     }
 
@@ -1696,22 +1403,16 @@ class ParagonIE_Sodium_Compat
      * @return string              Raw binary
      * @throws SodiumException
      * @throws TypeError
-     * @psalm-suppress MixedArgument
      */
     public static function crypto_generichash(
-        $message,
-        #[\SensitiveParameter]
-        $key = '',
-        $length = self::CRYPTO_GENERICHASH_BYTES
-    ) {
-        /* Type checks: */
-        ParagonIE_Sodium_Core_Util::declareScalarType($message, 'string', 1);
+        string $message,
+        #[SensitiveParameter]
+        ?string $key = '',
+        int $length = self::CRYPTO_GENERICHASH_BYTES
+    ): string {
         if (is_null($key)) {
             $key = '';
         }
-        ParagonIE_Sodium_Core_Util::declareScalarType($key, 'string', 2);
-        ParagonIE_Sodium_Core_Util::declareScalarType($length, 'int', 3);
-
         /* Input validation: */
         if (!empty($key)) {
             if (ParagonIE_Sodium_Core_Util::strlen($key) < self::CRYPTO_GENERICHASH_KEYBYTES_MIN) {
@@ -1723,14 +1424,11 @@ class ParagonIE_Sodium_Compat
         }
 
         if (self::useNewSodiumAPI()) {
-            return (string) sodium_crypto_generichash($message, $key, $length);
+            return sodium_crypto_generichash($message, $key, $length);
         }
         if (self::use_fallback('crypto_generichash')) {
             return (string) call_user_func('\\Sodium\\crypto_generichash', $message, $key, $length);
         }
-        if (PHP_INT_SIZE === 4) {
-            return ParagonIE_Sodium_Crypto32::generichash($message, $key, $length);
-        }
         return ParagonIE_Sodium_Crypto::generichash($message, $key, $length);
     }
 
@@ -1742,19 +1440,12 @@ class ParagonIE_Sodium_Compat
      * @return string     Final BLAKE2b hash.
      * @throws SodiumException
      * @throws TypeError
-     * @psalm-suppress MixedArgument
      * @psalm-suppress ReferenceConstraintViolation
-     * @psalm-suppress ConflictingReferenceConstraint
      */
     public static function crypto_generichash_final(
-        #[\SensitiveParameter]
-        &$ctx,
-        $length = self::CRYPTO_GENERICHASH_BYTES
-    ) {
-        /* Type checks: */
-        ParagonIE_Sodium_Core_Util::declareScalarType($ctx, 'string', 1);
-        ParagonIE_Sodium_Core_Util::declareScalarType($length, 'int', 2);
-
+        string &$ctx,
+        int $length = self::CRYPTO_GENERICHASH_BYTES
+    ): string {
         if (self::useNewSodiumAPI()) {
             return sodium_crypto_generichash_final($ctx, $length);
         }
@@ -1765,19 +1456,15 @@ class ParagonIE_Sodium_Compat
         if ($length < 1) {
             try {
                 self::memzero($ctx);
-            } catch (SodiumException $ex) {
+            } catch (SodiumException) {
                 unset($ctx);
             }
             return '';
         }
-        if (PHP_INT_SIZE === 4) {
-            $result = ParagonIE_Sodium_Crypto32::generichash_final($ctx, $length);
-        } else {
-            $result = ParagonIE_Sodium_Crypto::generichash_final($ctx, $length);
-        }
+        $result = ParagonIE_Sodium_Crypto::generichash_final($ctx, $length);
         try {
             self::memzero($ctx);
-        } catch (SodiumException $ex) {
+        } catch (SodiumException) {
             unset($ctx);
         }
         return $result;
@@ -1792,19 +1479,15 @@ class ParagonIE_Sodium_Compat
      *                         (To be 100% compatible with ext/libsodium)
      * @throws SodiumException
      * @throws TypeError
-     * @psalm-suppress MixedArgument
      */
     public static function crypto_generichash_init(
-        #[\SensitiveParameter]
-        $key = '',
-        $length = self::CRYPTO_GENERICHASH_BYTES
-    ) {
-        /* Type checks: */
+        #[SensitiveParameter]
+        ?string $key = '',
+        int $length = self::CRYPTO_GENERICHASH_BYTES
+    ): string {
         if (is_null($key)) {
             $key = '';
         }
-        ParagonIE_Sodium_Core_Util::declareScalarType($key, 'string', 1);
-        ParagonIE_Sodium_Core_Util::declareScalarType($length, 'int', 2);
 
         /* Input validation: */
         if (!empty($key)) {
@@ -1822,9 +1505,6 @@ class ParagonIE_Sodium_Compat
         if (self::use_fallback('crypto_generichash_init')) {
             return (string) call_user_func('\\Sodium\\crypto_generichash_init', $key, $length);
         }
-        if (PHP_INT_SIZE === 4) {
-            return ParagonIE_Sodium_Crypto32::generichash_init($key, $length);
-        }
         return ParagonIE_Sodium_Crypto::generichash_init($key, $length);
     }
 
@@ -1839,40 +1519,26 @@ class ParagonIE_Sodium_Compat
      *                         (To be 100% compatible with ext/libsodium)
      * @throws SodiumException
      * @throws TypeError
-     * @psalm-suppress MixedArgument
      */
     public static function crypto_generichash_init_salt_personal(
-        #[\SensitiveParameter]
-        $key = '',
-        $length = self::CRYPTO_GENERICHASH_BYTES,
-        $salt = '',
-        $personal = ''
-    ) {
-        /* Type checks: */
+        #[SensitiveParameter]
+        ?string $key = '',
+        int $length = self::CRYPTO_GENERICHASH_BYTES,
+        string $salt = '',
+        string $personal = ''
+    ): string {
         if (is_null($key)) {
             $key = '';
         }
-        ParagonIE_Sodium_Core_Util::declareScalarType($key, 'string', 1);
-        ParagonIE_Sodium_Core_Util::declareScalarType($length, 'int', 2);
-        ParagonIE_Sodium_Core_Util::declareScalarType($salt, 'string', 3);
-        ParagonIE_Sodium_Core_Util::declareScalarType($personal, 'string', 4);
-        $salt = str_pad($salt, 16, "\0", STR_PAD_RIGHT);
-        $personal = str_pad($personal, 16, "\0", STR_PAD_RIGHT);
+        $salt = str_pad($salt, 16, "\0");
+        $personal = str_pad($personal, 16, "\0");
 
         /* Input validation: */
         if (!empty($key)) {
-            /*
-            if (ParagonIE_Sodium_Core_Util::strlen($key) < self::CRYPTO_GENERICHASH_KEYBYTES_MIN) {
-                throw new SodiumException('Unsupported key size. Must be at least CRYPTO_GENERICHASH_KEYBYTES_MIN bytes long.');
-            }
-            */
             if (ParagonIE_Sodium_Core_Util::strlen($key) > self::CRYPTO_GENERICHASH_KEYBYTES_MAX) {
                 throw new SodiumException('Unsupported key size. Must be at most CRYPTO_GENERICHASH_KEYBYTES_MAX bytes long.');
             }
         }
-        if (PHP_INT_SIZE === 4) {
-            return ParagonIE_Sodium_Crypto32::generichash_init_salt_personal($key, $length, $salt, $personal);
-        }
         return ParagonIE_Sodium_Crypto::generichash_init_salt_personal($key, $length, $salt, $personal);
     }
 
@@ -1886,18 +1552,9 @@ class ParagonIE_Sodium_Compat
      * @return void
      * @throws SodiumException
      * @throws TypeError
-     * @psalm-suppress MixedArgument
-     * @psalm-suppress ReferenceConstraintViolation
      */
-    public static function crypto_generichash_update(
-        #[\SensitiveParameter]
-        &$ctx,
-        $message
-    ) {
-        /* Type checks: */
-        ParagonIE_Sodium_Core_Util::declareScalarType($ctx, 'string', 1);
-        ParagonIE_Sodium_Core_Util::declareScalarType($message, 'string', 2);
-
+    public static function crypto_generichash_update(string &$ctx, string $message): void
+    {
         if (self::useNewSodiumAPI()) {
             sodium_crypto_generichash_update($ctx, $message);
             return;
@@ -1907,11 +1564,7 @@ class ParagonIE_Sodium_Compat
             $func($ctx, $message);
             return;
         }
-        if (PHP_INT_SIZE === 4) {
-            $ctx = ParagonIE_Sodium_Crypto32::generichash_update($ctx, $message);
-        } else {
-            $ctx = ParagonIE_Sodium_Crypto::generichash_update($ctx, $message);
-        }
+        $ctx = ParagonIE_Sodium_Crypto::generichash_update($ctx, $message);
     }
 
     /**
@@ -1919,7 +1572,7 @@ class ParagonIE_Sodium_Compat
      * @throws Exception
      * @throws Error
      */
-    public static function crypto_generichash_keygen()
+    public static function crypto_generichash_keygen(): string
     {
         return random_bytes(self::CRYPTO_GENERICHASH_KEYBYTES);
     }
@@ -1933,21 +1586,12 @@ class ParagonIE_Sodium_Compat
      * @throws SodiumException
      */
     public static function crypto_kdf_derive_from_key(
-        $subkey_len,
-        $subkey_id,
-        $context,
-        #[\SensitiveParameter]
-        $key
-    ) {
-        ParagonIE_Sodium_Core_Util::declareScalarType($subkey_len, 'int', 1);
-        ParagonIE_Sodium_Core_Util::declareScalarType($subkey_id, 'int', 2);
-        ParagonIE_Sodium_Core_Util::declareScalarType($context, 'string', 3);
-        ParagonIE_Sodium_Core_Util::declareScalarType($key, 'string', 4);
-        $subkey_id = (int) $subkey_id;
-        $subkey_len = (int) $subkey_len;
-        $context = (string) $context;
-        $key = (string) $key;
-
+        int $subkey_len,
+        int $subkey_id,
+        string $context,
+        #[SensitiveParameter]
+        string $key
+    ): string {
         if ($subkey_len < self::CRYPTO_KDF_BYTES_MIN) {
             throw new SodiumException('subkey cannot be smaller than SODIUM_CRYPTO_KDF_BYTES_MIN');
         }
@@ -1979,7 +1623,7 @@ class ParagonIE_Sodium_Compat
      * @throws Exception
      * @throws Error
      */
-    public static function crypto_kdf_keygen()
+    public static function crypto_kdf_keygen(): string
     {
         return random_bytes(self::CRYPTO_KDF_KEYBYTES);
     }
@@ -2012,22 +1656,15 @@ class ParagonIE_Sodium_Compat
      * @return string
      * @throws SodiumException
      * @throws TypeError
-     * @psalm-suppress MixedArgument
      */
     public static function crypto_kx(
-        #[\SensitiveParameter]
-        $my_secret,
-        $their_public,
-        $client_public,
-        $server_public,
-        $dontFallback = false
-    ) {
-        /* Type checks: */
-        ParagonIE_Sodium_Core_Util::declareScalarType($my_secret, 'string', 1);
-        ParagonIE_Sodium_Core_Util::declareScalarType($their_public, 'string', 2);
-        ParagonIE_Sodium_Core_Util::declareScalarType($client_public, 'string', 3);
-        ParagonIE_Sodium_Core_Util::declareScalarType($server_public, 'string', 4);
-
+        #[SensitiveParameter]
+        string $my_secret,
+        string $their_public,
+        string $client_public,
+        string $server_public,
+        bool $dontFallback = false
+    ): string {
         /* Input validation: */
         if (ParagonIE_Sodium_Core_Util::strlen($my_secret) !== self::CRYPTO_BOX_SECRETKEYBYTES) {
             throw new SodiumException('Argument 1 must be CRYPTO_BOX_SECRETKEYBYTES long.');
@@ -2044,7 +1681,7 @@ class ParagonIE_Sodium_Compat
 
         if (self::useNewSodiumAPI() && !$dontFallback) {
             if (is_callable('sodium_crypto_kx')) {
-                return (string) sodium_crypto_kx(
+                return sodium_crypto_kx(
                     $my_secret,
                     $their_public,
                     $client_public,
@@ -2053,7 +1690,7 @@ class ParagonIE_Sodium_Compat
             }
         }
         if (self::use_fallback('crypto_kx')) {
-            return (string) call_user_func(
+            return call_user_func(
                 '\\Sodium\\crypto_kx',
                 $my_secret,
                 $their_public,
@@ -2061,14 +1698,6 @@ class ParagonIE_Sodium_Compat
                 $server_public
             );
         }
-        if (PHP_INT_SIZE === 4) {
-            return ParagonIE_Sodium_Crypto32::keyExchange(
-                $my_secret,
-                $their_public,
-                $client_public,
-                $server_public
-            );
-        }
         return ParagonIE_Sodium_Crypto::keyExchange(
             $my_secret,
             $their_public,
@@ -2083,13 +1712,9 @@ class ParagonIE_Sodium_Compat
      * @throws SodiumException
      */
     public static function crypto_kx_seed_keypair(
-        #[\SensitiveParameter]
-        $seed
-    ) {
-        ParagonIE_Sodium_Core_Util::declareScalarType($seed, 'string', 1);
-
-        $seed = (string) $seed;
-
+        #[SensitiveParameter]
+        string $seed
+    ): string {
         if (ParagonIE_Sodium_Core_Util::strlen($seed) !== self::CRYPTO_KX_SEEDBYTES) {
             throw new SodiumException('seed must be SODIUM_CRYPTO_KX_SEEDBYTES bytes');
         }
@@ -2103,7 +1728,7 @@ class ParagonIE_Sodium_Compat
      * @return string
      * @throws Exception
      */
-    public static function crypto_kx_keypair()
+    public static function crypto_kx_keypair(): string
     {
         $sk = self::randombytes_buf(self::CRYPTO_KX_SECRETKEYBYTES);
         $pk = self::crypto_scalarmult_base($sk);
@@ -2117,16 +1742,10 @@ class ParagonIE_Sodium_Compat
      * @throws SodiumException
      */
     public static function crypto_kx_client_session_keys(
-        #[\SensitiveParameter]
-        $keypair,
-        $serverPublicKey
-    ) {
-        ParagonIE_Sodium_Core_Util::declareScalarType($keypair, 'string', 1);
-        ParagonIE_Sodium_Core_Util::declareScalarType($serverPublicKey, 'string', 2);
-
-        $keypair = (string) $keypair;
-        $serverPublicKey = (string) $serverPublicKey;
-
+        #[SensitiveParameter]
+        string $keypair,
+        string $serverPublicKey
+    ): array {
         if (ParagonIE_Sodium_Core_Util::strlen($keypair) !== self::CRYPTO_KX_KEYPAIRBYTES) {
             throw new SodiumException('keypair should be SODIUM_CRYPTO_KX_KEYPAIRBYTES bytes');
         }
@@ -2162,16 +1781,10 @@ class ParagonIE_Sodium_Compat
      * @throws SodiumException
      */
     public static function crypto_kx_server_session_keys(
-        #[\SensitiveParameter]
-        $keypair,
-        $clientPublicKey
-    ) {
-        ParagonIE_Sodium_Core_Util::declareScalarType($keypair, 'string', 1);
-        ParagonIE_Sodium_Core_Util::declareScalarType($clientPublicKey, 'string', 2);
-
-        $keypair = (string) $keypair;
-        $clientPublicKey = (string) $clientPublicKey;
-
+        #[SensitiveParameter]
+        string $keypair,
+        string $clientPublicKey
+    ): array {
         if (ParagonIE_Sodium_Core_Util::strlen($keypair) !== self::CRYPTO_KX_KEYPAIRBYTES) {
             throw new SodiumException('keypair should be SODIUM_CRYPTO_KX_KEYPAIRBYTES bytes');
         }
@@ -2206,9 +1819,9 @@ class ParagonIE_Sodium_Compat
      * @throws SodiumException
      */
     public static function crypto_kx_secretkey(
-        #[\SensitiveParameter]
-        $kp
-    ) {
+        #[SensitiveParameter]
+        string $kp
+    ): string {
         return ParagonIE_Sodium_Core_Util::substr(
             $kp,
             0,
@@ -2221,8 +1834,9 @@ class ParagonIE_Sodium_Compat
      * @return string
      * @throws SodiumException
      */
-    public static function crypto_kx_publickey($kp)
-    {
+    public static function crypto_kx_publickey(
+        string $kp
+    ): string {
         return ParagonIE_Sodium_Core_Util::substr(
             $kp,
             self::CRYPTO_KX_SECRETKEYBYTES,
@@ -2240,26 +1854,19 @@ class ParagonIE_Sodium_Compat
      * @return string
      * @throws SodiumException
      * @throws TypeError
-     * @psalm-suppress MixedArgument
      */
     public static function crypto_pwhash(
-        $outlen,
-        #[\SensitiveParameter]
-        $passwd,
-        $salt,
-        $opslimit,
-        $memlimit,
-        $alg = null
-    ) {
-        ParagonIE_Sodium_Core_Util::declareScalarType($outlen, 'int', 1);
-        ParagonIE_Sodium_Core_Util::declareScalarType($passwd, 'string', 2);
-        ParagonIE_Sodium_Core_Util::declareScalarType($salt,  'string', 3);
-        ParagonIE_Sodium_Core_Util::declareScalarType($opslimit, 'int', 4);
-        ParagonIE_Sodium_Core_Util::declareScalarType($memlimit, 'int', 5);
-
+        int $outlen,
+        #[SensitiveParameter]
+        string $passwd,
+        #[SensitiveParameter]
+        string $salt,
+        int $opslimit,
+        int $memlimit,
+        ?int $alg = null
+    ): string {
         if (self::useNewSodiumAPI()) {
             if (!is_null($alg)) {
-                ParagonIE_Sodium_Core_Util::declareScalarType($alg, 'int', 6);
                 return sodium_crypto_pwhash($outlen, $passwd, $salt, $opslimit, $memlimit, $alg);
             }
             return sodium_crypto_pwhash($outlen, $passwd, $salt, $opslimit, $memlimit);
@@ -2281,7 +1888,7 @@ class ParagonIE_Sodium_Compat
      *
      * @return bool
      */
-    public static function crypto_pwhash_is_available()
+    public static function crypto_pwhash_is_available(): bool
     {
         if (self::useNewSodiumAPI()) {
             return true;
@@ -2299,18 +1906,13 @@ class ParagonIE_Sodium_Compat
      * @return string
      * @throws SodiumException
      * @throws TypeError
-     * @psalm-suppress MixedArgument
      */
     public static function crypto_pwhash_str(
-        #[\SensitiveParameter]
-        $passwd,
-        $opslimit,
-        $memlimit
-    ) {
-        ParagonIE_Sodium_Core_Util::declareScalarType($passwd, 'string', 1);
-        ParagonIE_Sodium_Core_Util::declareScalarType($opslimit, 'int', 2);
-        ParagonIE_Sodium_Core_Util::declareScalarType($memlimit, 'int', 3);
-
+        #[SensitiveParameter]
+        string $passwd,
+        int $opslimit,
+        int $memlimit
+    ): string {
         if (self::useNewSodiumAPI()) {
             return sodium_crypto_pwhash_str($passwd, $opslimit, $memlimit);
         }
@@ -2333,24 +1935,18 @@ class ParagonIE_Sodium_Compat
      * @throws SodiumException
      */
     public static function crypto_pwhash_str_needs_rehash(
-        #[\SensitiveParameter]
-        $hash,
-        $opslimit,
-        $memlimit
-    ) {
-        ParagonIE_Sodium_Core_Util::declareScalarType($hash, 'string', 1);
-        ParagonIE_Sodium_Core_Util::declareScalarType($opslimit, 'int', 2);
-        ParagonIE_Sodium_Core_Util::declareScalarType($memlimit, 'int', 3);
-
+        #[SensitiveParameter]
+        string $hash,
+        int $opslimit,
+        int $memlimit
+    ): bool {
         // Just grab the first 4 pieces.
-        $pieces = explode('$', (string) $hash);
+        $pieces = explode('$', $hash);
         $prefix = implode('$', array_slice($pieces, 0, 4));
 
         // Rebuild the expected header.
-        /** @var int $ops */
-        $ops = (int) $opslimit;
-        /** @var int $mem */
-        $mem = (int) $memlimit >> 10;
+        $ops =  $opslimit;
+        $mem = $memlimit >> 10;
         $encoded = self::CRYPTO_PWHASH_STRPREFIX . 'v=19$m=' . $mem . ',t=' . $ops . ',p=1';
 
         // Do they match? If so, we don't need to rehash, so return false.
@@ -2363,19 +1959,15 @@ class ParagonIE_Sodium_Compat
      * @return bool
      * @throws SodiumException
      * @throws TypeError
-     * @psalm-suppress MixedArgument
      */
     public static function crypto_pwhash_str_verify(
-        #[\SensitiveParameter]
-        $passwd,
-        #[\SensitiveParameter]
-        $hash
-    ) {
-        ParagonIE_Sodium_Core_Util::declareScalarType($passwd, 'string', 1);
-        ParagonIE_Sodium_Core_Util::declareScalarType($hash, 'string', 2);
-
+        #[SensitiveParameter]
+        string $passwd,
+        #[SensitiveParameter]
+        string $hash
+    ): bool {
         if (self::useNewSodiumAPI()) {
-            return (bool) sodium_crypto_pwhash_str_verify($passwd, $hash);
+            return sodium_crypto_pwhash_str_verify($passwd, $hash);
         }
         if (self::use_fallback('crypto_pwhash_str_verify')) {
             return (bool) call_user_func('\\Sodium\\crypto_pwhash_str_verify', $passwd, $hash);
@@ -2397,36 +1989,31 @@ class ParagonIE_Sodium_Compat
      * @throws TypeError
      */
     public static function crypto_pwhash_scryptsalsa208sha256(
-        $outlen,
-        #[\SensitiveParameter]
-        $passwd,
-        $salt,
-        $opslimit,
-        $memlimit
-    ) {
-        ParagonIE_Sodium_Core_Util::declareScalarType($outlen, 'int', 1);
-        ParagonIE_Sodium_Core_Util::declareScalarType($passwd, 'string', 2);
-        ParagonIE_Sodium_Core_Util::declareScalarType($salt,  'string', 3);
-        ParagonIE_Sodium_Core_Util::declareScalarType($opslimit, 'int', 4);
-        ParagonIE_Sodium_Core_Util::declareScalarType($memlimit, 'int', 5);
-
+        int $outlen,
+        #[SensitiveParameter]
+        string $passwd,
+        #[SensitiveParameter]
+        string $salt,
+        int $opslimit,
+        int $memlimit
+    ): string {
         if (self::useNewSodiumAPI()) {
-            return (string) sodium_crypto_pwhash_scryptsalsa208sha256(
-                (int) $outlen,
-                (string) $passwd,
-                (string) $salt,
-                (int) $opslimit,
-                (int) $memlimit
+            return sodium_crypto_pwhash_scryptsalsa208sha256(
+                $outlen,
+                $passwd,
+                $salt,
+                $opslimit,
+                $memlimit
             );
         }
         if (self::use_fallback('crypto_pwhash_scryptsalsa208sha256')) {
             return (string) call_user_func(
                 '\\Sodium\\crypto_pwhash_scryptsalsa208sha256',
-                (int) $outlen,
-                (string) $passwd,
-                (string) $salt,
-                (int) $opslimit,
-                (int) $memlimit
+                $outlen,
+                $passwd,
+                $salt,
+                $opslimit,
+                $memlimit
             );
         }
         // This is the best we can do.
@@ -2443,7 +2030,7 @@ class ParagonIE_Sodium_Compat
      *
      * @return bool
      */
-    public static function crypto_pwhash_scryptsalsa208sha256_is_available()
+    public static function crypto_pwhash_scryptsalsa208sha256_is_available(): bool
     {
         if (self::useNewSodiumAPI()) {
             return true;
@@ -2463,28 +2050,24 @@ class ParagonIE_Sodium_Compat
      * @throws TypeError
      */
     public static function crypto_pwhash_scryptsalsa208sha256_str(
-        #[\SensitiveParameter]
-        $passwd,
-        $opslimit,
-        $memlimit
-    ) {
-        ParagonIE_Sodium_Core_Util::declareScalarType($passwd, 'string', 1);
-        ParagonIE_Sodium_Core_Util::declareScalarType($opslimit, 'int', 2);
-        ParagonIE_Sodium_Core_Util::declareScalarType($memlimit, 'int', 3);
-
+        #[SensitiveParameter]
+        string $passwd,
+        int $opslimit,
+        int $memlimit
+    ): string {
         if (self::useNewSodiumAPI()) {
-            return (string) sodium_crypto_pwhash_scryptsalsa208sha256_str(
-                (string) $passwd,
-                (int) $opslimit,
-                (int) $memlimit
+            return sodium_crypto_pwhash_scryptsalsa208sha256_str(
+                $passwd,
+                $opslimit,
+                $memlimit
             );
         }
         if (self::use_fallback('crypto_pwhash_scryptsalsa208sha256_str')) {
             return (string) call_user_func(
                 '\\Sodium\\crypto_pwhash_scryptsalsa208sha256_str',
-                (string) $passwd,
-                (int) $opslimit,
-                (int) $memlimit
+                $passwd,
+                $opslimit,
+                $memlimit
             );
         }
         // This is the best we can do.
@@ -2501,25 +2084,19 @@ class ParagonIE_Sodium_Compat
      * @throws TypeError
      */
     public static function crypto_pwhash_scryptsalsa208sha256_str_verify(
-        #[\SensitiveParameter]
-        $passwd,
-        #[\SensitiveParameter]
-        $hash
-    ) {
-        ParagonIE_Sodium_Core_Util::declareScalarType($passwd, 'string', 1);
-        ParagonIE_Sodium_Core_Util::declareScalarType($hash, 'string', 2);
-
+        #[SensitiveParameter]
+        string $passwd,
+        #[SensitiveParameter]
+        string $hash
+    ): bool {
         if (self::useNewSodiumAPI()) {
-            return (bool) sodium_crypto_pwhash_scryptsalsa208sha256_str_verify(
-                (string) $passwd,
-                (string) $hash
-            );
+            return sodium_crypto_pwhash_scryptsalsa208sha256_str_verify($passwd, $hash);
         }
         if (self::use_fallback('crypto_pwhash_scryptsalsa208sha256_str_verify')) {
             return (bool) call_user_func(
                 '\\Sodium\\crypto_pwhash_scryptsalsa208sha256_str_verify',
-                (string) $passwd,
-                (string) $hash
+                $passwd,
+                $hash
             );
         }
         // This is the best we can do.
@@ -2539,17 +2116,12 @@ class ParagonIE_Sodium_Compat
      * @return string
      * @throws SodiumException
      * @throws TypeError
-     * @psalm-suppress MixedArgument
      */
     public static function crypto_scalarmult(
-        #[\SensitiveParameter]
-        $secretKey,
-        $publicKey
-    ) {
-        /* Type checks: */
-        ParagonIE_Sodium_Core_Util::declareScalarType($secretKey, 'string', 1);
-        ParagonIE_Sodium_Core_Util::declareScalarType($publicKey, 'string', 2);
-
+        #[SensitiveParameter]
+        string $secretKey,
+        string $publicKey
+    ): string {
         /* Input validation: */
         if (ParagonIE_Sodium_Core_Util::strlen($secretKey) !== self::CRYPTO_BOX_SECRETKEYBYTES) {
             throw new SodiumException('Argument 1 must be CRYPTO_BOX_SECRETKEYBYTES long.');
@@ -2572,9 +2144,6 @@ class ParagonIE_Sodium_Compat
         if (ParagonIE_Sodium_Core_Util::hashEquals($publicKey, str_repeat("\0", self::CRYPTO_BOX_PUBLICKEYBYTES))) {
             throw new SodiumException('Zero public key is not allowed');
         }
-        if (PHP_INT_SIZE === 4) {
-            return ParagonIE_Sodium_Crypto32::scalarmult($secretKey, $publicKey);
-        }
         return ParagonIE_Sodium_Crypto::scalarmult($secretKey, $publicKey);
     }
 
@@ -2585,16 +2154,11 @@ class ParagonIE_Sodium_Compat
      * @return string
      * @throws SodiumException
      * @throws TypeError
-     * @psalm-suppress TooFewArguments
-     * @psalm-suppress MixedArgument
      */
     public static function crypto_scalarmult_base(
-        #[\SensitiveParameter]
-        $secretKey
-    ) {
-        /* Type checks: */
-        ParagonIE_Sodium_Core_Util::declareScalarType($secretKey, 'string', 1);
-
+        #[SensitiveParameter]
+        string $secretKey
+    ): string {
         /* Input validation: */
         if (ParagonIE_Sodium_Core_Util::strlen($secretKey) !== self::CRYPTO_BOX_SECRETKEYBYTES) {
             throw new SodiumException('Argument 1 must be CRYPTO_BOX_SECRETKEYBYTES long.');
@@ -2609,9 +2173,6 @@ class ParagonIE_Sodium_Compat
         if (ParagonIE_Sodium_Core_Util::hashEquals($secretKey, str_repeat("\0", self::CRYPTO_BOX_SECRETKEYBYTES))) {
             throw new SodiumException('Zero secret key is not allowed');
         }
-        if (PHP_INT_SIZE === 4) {
-            return ParagonIE_Sodium_Crypto32::scalarmult_base($secretKey);
-        }
         return ParagonIE_Sodium_Crypto::scalarmult_base($secretKey);
     }
 
@@ -2626,20 +2187,14 @@ class ParagonIE_Sodium_Compat
      * @return string           Ciphertext with Poly1305 MAC
      * @throws SodiumException
      * @throws TypeError
-     * @psalm-suppress MixedArgument
      */
     public static function crypto_secretbox(
-        #[\SensitiveParameter]
-        $plaintext,
-        $nonce,
-        #[\SensitiveParameter]
-        $key
-    ) {
-        /* Type checks: */
-        ParagonIE_Sodium_Core_Util::declareScalarType($plaintext, 'string', 1);
-        ParagonIE_Sodium_Core_Util::declareScalarType($nonce, 'string', 2);
-        ParagonIE_Sodium_Core_Util::declareScalarType($key, 'string', 3);
-
+        #[SensitiveParameter]
+        string $plaintext,
+        string $nonce,
+        #[SensitiveParameter]
+        string $key
+    ): string {
         /* Input validation: */
         if (ParagonIE_Sodium_Core_Util::strlen($nonce) !== self::CRYPTO_SECRETBOX_NONCEBYTES) {
             throw new SodiumException('Argument 2 must be CRYPTO_SECRETBOX_NONCEBYTES long.');
@@ -2654,9 +2209,6 @@ class ParagonIE_Sodium_Compat
         if (self::use_fallback('crypto_secretbox')) {
             return (string) call_user_func('\\Sodium\\crypto_secretbox', $plaintext, $nonce, $key);
         }
-        if (PHP_INT_SIZE === 4) {
-            return ParagonIE_Sodium_Crypto32::secretbox($plaintext, $nonce, $key);
-        }
         return ParagonIE_Sodium_Crypto::secretbox($plaintext, $nonce, $key);
     }
 
@@ -2666,24 +2218,16 @@ class ParagonIE_Sodium_Compat
      * @param string $ciphertext Ciphertext with Poly1305 MAC
      * @param string $nonce      A Number to be used Once; must be 24 bytes
      * @param string $key        Symmetric encryption key
-     * @return string            Original plaintext message
+     * @return string|bool       Original plaintext message
      * @throws SodiumException
      * @throws TypeError
-     * @psalm-suppress MixedArgument
-     * @psalm-suppress MixedInferredReturnType
-     * @psalm-suppress MixedReturnStatement
      */
     public static function crypto_secretbox_open(
-        $ciphertext,
-        $nonce,
-        #[\SensitiveParameter]
-        $key
-    ) {
-        /* Type checks: */
-        ParagonIE_Sodium_Core_Util::declareScalarType($ciphertext, 'string', 1);
-        ParagonIE_Sodium_Core_Util::declareScalarType($nonce, 'string', 2);
-        ParagonIE_Sodium_Core_Util::declareScalarType($key, 'string', 3);
-
+        string $ciphertext,
+        string $nonce,
+        #[SensitiveParameter]
+        string $key
+    ): string|bool {
         /* Input validation: */
         if (ParagonIE_Sodium_Core_Util::strlen($nonce) !== self::CRYPTO_SECRETBOX_NONCEBYTES) {
             throw new SodiumException('Argument 2 must be CRYPTO_SECRETBOX_NONCEBYTES long.');
@@ -2693,18 +2237,11 @@ class ParagonIE_Sodium_Compat
         }
 
         if (self::useNewSodiumAPI()) {
-            /**
-             * @psalm-suppress InvalidReturnStatement
-             * @psalm-suppress FalsableReturnStatement
-             */
             return sodium_crypto_secretbox_open($ciphertext, $nonce, $key);
         }
         if (self::use_fallback('crypto_secretbox_open')) {
             return call_user_func('\\Sodium\\crypto_secretbox_open', $ciphertext, $nonce, $key);
         }
-        if (PHP_INT_SIZE === 4) {
-            return ParagonIE_Sodium_Crypto32::secretbox_open($ciphertext, $nonce, $key);
-        }
         return ParagonIE_Sodium_Crypto::secretbox_open($ciphertext, $nonce, $key);
     }
 
@@ -2715,7 +2252,7 @@ class ParagonIE_Sodium_Compat
      * @throws Exception
      * @throws Error
      */
-    public static function crypto_secretbox_keygen()
+    public static function crypto_secretbox_keygen(): string
     {
         return random_bytes(self::CRYPTO_SECRETBOX_KEYBYTES);
     }
@@ -2731,15 +2268,13 @@ class ParagonIE_Sodium_Compat
      * @return string           Ciphertext with Poly1305 MAC
      * @throws SodiumException
      * @throws TypeError
-     * @psalm-suppress MixedArgument
      */
-    public static function crypto_secretbox_xchacha20poly1305($plaintext, $nonce, $key)
-    {
-        /* Type checks: */
-        ParagonIE_Sodium_Core_Util::declareScalarType($plaintext, 'string', 1);
-        ParagonIE_Sodium_Core_Util::declareScalarType($nonce, 'string', 2);
-        ParagonIE_Sodium_Core_Util::declareScalarType($key, 'string', 3);
-
+    public static function crypto_secretbox_xchacha20poly1305(
+        #[SensitiveParameter]
+        string $plaintext,
+        string $nonce,
+        string $key
+    ): string {
         /* Input validation: */
         if (ParagonIE_Sodium_Core_Util::strlen($nonce) !== self::CRYPTO_SECRETBOX_NONCEBYTES) {
             throw new SodiumException('Argument 2 must be CRYPTO_SECRETBOX_NONCEBYTES long.');
@@ -2747,11 +2282,9 @@ class ParagonIE_Sodium_Compat
         if (ParagonIE_Sodium_Core_Util::strlen($key) !== self::CRYPTO_SECRETBOX_KEYBYTES) {
             throw new SodiumException('Argument 3 must be CRYPTO_SECRETBOX_KEYBYTES long.');
         }
-        if (PHP_INT_SIZE === 4) {
-            return ParagonIE_Sodium_Crypto32::secretbox_xchacha20poly1305($plaintext, $nonce, $key);
-        }
         return ParagonIE_Sodium_Crypto::secretbox_xchacha20poly1305($plaintext, $nonce, $key);
     }
+
     /**
      * Decrypts a message previously encrypted with crypto_secretbox_xchacha20poly1305().
      *
@@ -2761,19 +2294,13 @@ class ParagonIE_Sodium_Compat
      * @return string            Original plaintext message
      * @throws SodiumException
      * @throws TypeError
-     * @psalm-suppress MixedArgument
      */
     public static function crypto_secretbox_xchacha20poly1305_open(
-        $ciphertext,
-        $nonce,
-        #[\SensitiveParameter]
-        $key
-    ) {
-        /* Type checks: */
-        ParagonIE_Sodium_Core_Util::declareScalarType($ciphertext, 'string', 1);
-        ParagonIE_Sodium_Core_Util::declareScalarType($nonce, 'string', 2);
-        ParagonIE_Sodium_Core_Util::declareScalarType($key, 'string', 3);
-
+        string $ciphertext,
+        string $nonce,
+        #[SensitiveParameter]
+        string $key
+    ): string {
         /* Input validation: */
         if (ParagonIE_Sodium_Core_Util::strlen($nonce) !== self::CRYPTO_SECRETBOX_NONCEBYTES) {
             throw new SodiumException('Argument 2 must be CRYPTO_SECRETBOX_NONCEBYTES long.');
@@ -2782,9 +2309,6 @@ class ParagonIE_Sodium_Compat
             throw new SodiumException('Argument 3 must be CRYPTO_SECRETBOX_KEYBYTES long.');
         }
 
-        if (PHP_INT_SIZE === 4) {
-            return ParagonIE_Sodium_Crypto32::secretbox_xchacha20poly1305_open($ciphertext, $nonce, $key);
-        }
         return ParagonIE_Sodium_Crypto::secretbox_xchacha20poly1305_open($ciphertext, $nonce, $key);
     }
 
@@ -2795,12 +2319,9 @@ class ParagonIE_Sodium_Compat
      * @throws SodiumException
      */
     public static function crypto_secretstream_xchacha20poly1305_init_push(
-        #[\SensitiveParameter]
-        $key
-    ) {
-        if (PHP_INT_SIZE === 4) {
-            return ParagonIE_Sodium_Crypto32::secretstream_xchacha20poly1305_init_push($key);
-        }
+        #[SensitiveParameter]
+        string $key
+    ): array {
         return ParagonIE_Sodium_Crypto::secretstream_xchacha20poly1305_init_push($key);
     }
 
@@ -2811,18 +2332,15 @@ class ParagonIE_Sodium_Compat
      * @throws Exception
      */
     public static function crypto_secretstream_xchacha20poly1305_init_pull(
-        $header,
-        #[\SensitiveParameter]
-        $key
-    ) {
+        string $header,
+        #[SensitiveParameter]
+        string $key
+    ): string {
         if (ParagonIE_Sodium_Core_Util::strlen($header) < self::CRYPTO_SECRETSTREAM_XCHACHA20POLY1305_HEADERBYTES) {
             throw new SodiumException(
                 'header size should be SODIUM_CRYPTO_SECRETSTREAM_XCHACHA20POLY1305_HEADERBYTES bytes'
             );
         }
-        if (PHP_INT_SIZE === 4) {
-            return ParagonIE_Sodium_Crypto32::secretstream_xchacha20poly1305_init_pull($key, $header);
-        }
         return ParagonIE_Sodium_Crypto::secretstream_xchacha20poly1305_init_pull($key, $header);
     }
 
@@ -2835,21 +2353,13 @@ class ParagonIE_Sodium_Compat
      * @throws SodiumException
      */
     public static function crypto_secretstream_xchacha20poly1305_push(
-        #[\SensitiveParameter]
-        &$state,
-        #[\SensitiveParameter]
-        $msg,
-        $aad = '',
-        $tag = 0
-    ) {
-        if (PHP_INT_SIZE === 4) {
-            return ParagonIE_Sodium_Crypto32::secretstream_xchacha20poly1305_push(
-                $state,
-                $msg,
-                $aad,
-                $tag
-            );
-        }
+        #[SensitiveParameter]
+        string &$state,
+        #[SensitiveParameter]
+        string $msg,
+        string $aad = '',
+        int $tag = 0
+    ): string {
         return ParagonIE_Sodium_Crypto::secretstream_xchacha20poly1305_push(
             $state,
             $msg,
@@ -2866,18 +2376,11 @@ class ParagonIE_Sodium_Compat
      * @throws SodiumException
      */
     public static function crypto_secretstream_xchacha20poly1305_pull(
-        #[\SensitiveParameter]
-        &$state,
-        $msg,
-        $aad = ''
-    ) {
-        if (PHP_INT_SIZE === 4) {
-            return ParagonIE_Sodium_Crypto32::secretstream_xchacha20poly1305_pull(
-                $state,
-                $msg,
-                $aad
-            );
-        }
+        #[SensitiveParameter]
+        string &$state,
+        string $msg,
+        string $aad = ''
+    ): bool|array {
         return ParagonIE_Sodium_Crypto::secretstream_xchacha20poly1305_pull(
             $state,
             $msg,
@@ -2889,7 +2392,7 @@ class ParagonIE_Sodium_Compat
      * @return string
      * @throws Exception
      */
-    public static function crypto_secretstream_xchacha20poly1305_keygen()
+    public static function crypto_secretstream_xchacha20poly1305_keygen(): string
     {
         return random_bytes(self::CRYPTO_SECRETSTREAM_XCHACHA20POLY1305_KEYBYTES);
     }
@@ -2900,14 +2403,10 @@ class ParagonIE_Sodium_Compat
      * @throws SodiumException
      */
     public static function crypto_secretstream_xchacha20poly1305_rekey(
-        #[\SensitiveParameter]
-        &$state
-    ) {
-        if (PHP_INT_SIZE === 4) {
-            ParagonIE_Sodium_Crypto32::secretstream_xchacha20poly1305_rekey($state);
-        } else {
-            ParagonIE_Sodium_Crypto::secretstream_xchacha20poly1305_rekey($state);
-        }
+        #[SensitiveParameter]
+        string &$state
+    ): void {
+        ParagonIE_Sodium_Crypto::secretstream_xchacha20poly1305_rekey($state);
     }
 
     /**
@@ -2918,19 +2417,12 @@ class ParagonIE_Sodium_Compat
      * @return string         Hash
      * @throws SodiumException
      * @throws TypeError
-     * @psalm-suppress MixedArgument
-     * @psalm-suppress MixedInferredReturnType
-     * @psalm-suppress MixedReturnStatement
      */
     public static function crypto_shorthash(
-        $message,
-        #[\SensitiveParameter]
-        $key
-    ) {
-        /* Type checks: */
-        ParagonIE_Sodium_Core_Util::declareScalarType($message, 'string', 1);
-        ParagonIE_Sodium_Core_Util::declareScalarType($key, 'string', 2);
-
+        string $message,
+        #[SensitiveParameter]
+        string $key
+    ): string {
         /* Input validation: */
         if (ParagonIE_Sodium_Core_Util::strlen($key) !== self::CRYPTO_SHORTHASH_KEYBYTES) {
             throw new SodiumException('Argument 2 must be CRYPTO_SHORTHASH_KEYBYTES long.');
@@ -2942,9 +2434,6 @@ class ParagonIE_Sodium_Compat
         if (self::use_fallback('crypto_shorthash')) {
             return (string) call_user_func('\\Sodium\\crypto_shorthash', $message, $key);
         }
-        if (PHP_INT_SIZE === 4) {
-            return ParagonIE_Sodium_Core32_SipHash::sipHash24($message, $key);
-        }
         return ParagonIE_Sodium_Core_SipHash::sipHash24($message, $key);
     }
 
@@ -2955,7 +2444,7 @@ class ParagonIE_Sodium_Compat
      * @throws Exception
      * @throws Error
      */
-    public static function crypto_shorthash_keygen()
+    public static function crypto_shorthash_keygen(): string
     {
         return random_bytes(self::CRYPTO_SHORTHASH_KEYBYTES);
     }
@@ -2971,33 +2460,22 @@ class ParagonIE_Sodium_Compat
      * @return string           Signed message (signature is prefixed).
      * @throws SodiumException
      * @throws TypeError
-     * @psalm-suppress MixedArgument
-     * @psalm-suppress MixedInferredReturnType
-     * @psalm-suppress MixedReturnStatement
      */
     public static function crypto_sign(
-        $message,
-        #[\SensitiveParameter]
-        $secretKey
-    ) {
-        /* Type checks: */
-        ParagonIE_Sodium_Core_Util::declareScalarType($message, 'string', 1);
-        ParagonIE_Sodium_Core_Util::declareScalarType($secretKey, 'string', 2);
-
+        string $message,
+        #[SensitiveParameter]
+        string $secretKey
+    ): string {
         /* Input validation: */
         if (ParagonIE_Sodium_Core_Util::strlen($secretKey) !== self::CRYPTO_SIGN_SECRETKEYBYTES) {
             throw new SodiumException('Argument 2 must be CRYPTO_SIGN_SECRETKEYBYTES long.');
         }
-
         if (self::useNewSodiumAPI()) {
             return sodium_crypto_sign($message, $secretKey);
         }
         if (self::use_fallback('crypto_sign')) {
             return (string) call_user_func('\\Sodium\\crypto_sign', $message, $secretKey);
         }
-        if (PHP_INT_SIZE === 4) {
-            return ParagonIE_Sodium_Crypto32::sign($message, $secretKey);
-        }
         return ParagonIE_Sodium_Crypto::sign($message, $secretKey);
     }
 
@@ -3006,22 +2484,13 @@ class ParagonIE_Sodium_Compat
      *
      * @param string $signedMessage A signed message
      * @param string $publicKey A public key
-     * @return string               The original message (if the signature is
+     * @return string|bool          The original message (if the signature is
      *                              valid for this public key)
      * @throws SodiumException
      * @throws TypeError
-     * @psalm-suppress MixedArgument
-     * @psalm-suppress MixedInferredReturnType
-     * @psalm-suppress MixedReturnStatement
      */
-    public static function crypto_sign_open(
-        $signedMessage,
-        $publicKey
-    ) {
-        /* Type checks: */
-        ParagonIE_Sodium_Core_Util::declareScalarType($signedMessage, 'string', 1);
-        ParagonIE_Sodium_Core_Util::declareScalarType($publicKey, 'string', 2);
-
+    public static function crypto_sign_open(string $signedMessage, string $publicKey): string|bool
+    {
         /* Input validation: */
         if (ParagonIE_Sodium_Core_Util::strlen($signedMessage) < self::CRYPTO_SIGN_BYTES) {
             throw new SodiumException('Argument 1 must be at least CRYPTO_SIGN_BYTES long.');
@@ -3031,18 +2500,11 @@ class ParagonIE_Sodium_Compat
         }
 
         if (self::useNewSodiumAPI()) {
-            /**
-             * @psalm-suppress InvalidReturnStatement
-             * @psalm-suppress FalsableReturnStatement
-             */
             return sodium_crypto_sign_open($signedMessage, $publicKey);
         }
         if (self::use_fallback('crypto_sign_open')) {
             return call_user_func('\\Sodium\\crypto_sign_open', $signedMessage, $publicKey);
         }
-        if (PHP_INT_SIZE === 4) {
-            return ParagonIE_Sodium_Crypto32::sign_open($signedMessage, $publicKey);
-        }
         return ParagonIE_Sodium_Crypto::sign_open($signedMessage, $publicKey);
     }
 
@@ -3053,7 +2515,7 @@ class ParagonIE_Sodium_Compat
      * @throws SodiumException
      * @throws TypeError
      */
-    public static function crypto_sign_keypair()
+    public static function crypto_sign_keypair(): string
     {
         if (self::useNewSodiumAPI()) {
             return sodium_crypto_sign_keypair();
@@ -3061,9 +2523,6 @@ class ParagonIE_Sodium_Compat
         if (self::use_fallback('crypto_sign_keypair')) {
             return (string) call_user_func('\\Sodium\\crypto_sign_keypair');
         }
-        if (PHP_INT_SIZE === 4) {
-            return ParagonIE_Sodium_Core32_Ed25519::keypair();
-        }
         return ParagonIE_Sodium_Core_Ed25519::keypair();
     }
 
@@ -3074,15 +2533,10 @@ class ParagonIE_Sodium_Compat
      * @throws SodiumException
      */
     public static function crypto_sign_keypair_from_secretkey_and_publickey(
-        #[\SensitiveParameter]
-        $sk,
-        $pk
-    )  {
-        ParagonIE_Sodium_Core_Util::declareScalarType($sk, 'string', 1);
-        ParagonIE_Sodium_Core_Util::declareScalarType($pk, 'string', 1);
-        $sk = (string) $sk;
-        $pk = (string) $pk;
-
+        #[SensitiveParameter]
+        string $sk,
+        string $pk
+    ): string {
         if (ParagonIE_Sodium_Core_Util::strlen($sk) !== self::CRYPTO_SIGN_SECRETKEYBYTES) {
             throw new SodiumException('secretkey should be SODIUM_CRYPTO_SIGN_SECRETKEYBYTES bytes');
         }
@@ -3103,14 +2557,11 @@ class ParagonIE_Sodium_Compat
      * @return string      Keypair
      * @throws SodiumException
      * @throws TypeError
-     * @psalm-suppress MixedArgument
      */
     public static function crypto_sign_seed_keypair(
-        #[\SensitiveParameter]
-        $seed
-    ) {
-        ParagonIE_Sodium_Core_Util::declareScalarType($seed, 'string', 1);
-
+        #[SensitiveParameter]
+        string $seed
+    ): string {
         if (self::useNewSodiumAPI()) {
             return sodium_crypto_sign_seed_keypair($seed);
         }
@@ -3119,11 +2570,7 @@ class ParagonIE_Sodium_Compat
         }
         $publicKey = '';
         $secretKey = '';
-        if (PHP_INT_SIZE === 4) {
-            ParagonIE_Sodium_Core32_Ed25519::seed_keypair($publicKey, $secretKey, $seed);
-        } else {
-            ParagonIE_Sodium_Core_Ed25519::seed_keypair($publicKey, $secretKey, $seed);
-        }
+        ParagonIE_Sodium_Core_Ed25519::seed_keypair($publicKey, $secretKey, $seed);
         return $secretKey . $publicKey;
     }
 
@@ -3134,15 +2581,11 @@ class ParagonIE_Sodium_Compat
      * @return string         Public key
      * @throws SodiumException
      * @throws TypeError
-     * @psalm-suppress MixedArgument
      */
     public static function crypto_sign_publickey(
-        #[\SensitiveParameter]
-        $keypair
-    ) {
-        /* Type checks: */
-        ParagonIE_Sodium_Core_Util::declareScalarType($keypair, 'string', 1);
-
+        #[SensitiveParameter]
+        string $keypair
+    ): string {
         /* Input validation: */
         if (ParagonIE_Sodium_Core_Util::strlen($keypair) !== self::CRYPTO_SIGN_KEYPAIRBYTES) {
             throw new SodiumException('Argument 1 must be CRYPTO_SIGN_KEYPAIRBYTES long.');
@@ -3154,9 +2597,6 @@ class ParagonIE_Sodium_Compat
         if (self::use_fallback('crypto_sign_publickey')) {
             return (string) call_user_func('\\Sodium\\crypto_sign_publickey', $keypair);
         }
-        if (PHP_INT_SIZE === 4) {
-            return ParagonIE_Sodium_Core32_Ed25519::publickey($keypair);
-        }
         return ParagonIE_Sodium_Core_Ed25519::publickey($keypair);
     }
 
@@ -3167,14 +2607,11 @@ class ParagonIE_Sodium_Compat
      * @return string           The corresponding Ed25519 public key
      * @throws SodiumException
      * @throws TypeError
-     * @psalm-suppress MixedArgument
      */
     public static function crypto_sign_publickey_from_secretkey(
-        #[\SensitiveParameter]
-        $secretKey
-    ) {
-        /* Type checks: */
-        ParagonIE_Sodium_Core_Util::declareScalarType($secretKey, 'string', 1);
+        #[SensitiveParameter]
+        string $secretKey
+    ): string {
 
         /* Input validation: */
         if (ParagonIE_Sodium_Core_Util::strlen($secretKey) !== self::CRYPTO_SIGN_SECRETKEYBYTES) {
@@ -3187,9 +2624,6 @@ class ParagonIE_Sodium_Compat
         if (self::use_fallback('crypto_sign_publickey_from_secretkey')) {
             return (string) call_user_func('\\Sodium\\crypto_sign_publickey_from_secretkey', $secretKey);
         }
-        if (PHP_INT_SIZE === 4) {
-            return ParagonIE_Sodium_Core32_Ed25519::publickey_from_secretkey($secretKey);
-        }
         return ParagonIE_Sodium_Core_Ed25519::publickey_from_secretkey($secretKey);
     }
 
@@ -3200,15 +2634,11 @@ class ParagonIE_Sodium_Compat
      * @return string         Secret key
      * @throws SodiumException
      * @throws TypeError
-     * @psalm-suppress MixedArgument
      */
     public static function crypto_sign_secretkey(
-        #[\SensitiveParameter]
-        $keypair
-    ) {
-        /* Type checks: */
-        ParagonIE_Sodium_Core_Util::declareScalarType($keypair, 'string', 1);
-
+        #[SensitiveParameter]
+        string $keypair
+    ): string {
         /* Input validation: */
         if (ParagonIE_Sodium_Core_Util::strlen($keypair) !== self::CRYPTO_SIGN_KEYPAIRBYTES) {
             throw new SodiumException('Argument 1 must be CRYPTO_SIGN_KEYPAIRBYTES long.');
@@ -3220,9 +2650,6 @@ class ParagonIE_Sodium_Compat
         if (self::use_fallback('crypto_sign_secretkey')) {
             return (string) call_user_func('\\Sodium\\crypto_sign_secretkey', $keypair);
         }
-        if (PHP_INT_SIZE === 4) {
-            return ParagonIE_Sodium_Core32_Ed25519::secretkey($keypair);
-        }
         return ParagonIE_Sodium_Core_Ed25519::secretkey($keypair);
     }
 
@@ -3236,17 +2663,12 @@ class ParagonIE_Sodium_Compat
      * @return string           Digital signature
      * @throws SodiumException
      * @throws TypeError
-     * @psalm-suppress MixedArgument
      */
     public static function crypto_sign_detached(
-        $message,
-        #[\SensitiveParameter]
-        $secretKey
-    ) {
-        /* Type checks: */
-        ParagonIE_Sodium_Core_Util::declareScalarType($message, 'string', 1);
-        ParagonIE_Sodium_Core_Util::declareScalarType($secretKey, 'string', 2);
-
+        string $message,
+        #[SensitiveParameter]
+        string $secretKey
+    ): string {
         /* Input validation: */
         if (ParagonIE_Sodium_Core_Util::strlen($secretKey) !== self::CRYPTO_SIGN_SECRETKEYBYTES) {
             throw new SodiumException('Argument 2 must be CRYPTO_SIGN_SECRETKEYBYTES long.');
@@ -3258,9 +2680,6 @@ class ParagonIE_Sodium_Compat
         if (self::use_fallback('crypto_sign_detached')) {
             return (string) call_user_func('\\Sodium\\crypto_sign_detached', $message, $secretKey);
         }
-        if (PHP_INT_SIZE === 4) {
-            return ParagonIE_Sodium_Crypto32::sign_detached($message, $secretKey);
-        }
         return ParagonIE_Sodium_Crypto::sign_detached($message, $secretKey);
     }
 
@@ -3274,15 +2693,12 @@ class ParagonIE_Sodium_Compat
      *                          FALSE otherwise
      * @throws SodiumException
      * @throws TypeError
-     * @psalm-suppress MixedArgument
      */
-    public static function crypto_sign_verify_detached($signature, $message, $publicKey)
-    {
-        /* Type checks: */
-        ParagonIE_Sodium_Core_Util::declareScalarType($signature, 'string', 1);
-        ParagonIE_Sodium_Core_Util::declareScalarType($message, 'string', 2);
-        ParagonIE_Sodium_Core_Util::declareScalarType($publicKey, 'string', 3);
-
+    public static function crypto_sign_verify_detached(
+        string $signature,
+        string $message,
+        string $publicKey
+    ): bool {
         /* Input validation: */
         if (ParagonIE_Sodium_Core_Util::strlen($signature) !== self::CRYPTO_SIGN_BYTES) {
             throw new SodiumException('Argument 1 must be CRYPTO_SIGN_BYTES long.');
@@ -3302,9 +2718,6 @@ class ParagonIE_Sodium_Compat
                 $publicKey
             );
         }
-        if (PHP_INT_SIZE === 4) {
-            return ParagonIE_Sodium_Crypto32::sign_verify_detached($signature, $message, $publicKey);
-        }
         return ParagonIE_Sodium_Crypto::sign_verify_detached($signature, $message, $publicKey);
     }
 
@@ -3315,28 +2728,21 @@ class ParagonIE_Sodium_Compat
      * @return string
      * @throws SodiumException
      * @throws TypeError
-     * @psalm-suppress MixedArgument
      */
-    public static function crypto_sign_ed25519_pk_to_curve25519($pk)
+    public static function crypto_sign_ed25519_pk_to_curve25519(string $pk): string
     {
-        /* Type checks: */
-        ParagonIE_Sodium_Core_Util::declareScalarType($pk, 'string', 1);
-
         /* Input validation: */
         if (ParagonIE_Sodium_Core_Util::strlen($pk) < self::CRYPTO_SIGN_PUBLICKEYBYTES) {
             throw new SodiumException('Argument 1 must be at least CRYPTO_SIGN_PUBLICKEYBYTES long.');
         }
         if (self::useNewSodiumAPI()) {
             if (is_callable('crypto_sign_ed25519_pk_to_curve25519')) {
-                return (string) sodium_crypto_sign_ed25519_pk_to_curve25519($pk);
+                return sodium_crypto_sign_ed25519_pk_to_curve25519($pk);
             }
         }
         if (self::use_fallback('crypto_sign_ed25519_pk_to_curve25519')) {
             return (string) call_user_func('\\Sodium\\crypto_sign_ed25519_pk_to_curve25519', $pk);
         }
-        if (PHP_INT_SIZE === 4) {
-            return ParagonIE_Sodium_Core32_Ed25519::pk_to_curve25519($pk);
-        }
         return ParagonIE_Sodium_Core_Ed25519::pk_to_curve25519($pk);
     }
 
@@ -3347,15 +2753,11 @@ class ParagonIE_Sodium_Compat
      * @return string
      * @throws SodiumException
      * @throws TypeError
-     * @psalm-suppress MixedArgument
      */
     public static function crypto_sign_ed25519_sk_to_curve25519(
-        #[\SensitiveParameter]
-        $sk
-    ) {
-        /* Type checks: */
-        ParagonIE_Sodium_Core_Util::declareScalarType($sk, 'string', 1);
-
+        #[SensitiveParameter]
+        string $sk
+    ): string {
         /* Input validation: */
         if (ParagonIE_Sodium_Core_Util::strlen($sk) < self::CRYPTO_SIGN_SEEDBYTES) {
             throw new SodiumException('Argument 1 must be at least CRYPTO_SIGN_SEEDBYTES long.');
@@ -3391,19 +2793,13 @@ class ParagonIE_Sodium_Compat
      *                      optional for security)
      * @throws SodiumException
      * @throws TypeError
-     * @psalm-suppress MixedArgument
      */
     public static function crypto_stream(
-        $len,
-        $nonce,
-        #[\SensitiveParameter]
-        $key
-    ) {
-        /* Type checks: */
-        ParagonIE_Sodium_Core_Util::declareScalarType($len, 'int', 1);
-        ParagonIE_Sodium_Core_Util::declareScalarType($nonce, 'string', 2);
-        ParagonIE_Sodium_Core_Util::declareScalarType($key, 'string', 3);
-
+        int $len,
+        string $nonce,
+        #[SensitiveParameter]
+        string $key
+    ): string {
         /* Input validation: */
         if (ParagonIE_Sodium_Core_Util::strlen($nonce) !== self::CRYPTO_STREAM_NONCEBYTES) {
             throw new SodiumException('Argument 2 must be CRYPTO_SECRETBOX_NONCEBYTES long.');
@@ -3418,9 +2814,6 @@ class ParagonIE_Sodium_Compat
         if (self::use_fallback('crypto_stream')) {
             return (string) call_user_func('\\Sodium\\crypto_stream', $len, $nonce, $key);
         }
-        if (PHP_INT_SIZE === 4) {
-            return ParagonIE_Sodium_Core32_XSalsa20::xsalsa20($len, $nonce, $key);
-        }
         return ParagonIE_Sodium_Core_XSalsa20::xsalsa20($len, $nonce, $key);
     }
 
@@ -3442,20 +2835,14 @@ class ParagonIE_Sodium_Compat
      *                        Encrypt then MAC)
      * @throws SodiumException
      * @throws TypeError
-     * @psalm-suppress MixedArgument
      */
     public static function crypto_stream_xor(
-        #[\SensitiveParameter]
-        $message,
-        $nonce,
-        #[\SensitiveParameter]
-        $key
-    ) {
-        /* Type checks: */
-        ParagonIE_Sodium_Core_Util::declareScalarType($message, 'string', 1);
-        ParagonIE_Sodium_Core_Util::declareScalarType($nonce, 'string', 2);
-        ParagonIE_Sodium_Core_Util::declareScalarType($key, 'string', 3);
-
+        #[SensitiveParameter]
+        string $message,
+        string $nonce,
+        #[SensitiveParameter]
+        string $key
+    ): string {
         /* Input validation: */
         if (ParagonIE_Sodium_Core_Util::strlen($nonce) !== self::CRYPTO_STREAM_NONCEBYTES) {
             throw new SodiumException('Argument 2 must be CRYPTO_SECRETBOX_NONCEBYTES long.');
@@ -3470,9 +2857,6 @@ class ParagonIE_Sodium_Compat
         if (self::use_fallback('crypto_stream_xor')) {
             return (string) call_user_func('\\Sodium\\crypto_stream_xor', $message, $nonce, $key);
         }
-        if (PHP_INT_SIZE === 4) {
-            return ParagonIE_Sodium_Core32_XSalsa20::xsalsa20_xor($message, $nonce, $key);
-        }
         return ParagonIE_Sodium_Core_XSalsa20::xsalsa20_xor($message, $nonce, $key);
     }
 
@@ -3483,12 +2867,11 @@ class ParagonIE_Sodium_Compat
      * @throws Exception
      * @throws Error
      */
-    public static function crypto_stream_keygen()
+    public static function crypto_stream_keygen(): string
     {
         return random_bytes(self::CRYPTO_STREAM_KEYBYTES);
     }
 
-
     /**
      * Expand a key and nonce into a keystream of pseudorandom bytes.
      *
@@ -3502,20 +2885,14 @@ class ParagonIE_Sodium_Compat
      *                      optional for security)
      * @throws SodiumException
      * @throws TypeError
-     * @psalm-suppress MixedArgument
      */
     public static function crypto_stream_xchacha20(
-        $len,
-        $nonce,
-        #[\SensitiveParameter]
-        $key,
-        $dontFallback = false
-    ) {
-        /* Type checks: */
-        ParagonIE_Sodium_Core_Util::declareScalarType($len, 'int', 1);
-        ParagonIE_Sodium_Core_Util::declareScalarType($nonce, 'string', 2);
-        ParagonIE_Sodium_Core_Util::declareScalarType($key, 'string', 3);
-
+        int $len,
+        string $nonce,
+        #[SensitiveParameter]
+        string $key,
+        bool $dontFallback = false
+    ): string {
         /* Input validation: */
         if (ParagonIE_Sodium_Core_Util::strlen($nonce) !== self::CRYPTO_STREAM_XCHACHA20_NONCEBYTES) {
             throw new SodiumException('Argument 2 must be CRYPTO_SECRETBOX_XCHACHA20_NONCEBYTES long.');
@@ -3527,9 +2904,6 @@ class ParagonIE_Sodium_Compat
         if (self::useNewSodiumAPI() && !$dontFallback) {
             return sodium_crypto_stream_xchacha20($len, $nonce, $key);
         }
-        if (PHP_INT_SIZE === 4) {
-            return ParagonIE_Sodium_Core32_XChaCha20::stream($len, $nonce, $key);
-        }
         return ParagonIE_Sodium_Core_XChaCha20::stream($len, $nonce, $key);
     }
 
@@ -3552,21 +2926,15 @@ class ParagonIE_Sodium_Compat
      * @param bool $dontFallback
      * @throws SodiumException
      * @throws TypeError
-     * @psalm-suppress MixedArgument
      */
     public static function crypto_stream_xchacha20_xor(
-        #[\SensitiveParameter]
-        $message,
-        $nonce,
-        #[\SensitiveParameter]
-        $key,
-        $dontFallback = false
-    ) {
-        /* Type checks: */
-        ParagonIE_Sodium_Core_Util::declareScalarType($message, 'string', 1);
-        ParagonIE_Sodium_Core_Util::declareScalarType($nonce, 'string', 2);
-        ParagonIE_Sodium_Core_Util::declareScalarType($key, 'string', 3);
-
+        #[SensitiveParameter]
+        string $message,
+        string $nonce,
+        #[SensitiveParameter]
+        string $key,
+        bool $dontFallback = false
+    ): string {
         /* Input validation: */
         if (ParagonIE_Sodium_Core_Util::strlen($nonce) !== self::CRYPTO_STREAM_XCHACHA20_NONCEBYTES) {
             throw new SodiumException('Argument 2 must be CRYPTO_SECRETBOX_XCHACHA20_NONCEBYTES long.');
@@ -3578,9 +2946,6 @@ class ParagonIE_Sodium_Compat
         if (self::useNewSodiumAPI() && !$dontFallback) {
             return sodium_crypto_stream_xchacha20_xor($message, $nonce, $key);
         }
-        if (PHP_INT_SIZE === 4) {
-            return ParagonIE_Sodium_Core32_XChaCha20::streamXorIc($message, $nonce, $key);
-        }
         return ParagonIE_Sodium_Core_XChaCha20::streamXorIc($message, $nonce, $key);
     }
 
@@ -3604,23 +2969,16 @@ class ParagonIE_Sodium_Compat
      * @param bool $dontFallback
      * @throws SodiumException
      * @throws TypeError
-     * @psalm-suppress MixedArgument
      */
     public static function crypto_stream_xchacha20_xor_ic(
-        #[\SensitiveParameter]
-        $message,
-        $nonce,
-        $counter,
-        #[\SensitiveParameter]
-        $key,
-        $dontFallback = false
-    ) {
-        /* Type checks: */
-        ParagonIE_Sodium_Core_Util::declareScalarType($message, 'string', 1);
-        ParagonIE_Sodium_Core_Util::declareScalarType($nonce, 'string', 2);
-        ParagonIE_Sodium_Core_Util::declareScalarType($counter, 'int', 3);
-        ParagonIE_Sodium_Core_Util::declareScalarType($key, 'string', 4);
-
+        #[SensitiveParameter]
+        string $message,
+        string $nonce,
+        int $counter,
+        #[SensitiveParameter]
+        string $key,
+        bool $dontFallback = false
+    ): string {
         /* Input validation: */
         if (ParagonIE_Sodium_Core_Util::strlen($nonce) !== self::CRYPTO_STREAM_XCHACHA20_NONCEBYTES) {
             throw new SodiumException('Argument 2 must be CRYPTO_SECRETBOX_XCHACHA20_NONCEBYTES long.');
@@ -3634,9 +2992,6 @@ class ParagonIE_Sodium_Compat
         }
 
         $ic = ParagonIE_Sodium_Core_Util::store64_le($counter);
-        if (PHP_INT_SIZE === 4) {
-            return ParagonIE_Sodium_Core32_XChaCha20::streamXorIc($message, $nonce, $key, $ic);
-        }
         return ParagonIE_Sodium_Core_XChaCha20::streamXorIc($message, $nonce, $key, $ic);
     }
 
@@ -3647,7 +3002,7 @@ class ParagonIE_Sodium_Compat
      * @throws Exception
      * @throws Error
      */
-    public static function crypto_stream_xchacha20_keygen()
+    public static function crypto_stream_xchacha20_keygen(): string
     {
         return random_bytes(self::CRYPTO_STREAM_XCHACHA20_KEYBYTES);
     }
@@ -3660,21 +3015,15 @@ class ParagonIE_Sodium_Compat
      * @return string        Raw binary string
      * @throws SodiumException
      * @throws TypeError
-     * @psalm-suppress TooFewArguments
-     * @psalm-suppress MixedArgument
      */
     public static function hex2bin(
-        #[\SensitiveParameter]
-        $string,
-        $ignore = ''
-    ) {
-        /* Type checks: */
-        ParagonIE_Sodium_Core_Util::declareScalarType($string, 'string', 1);
-        ParagonIE_Sodium_Core_Util::declareScalarType($ignore, 'string', 2);
-
+        #[SensitiveParameter]
+        string $string,
+        string $ignore = ''
+    ): string {
         if (self::useNewSodiumAPI()) {
             if (is_callable('sodium_hex2bin')) {
-                return (string) sodium_hex2bin($string, $ignore);
+                return sodium_hex2bin($string, $ignore);
             }
         }
         if (self::use_fallback('hex2bin')) {
@@ -3691,15 +3040,11 @@ class ParagonIE_Sodium_Compat
      * @return void
      * @throws SodiumException
      * @throws TypeError
-     * @psalm-suppress MixedArgument
      */
     public static function increment(
-        #[\SensitiveParameter]
-        &$var
-    ) {
-        /* Type checks: */
-        ParagonIE_Sodium_Core_Util::declareScalarType($var, 'string', 1);
-
+        #[SensitiveParameter]
+        string &$var
+    ): void {
         if (self::useNewSodiumAPI()) {
             sodium_increment($var);
             return;
@@ -3730,9 +3075,9 @@ class ParagonIE_Sodium_Compat
      * @throws SodiumException
      */
     public static function is_zero(
-        #[\SensitiveParameter]
-        $str
-    ) {
+        #[SensitiveParameter]
+        string $str
+    ): bool {
         $d = 0;
         for ($i = 0; $i < 32; ++$i) {
             $d |= ParagonIE_Sodium_Core_Util::chrToInt($str[$i]);
@@ -3746,7 +3091,7 @@ class ParagonIE_Sodium_Compat
      *
      * @return int
      */
-    public static function library_version_major()
+    public static function library_version_major(): int
     {
         if (self::useNewSodiumAPI() && defined('SODIUM_LIBRARY_MAJOR_VERSION')) {
             return SODIUM_LIBRARY_MAJOR_VERSION;
@@ -3764,7 +3109,7 @@ class ParagonIE_Sodium_Compat
      *
      * @return int
      */
-    public static function library_version_minor()
+    public static function library_version_minor(): int
     {
         if (self::useNewSodiumAPI() && defined('SODIUM_LIBRARY_MINOR_VERSION')) {
             return SODIUM_LIBRARY_MINOR_VERSION;
@@ -3784,26 +3129,19 @@ class ParagonIE_Sodium_Compat
      * @return int
      * @throws SodiumException
      * @throws TypeError
-     * @psalm-suppress MixedArgument
      */
     public static function memcmp(
-        #[\SensitiveParameter]
-        $left,
-        #[\SensitiveParameter]
-        $right
-    ) {
-        /* Type checks: */
-        ParagonIE_Sodium_Core_Util::declareScalarType($left, 'string', 1);
-        ParagonIE_Sodium_Core_Util::declareScalarType($right, 'string', 2);
-
+        #[SensitiveParameter]
+        string $left,
+        #[SensitiveParameter]
+        string $right
+    ): int {
         if (self::useNewSodiumAPI()) {
             return sodium_memcmp($left, $right);
         }
         if (self::use_fallback('memcmp')) {
             return (int) call_user_func('\\Sodium\\memcmp', $left, $right);
         }
-        /** @var string $left */
-        /** @var string $right */
         return ParagonIE_Sodium_Core_Util::memcmp($left, $right);
     }
 
@@ -3811,7 +3149,7 @@ class ParagonIE_Sodium_Compat
      * It's actually not possible to zero memory buffers in PHP. You need the
      * native library for that.
      *
-     * @param string|null $var
+     * @param ?string $var
      * @param-out string|null $var
      *
      * @return void
@@ -3820,12 +3158,12 @@ class ParagonIE_Sodium_Compat
      * @psalm-suppress TooFewArguments
      */
     public static function memzero(
-        #[\SensitiveParameter]
-        &$var
-    ) {
-        /* Type checks: */
-        ParagonIE_Sodium_Core_Util::declareScalarType($var, 'string', 1);
-
+        #[SensitiveParameter]
+        ?string &$var
+    ): void {
+        if (is_null($var)) {
+            return;
+        }
         if (self::useNewSodiumAPI()) {
             /** @psalm-suppress MixedArgument */
             sodium_memzero($var);
@@ -3834,9 +3172,7 @@ class ParagonIE_Sodium_Compat
         if (self::use_fallback('memzero')) {
             $func = '\\Sodium\\memzero';
             $func($var);
-            if ($var === null) {
-                return;
-            }
+            return;
         }
         // This is the best we can do.
         throw new SodiumException(
@@ -3853,20 +3189,13 @@ class ParagonIE_Sodium_Compat
      * @throws SodiumException
      */
     public static function pad(
-        #[\SensitiveParameter]
-        $unpadded,
-        $blockSize,
-        $dontFallback = false
-    ) {
-        /* Type checks: */
-        ParagonIE_Sodium_Core_Util::declareScalarType($unpadded, 'string', 1);
-        ParagonIE_Sodium_Core_Util::declareScalarType($blockSize, 'int', 2);
-
-        $unpadded = (string) $unpadded;
-        $blockSize = (int) $blockSize;
-
+        #[SensitiveParameter]
+        string $unpadded,
+        int $blockSize,
+        bool $dontFallback = false
+    ): string {
         if (self::useNewSodiumAPI() && !$dontFallback) {
-            return (string) sodium_pad($unpadded, $blockSize);
+            return sodium_pad($unpadded, $blockSize);
         }
 
         if ($blockSize <= 0) {
@@ -3890,16 +3219,15 @@ class ParagonIE_Sodium_Compat
             $k = $unpadded_len;
             for ($j = 0; $j <= $xpadded_len; ++$j) {
                 $i = (int) $i;
+                /** @psalm-suppress RedundantCast */
                 $k = (int) $k;
-                $st = (int) $st;
                 if ($j >= $unpadded_len) {
                     $padded[$j] = "\0";
                 } else {
                     $padded[$j] = $unpadded[$j];
                 }
-                /** @var int $k */
                 $k -= $st;
-                $st = (int) (~(
+                $st = (~(
                             (
                                 (
                                     ($k >> 48)
@@ -3943,20 +3271,13 @@ class ParagonIE_Sodium_Compat
      * @throws SodiumException
      */
     public static function unpad(
-        #[\SensitiveParameter]
-        $padded,
-        $blockSize,
-        $dontFallback = false
-    ) {
-        /* Type checks: */
-        ParagonIE_Sodium_Core_Util::declareScalarType($padded, 'string', 1);
-        ParagonIE_Sodium_Core_Util::declareScalarType($blockSize, 'int', 2);
-
-        $padded = (string) $padded;
-        $blockSize = (int) $blockSize;
-
+        #[SensitiveParameter]
+        string $padded,
+        int $blockSize,
+        bool $dontFallback = false
+    ): string {
         if (self::useNewSodiumAPI() && !$dontFallback) {
-            return (string) sodium_unpad($padded, $blockSize);
+            return sodium_unpad($padded, $blockSize);
         }
         if ($blockSize <= 0) {
             throw new SodiumException('block size cannot be less than 1');
@@ -4010,7 +3331,7 @@ class ParagonIE_Sodium_Compat
      *
      * @return bool
      */
-    public static function polyfill_is_fast()
+    public static function polyfill_is_fast(): bool
     {
         if (extension_loaded('sodium')) {
             return true;
@@ -4030,25 +3351,12 @@ class ParagonIE_Sodium_Compat
      * @throws Exception
      * @throws TypeError
      */
-    public static function randombytes_buf($numBytes)
+    public static function randombytes_buf(int $numBytes): string
     {
-        /* Type checks: */
-        if (!is_int($numBytes)) {
-            if (is_numeric($numBytes)) {
-                $numBytes = (int) $numBytes;
-            } else {
-                throw new TypeError(
-                    'Argument 1 must be an integer, ' . gettype($numBytes) . ' given.'
-                );
-            }
-        }
         /** @var positive-int $numBytes */
         if (self::use_fallback('randombytes_buf')) {
             return (string) call_user_func('\\Sodium\\randombytes_buf', $numBytes);
         }
-        if ($numBytes < 0) {
-            throw new SodiumException("Number of bytes must be a positive integer");
-        }
         return random_bytes($numBytes);
     }
 
@@ -4061,18 +3369,8 @@ class ParagonIE_Sodium_Compat
      * @throws Error
      * @throws TypeError
      */
-    public static function randombytes_uniform($range)
+    public static function randombytes_uniform(int $range): int
     {
-        /* Type checks: */
-        if (!is_int($range)) {
-            if (is_numeric($range)) {
-                $range = (int) $range;
-            } else {
-                throw new TypeError(
-                    'Argument 1 must be an integer, ' . gettype($range) . ' given.'
-                );
-            }
-        }
         if (self::use_fallback('randombytes_uniform')) {
             return (int) call_user_func('\\Sodium\\randombytes_uniform', $range);
         }
@@ -4087,7 +3385,7 @@ class ParagonIE_Sodium_Compat
      * @throws Error
      * @throws TypeError
      */
-    public static function randombytes_random16()
+    public static function randombytes_random16(): int
     {
         if (self::use_fallback('randombytes_random16')) {
             return (int) call_user_func('\\Sodium\\randombytes_random16');
@@ -4102,10 +3400,9 @@ class ParagonIE_Sodium_Compat
      * @throws SodiumException
      */
     public static function ristretto255_is_valid_point(
-        #[\SensitiveParameter]
-        $p,
-        $dontFallback = false
-    ) {
+        string $p,
+        bool $dontFallback = false
+    ): bool {
         if (self::useNewSodiumAPI() && !$dontFallback) {
             return sodium_crypto_core_ristretto255_is_valid_point($p);
         }
@@ -4129,12 +3426,12 @@ class ParagonIE_Sodium_Compat
      * @throws SodiumException
      */
     public static function ristretto255_add(
-        #[\SensitiveParameter]
-        $p,
-        #[\SensitiveParameter]
-        $q,
-        $dontFallback = false
-    ) {
+        #[SensitiveParameter]
+        string $p,
+        #[SensitiveParameter]
+        string $q,
+        bool $dontFallback = false
+    ): string {
         if (self::useNewSodiumAPI() && !$dontFallback) {
             return sodium_crypto_core_ristretto255_add($p, $q);
         }
@@ -4149,12 +3446,12 @@ class ParagonIE_Sodium_Compat
      * @throws SodiumException
      */
     public static function ristretto255_sub(
-        #[\SensitiveParameter]
-        $p,
-        #[\SensitiveParameter]
-        $q,
-        $dontFallback = false
-    ) {
+        #[SensitiveParameter]
+        string $p,
+        #[SensitiveParameter]
+        string $q,
+        bool $dontFallback = false
+    ): string{
         if (self::useNewSodiumAPI() && !$dontFallback) {
             return sodium_crypto_core_ristretto255_sub($p, $q);
         }
@@ -4169,10 +3466,10 @@ class ParagonIE_Sodium_Compat
      * @throws SodiumException
      */
     public static function ristretto255_from_hash(
-        #[\SensitiveParameter]
-        $r,
-        $dontFallback = false
-    ) {
+        #[SensitiveParameter]
+        string $r,
+        bool $dontFallback = false
+    ): string {
         if (self::useNewSodiumAPI() && !$dontFallback) {
             return sodium_crypto_core_ristretto255_from_hash($r);
         }
@@ -4185,7 +3482,7 @@ class ParagonIE_Sodium_Compat
      *
      * @throws SodiumException
      */
-    public static function ristretto255_random($dontFallback = false)
+    public static function ristretto255_random(bool $dontFallback = false): string
     {
         if (self::useNewSodiumAPI() && !$dontFallback) {
             return sodium_crypto_core_ristretto255_random();
@@ -4199,7 +3496,7 @@ class ParagonIE_Sodium_Compat
      *
      * @throws SodiumException
      */
-    public static function ristretto255_scalar_random($dontFallback = false)
+    public static function ristretto255_scalar_random(bool $dontFallback = false): string
     {
         if (self::useNewSodiumAPI() && !$dontFallback) {
             return sodium_crypto_core_ristretto255_scalar_random();
@@ -4214,10 +3511,10 @@ class ParagonIE_Sodium_Compat
      * @throws SodiumException
      */
     public static function ristretto255_scalar_invert(
-        #[\SensitiveParameter]
-        $s,
-        $dontFallback = false
-    ) {
+        #[SensitiveParameter]
+        string $s,
+        bool $dontFallback = false
+    ): string {
         if (self::useNewSodiumAPI() && !$dontFallback) {
             return sodium_crypto_core_ristretto255_scalar_invert($s);
         }
@@ -4230,10 +3527,10 @@ class ParagonIE_Sodium_Compat
      * @throws SodiumException
      */
     public static function ristretto255_scalar_negate(
-        #[\SensitiveParameter]
-        $s,
-        $dontFallback = false
-    ) {
+        #[SensitiveParameter]
+        string $s,
+        bool $dontFallback = false
+    ): string {
         if (self::useNewSodiumAPI() && !$dontFallback) {
             return sodium_crypto_core_ristretto255_scalar_negate($s);
         }
@@ -4247,10 +3544,10 @@ class ParagonIE_Sodium_Compat
      * @throws SodiumException
      */
     public static function ristretto255_scalar_complement(
-        #[\SensitiveParameter]
-        $s,
-        $dontFallback = false
-    ) {
+        #[SensitiveParameter]
+        string $s,
+        bool $dontFallback = false
+    ): string {
         if (self::useNewSodiumAPI() && !$dontFallback) {
             return sodium_crypto_core_ristretto255_scalar_complement($s);
         }
@@ -4265,12 +3562,12 @@ class ParagonIE_Sodium_Compat
      * @throws SodiumException
      */
     public static function ristretto255_scalar_add(
-        #[\SensitiveParameter]
-        $x,
-        #[\SensitiveParameter]
-        $y,
-        $dontFallback = false
-    ) {
+        #[SensitiveParameter]
+        string $x,
+        #[SensitiveParameter]
+        string $y,
+        bool $dontFallback = false
+    ): string {
         if (self::useNewSodiumAPI() && !$dontFallback) {
             return sodium_crypto_core_ristretto255_scalar_add($x, $y);
         }
@@ -4285,12 +3582,12 @@ class ParagonIE_Sodium_Compat
      * @throws SodiumException
      */
     public static function ristretto255_scalar_sub(
-        #[\SensitiveParameter]
-        $x,
-        #[\SensitiveParameter]
-        $y,
-        $dontFallback = false
-    ) {
+        #[SensitiveParameter]
+        string $x,
+        #[SensitiveParameter]
+        string $y,
+        bool $dontFallback = false
+    ): string {
         if (self::useNewSodiumAPI() && !$dontFallback) {
             return sodium_crypto_core_ristretto255_scalar_sub($x, $y);
         }
@@ -4305,12 +3602,12 @@ class ParagonIE_Sodium_Compat
      * @throws SodiumException
      */
     public static function ristretto255_scalar_mul(
-        #[\SensitiveParameter]
-        $x,
-        #[\SensitiveParameter]
-        $y,
-        $dontFallback = false
-    ) {
+        #[SensitiveParameter]
+        string $x,
+        #[SensitiveParameter]
+        string $y,
+        bool $dontFallback = false
+    ): string {
         if (self::useNewSodiumAPI() && !$dontFallback) {
             return sodium_crypto_core_ristretto255_scalar_mul($x, $y);
         }
@@ -4325,12 +3622,12 @@ class ParagonIE_Sodium_Compat
      * @throws SodiumException
      */
     public static function scalarmult_ristretto255(
-        #[\SensitiveParameter]
-        $n,
-        #[\SensitiveParameter]
-        $p,
-        $dontFallback = false
-    ) {
+        #[SensitiveParameter]
+        string $n,
+        #[SensitiveParameter]
+        string $p,
+        bool $dontFallback = false
+    ): string {
         if (self::useNewSodiumAPI() && !$dontFallback) {
             return sodium_crypto_scalarmult_ristretto255($n, $p);
         }
@@ -4339,16 +3636,15 @@ class ParagonIE_Sodium_Compat
 
     /**
      * @param string $n
-     * @param string $p
      * @param bool $dontFallback
      * @return string
      * @throws SodiumException
      */
     public static function scalarmult_ristretto255_base(
-        #[\SensitiveParameter]
-        $n,
-        $dontFallback = false
-    ) {
+        #[SensitiveParameter]
+        string $n,
+        bool $dontFallback = false
+    ): string {
         if (self::useNewSodiumAPI() && !$dontFallback) {
             return sodium_crypto_scalarmult_ristretto255_base($n);
         }
@@ -4362,52 +3658,16 @@ class ParagonIE_Sodium_Compat
      * @throws SodiumException
      */
     public static function ristretto255_scalar_reduce(
-        #[\SensitiveParameter]
-        $s,
-        $dontFallback = false
-    ) {
+        #[SensitiveParameter]
+        string $s,
+        bool $dontFallback = false
+    ): string {
         if (self::useNewSodiumAPI() && !$dontFallback) {
             return sodium_crypto_core_ristretto255_scalar_reduce($s);
         }
         return ParagonIE_Sodium_Core_Ristretto255::sc_reduce($s);
     }
 
-    /**
-     * Runtime testing method for 32-bit platforms.
-     *
-     * Usage: If runtime_speed_test() returns FALSE, then our 32-bit
-     *        implementation is to slow to use safely without risking timeouts.
-     *        If this happens, install sodium from PECL to get acceptable
-     *        performance.
-     *
-     * @param int $iterations Number of multiplications to attempt
-     * @param int $maxTimeout Milliseconds
-     * @return bool           TRUE if we're fast enough, FALSE is not
-     * @throws SodiumException
-     */
-    public static function runtime_speed_test($iterations, $maxTimeout)
-    {
-        if (self::polyfill_is_fast()) {
-            return true;
-        }
-        /** @var float $end */
-        $end = 0.0;
-        /** @var float $start */
-        $start = microtime(true);
-        /** @var ParagonIE_Sodium_Core32_Int64 $a */
-        $a = ParagonIE_Sodium_Core32_Int64::fromInt(random_int(3, 1 << 16));
-        for ($i = 0; $i < $iterations; ++$i) {
-            /** @var ParagonIE_Sodium_Core32_Int64 $b */
-            $b = ParagonIE_Sodium_Core32_Int64::fromInt(random_int(3, 1 << 16));
-            $a->mulInt64($b);
-        }
-        /** @var float $end */
-        $end = microtime(true);
-        /** @var int $diff */
-        $diff = (int) ceil(($end - $start) * 1000);
-        return $diff < $maxTimeout;
-    }
-
     /**
      * Add two numbers (little-endian unsigned), storing the value in the first
      * parameter.
@@ -4420,11 +3680,11 @@ class ParagonIE_Sodium_Compat
      * @throws SodiumException
      */
     public static function sub(
-        #[\SensitiveParameter]
-        &$val,
-        #[\SensitiveParameter]
-        $addv
-    ) {
+        #[SensitiveParameter]
+        string &$val,
+        #[SensitiveParameter]
+        string $addv
+    ): void {
         $val_len = ParagonIE_Sodium_Core_Util::strlen($val);
         $addv_len = ParagonIE_Sodium_Core_Util::strlen($addv);
         if ($val_len !== $addv_len) {
@@ -4450,15 +3710,15 @@ class ParagonIE_Sodium_Compat
      * @psalm-suppress MixedInferredReturnType
      * @psalm-suppress UndefinedFunction
      */
-    public static function version_string()
+    public static function version_string(): string
     {
         if (self::useNewSodiumAPI()) {
-            return (string) sodium_version_string();
+            return sodium_version_string();
         }
         if (self::use_fallback('version_string')) {
             return (string) call_user_func('\\Sodium\\version_string');
         }
-        return (string) self::VERSION_STRING;
+        return self::VERSION_STRING;
     }
 
     /**
@@ -4473,7 +3733,7 @@ class ParagonIE_Sodium_Compat
      *
      * @return bool
      */
-    protected static function use_fallback($sodium_func_name = '')
+    protected static function use_fallback(string $sodium_func_name = ''): bool
     {
         static $res = null;
         if ($res === null) {
@@ -4500,7 +3760,7 @@ class ParagonIE_Sodium_Compat
      * @ref https://wiki.php.net/rfc/libsodium
      * @return bool
      */
-    protected static function useNewSodiumAPI()
+    protected static function useNewSodiumAPI(): bool
     {
         static $res = null;
         if ($res === null) {

diff --git a/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core/AEGIS/State128L.php b/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core/AEGIS/State128L.php
index 9decd2b43126812ec409aec18bf639482aa4dbb1..3e33cf74f85c06ed3f675404617279b562d3f229 100644 (file)
--- a/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core/AEGIS/State128L.php
+++ b/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core/AEGIS/State128L.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 if (class_exists('ParagonIE_Sodium_Core_AEGIS_State128L', false)) {
     return;
@@ -14,7 +15,8 @@ if (!defined('SODIUM_COMPAT_AEGIS_C1')) {
 class ParagonIE_Sodium_Core_AEGIS_State128L
 {
     /** @var array<int, string> $state */
-    protected $state;
+    protected array $state;
+
     public function __construct()
     {
         $this->state = array_fill(0, 8, '');
@@ -24,7 +26,7 @@ class ParagonIE_Sodium_Core_AEGIS_State128L
      * @internal Only use this for unit tests!
      * @return string[]
      */
-    public function getState()
+    public function getState(): array
     {
         return array_values($this->state);
     }
@@ -36,7 +38,7 @@ class ParagonIE_Sodium_Core_AEGIS_State128L
      *
      * @internal Only for unit tests
      */
-    public static function initForUnitTests(array $input)
+    public static function initForUnitTests(array $input): self
     {
         if (count($input) < 8) {
             throw new SodiumException('invalid input');
@@ -53,8 +55,11 @@ class ParagonIE_Sodium_Core_AEGIS_State128L
      * @param string $nonce
      * @return self
      */
-    public static function init($key, $nonce)
-    {
+    public static function init(
+        #[SensitiveParameter]
+        string $key,
+        string $nonce
+    ): self {
         $state = new self();
 
         // S0 = key ^ nonce
@@ -83,9 +88,11 @@ class ParagonIE_Sodium_Core_AEGIS_State128L
 
     /**
      * @param string $ai
-     * @return self
+     * @return static
+     *
+     * @throws SodiumException
      */
-    public function absorb($ai)
+    public function absorb(string $ai): static
     {
         if (ParagonIE_Sodium_Core_Util::strlen($ai) !== 32) {
             throw new SodiumException('Input must be two AES blocks in size');
@@ -101,7 +108,7 @@ class ParagonIE_Sodium_Core_AEGIS_State128L
      * @return string
      * @throws SodiumException
      */
-    public function dec($ci)
+    public function dec(string $ci): string
     {
         if (ParagonIE_Sodium_Core_Util::strlen($ci) !== 32) {
             throw new SodiumException('Input must be two AES blocks in size');
@@ -134,8 +141,10 @@ class ParagonIE_Sodium_Core_AEGIS_State128L
     /**
      * @param string $cn
      * @return string
+     *
+     * @throws SodiumException
      */
-    public function decPartial($cn)
+    public function decPartial(string $cn): string
     {
         $len = ParagonIE_Sodium_Core_Util::strlen($cn);
 
@@ -149,7 +158,7 @@ class ParagonIE_Sodium_Core_AEGIS_State128L
             ^ ParagonIE_Sodium_Core_Util::andStrings($this->state[6], $this->state[7]);
 
         // t0, t1 = Split(ZeroPad(cn, 256), 128)
-        $cn = str_pad($cn, 32, "\0", STR_PAD_RIGHT);
+        $cn = str_pad($cn, 32, "\0");
         $t0 = ParagonIE_Sodium_Core_Util::substr($cn, 0, 16);
         $t1 = ParagonIE_Sodium_Core_Util::substr($cn, 16, 16);
         // out0 = t0 ^ z0
@@ -161,7 +170,7 @@ class ParagonIE_Sodium_Core_AEGIS_State128L
         $xn = ParagonIE_Sodium_Core_Util::substr($out0 . $out1, 0, $len);
 
         // v0, v1 = Split(ZeroPad(xn, 256), 128)
-        $padded = str_pad($xn, 32, "\0", STR_PAD_RIGHT);
+        $padded = str_pad($xn, 32, "\0");
         $v0 = ParagonIE_Sodium_Core_Util::substr($padded, 0, 16);
         $v1 = ParagonIE_Sodium_Core_Util::substr($padded, 16, 16);
         // Update(v0, v1)
@@ -176,8 +185,10 @@ class ParagonIE_Sodium_Core_AEGIS_State128L
      * @return string
      * @throws SodiumException
      */
-    public function enc($xi)
-    {
+    public function enc(
+        #[SensitiveParameter]
+        string $xi
+    ): string {
         if (ParagonIE_Sodium_Core_Util::strlen($xi) !== 32) {
             throw new SodiumException('Input must be two AES blocks in size');
         }
@@ -213,7 +224,7 @@ class ParagonIE_Sodium_Core_AEGIS_State128L
      * @param int $msg_len_bits
      * @return string
      */
-    public function finalize($ad_len_bits, $msg_len_bits)
+    public function finalize(int $ad_len_bits, int $msg_len_bits): string
     {
         $encoded = ParagonIE_Sodium_Core_Util::store64_le($ad_len_bits) .
             ParagonIE_Sodium_Core_Util::store64_le($msg_len_bits);
@@ -228,9 +239,9 @@ class ParagonIE_Sodium_Core_AEGIS_State128L
     /**
      * @param string $m0
      * @param string $m1
-     * @return self
+     * @return static
      */
-    public function update($m0, $m1)
+    public function update(string $m0, string $m1): static
     {
         /*
            S'0 = AESRound(S7, S0 ^ M0)

diff --git a/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core/AEGIS/State256.php b/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core/AEGIS/State256.php
index 6f88b828e1bcf5ca7b0341f3be54c898622fbd7a..30cb5ef85201bbef07d13e7d827af941268ccdbf 100644 (file)
--- a/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core/AEGIS/State256.php
+++ b/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core/AEGIS/State256.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 if (class_exists('ParagonIE_Sodium_Core_AEGIS_State256', false)) {
     return;
@@ -14,7 +15,8 @@ if (!defined('SODIUM_COMPAT_AEGIS_C1')) {
 class ParagonIE_Sodium_Core_AEGIS_State256
 {
     /** @var array<int, string> $state */
-    protected $state;
+    protected array $state;
+
     public function __construct()
     {
         $this->state = array_fill(0, 6, '');
@@ -24,7 +26,7 @@ class ParagonIE_Sodium_Core_AEGIS_State256
      * @internal Only use this for unit tests!
      * @return string[]
      */
-    public function getState()
+    public function getState(): array
     {
         return array_values($this->state);
     }
@@ -36,7 +38,7 @@ class ParagonIE_Sodium_Core_AEGIS_State256
      *
      * @internal Only for unit tests
      */
-    public static function initForUnitTests(array $input)
+    public static function initForUnitTests(array $input): self
     {
         if (count($input) < 6) {
             throw new SodiumException('invalid input');
@@ -53,8 +55,11 @@ class ParagonIE_Sodium_Core_AEGIS_State256
      * @param string $nonce
      * @return self
      */
-    public static function init($key, $nonce)
-    {
+    public static function init(
+        #[SensitiveParameter]
+        string $key,
+        string $nonce
+    ): self {
         $state = new self();
         $k0 = ParagonIE_Sodium_Core_Util::substr($key, 0, 16);
         $k1 = ParagonIE_Sodium_Core_Util::substr($key, 16, 16);
@@ -93,10 +98,10 @@ class ParagonIE_Sodium_Core_AEGIS_State256
 
     /**
      * @param string $ai
-     * @return self
+     * @return static
      * @throws SodiumException
      */
-    public function absorb($ai)
+    public function absorb(string $ai): static
     {
         if (ParagonIE_Sodium_Core_Util::strlen($ai) !== 16) {
             throw new SodiumException('Input must be an AES block in size');
@@ -109,7 +114,7 @@ class ParagonIE_Sodium_Core_AEGIS_State256
      * @return string
      * @throws SodiumException
      */
-    public function dec($ci)
+    public function dec(string $ci): string
     {
         if (ParagonIE_Sodium_Core_Util::strlen($ci) !== 16) {
             throw new SodiumException('Input must be an AES block in size');
@@ -127,8 +132,10 @@ class ParagonIE_Sodium_Core_AEGIS_State256
     /**
      * @param string $cn
      * @return string
+     *
+     * @throws SodiumException
      */
-    public function decPartial($cn)
+    public function decPartial(string $cn): string
     {
         $len = ParagonIE_Sodium_Core_Util::strlen($cn);
         // z = S1 ^ S4 ^ S5 ^ (S2 & S3)
@@ -138,7 +145,7 @@ class ParagonIE_Sodium_Core_AEGIS_State256
             ^ ParagonIE_Sodium_Core_Util::andStrings($this->state[2], $this->state[3]);
 
         // t = ZeroPad(cn, 128)
-        $t = str_pad($cn, 16, "\0", STR_PAD_RIGHT);
+        $t = str_pad($cn, 16, "\0");
 
         // out = t ^ z
         $out = $t ^ $z;
@@ -147,7 +154,7 @@ class ParagonIE_Sodium_Core_AEGIS_State256
         $xn = ParagonIE_Sodium_Core_Util::substr($out, 0, $len);
 
         // v = ZeroPad(xn, 128)
-        $v = str_pad($xn, 16, "\0", STR_PAD_RIGHT);
+        $v = str_pad($xn, 16, "\0");
         // Update(v)
         $this->update($v);
 
@@ -160,8 +167,10 @@ class ParagonIE_Sodium_Core_AEGIS_State256
      * @return string
      * @throws SodiumException
      */
-    public function enc($xi)
-    {
+    public function enc(
+        #[SensitiveParameter]
+        string $xi
+    ): string {
         if (ParagonIE_Sodium_Core_Util::strlen($xi) !== 16) {
             throw new SodiumException('Input must be an AES block in size');
         }
@@ -179,8 +188,10 @@ class ParagonIE_Sodium_Core_AEGIS_State256
      * @param int $msg_len_bits
      * @return string
      */
-    public function finalize($ad_len_bits, $msg_len_bits)
-    {
+    public function finalize(
+        int $ad_len_bits,
+        int $msg_len_bits
+    ): string {
         $encoded = ParagonIE_Sodium_Core_Util::store64_le($ad_len_bits) .
             ParagonIE_Sodium_Core_Util::store64_le($msg_len_bits);
         $t = $this->state[3] ^ $encoded;
@@ -195,9 +206,9 @@ class ParagonIE_Sodium_Core_AEGIS_State256
 
     /**
      * @param string $m
-     * @return self
+     * @return static
      */
-    public function update($m)
+    public function update(string $m): static
     {
         /*
             S'0 = AESRound(S5, S0 ^ M)

diff --git a/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core/AEGIS128L.php b/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core/AEGIS128L.php
index ad1e85d324d3f6bff3efbed73b54ad468c7285b6..bf38c050338e0812253fe32e85a27f95058893b1 100644 (file)
--- a/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core/AEGIS128L.php
+++ b/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core/AEGIS128L.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 if (!defined('SODIUM_COMPAT_AEGIS_C0')) {
     define('SODIUM_COMPAT_AEGIS_C0', "\x00\x01\x01\x02\x03\x05\x08\x0d\x15\x22\x37\x59\x90\xe9\x79\x62");
@@ -18,14 +19,20 @@ class ParagonIE_Sodium_Core_AEGIS128L extends ParagonIE_Sodium_Core_AES
      * @return string
      * @throws SodiumException
      */
-    public static function decrypt($ct, $tag, $ad, $key, $nonce)
-    {
+    public static function decrypt(
+        string $ct,
+        string $tag,
+        string $ad,
+        #[SensitiveParameter]
+        string $key,
+        string $nonce
+    ): string {
         $state = self::init($key, $nonce);
         $ad_blocks = (self::strlen($ad) + 31) >> 5;
         for ($i = 0; $i < $ad_blocks; ++$i) {
             $ai = self::substr($ad, $i << 5, 32);
             if (self::strlen($ai) < 32) {
-                $ai = str_pad($ai, 32, "\0", STR_PAD_RIGHT);
+                $ai = str_pad($ai, 32, "\0");
             }
             $state->absorb($ai);
         }
@@ -48,7 +55,7 @@ class ParagonIE_Sodium_Core_AEGIS128L extends ParagonIE_Sodium_Core_AES
             try {
                 // The RFC says to erase msg, so we shall try:
                 ParagonIE_Sodium_Compat::memzero($msg);
-            } catch (SodiumException $ex) {
+            } catch (SodiumException) {
                 // Do nothing if we cannot memzero
             }
             throw new SodiumException('verification failed');
@@ -65,8 +72,14 @@ class ParagonIE_Sodium_Core_AEGIS128L extends ParagonIE_Sodium_Core_AES
      *
      * @throws SodiumException
      */
-    public static function encrypt($msg, $ad, $key, $nonce)
-    {
+    public static function encrypt(
+        #[SensitiveParameter]
+        string $msg,
+        string $ad,
+        #[SensitiveParameter]
+        string $key,
+        string $nonce
+    ): array {
         $state = self::init($key, $nonce);
         // ad_blocks = Split(ZeroPad(ad, 256), 256)
         // for ai in ad_blocks:
@@ -77,7 +90,7 @@ class ParagonIE_Sodium_Core_AEGIS128L extends ParagonIE_Sodium_Core_AES
         for ($i = 0; $i < $ad_blocks; ++$i) {
             $ai = self::substr($ad, $i << 5, 32);
             if (self::strlen($ai) < 32) {
-                $ai = str_pad($ai, 32, "\0", STR_PAD_RIGHT);
+                $ai = str_pad($ai, 32, "\0");
             }
             $state->absorb($ai);
         }
@@ -90,7 +103,7 @@ class ParagonIE_Sodium_Core_AEGIS128L extends ParagonIE_Sodium_Core_AES
         for ($i = 0; $i < $msg_blocks; ++$i) {
             $xi = self::substr($msg, $i << 5, 32);
             if (self::strlen($xi) < 32) {
-                $xi = str_pad($xi, 32, "\0", STR_PAD_RIGHT);
+                $xi = str_pad($xi, 32, "\0");
             }
             $ct .= $state->enc($xi);
         }
@@ -112,7 +125,7 @@ class ParagonIE_Sodium_Core_AEGIS128L extends ParagonIE_Sodium_Core_AES
      * @param string $nonce
      * @return ParagonIE_Sodium_Core_AEGIS_State128L
      */
-    public static function init($key, $nonce)
+    public static function init(string $key, string $nonce): ParagonIE_Sodium_Core_AEGIS_State128L
     {
         return ParagonIE_Sodium_Core_AEGIS_State128L::init($key, $nonce);
     }

diff --git a/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core/AEGIS256.php b/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core/AEGIS256.php
index 605bbcafde9a23818fdd53786855bb4ac557f826..c2d9bb0045e4fad7eced1c49eaa21c996c3eebae 100644 (file)
--- a/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core/AEGIS256.php
+++ b/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core/AEGIS256.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 if (!defined('SODIUM_COMPAT_AEGIS_C0')) {
     define('SODIUM_COMPAT_AEGIS_C0', "\x00\x01\x01\x02\x03\x05\x08\x0d\x15\x22\x37\x59\x90\xe9\x79\x62");
@@ -18,8 +19,14 @@ class ParagonIE_Sodium_Core_AEGIS256 extends ParagonIE_Sodium_Core_AES
      * @return string
      * @throws SodiumException
      */
-    public static function decrypt($ct, $tag, $ad, $key, $nonce)
-    {
+    public static function decrypt(
+        string $ct,
+        string $tag,
+        string $ad,
+        #[SensitiveParameter]
+        string $key,
+        string $nonce
+    ): string {
         $state = self::init($key, $nonce);
 
         // ad_blocks = Split(ZeroPad(ad, 128), 128)
@@ -29,7 +36,7 @@ class ParagonIE_Sodium_Core_AEGIS256 extends ParagonIE_Sodium_Core_AES
         for ($i = 0; $i < $ad_blocks; ++$i) {
             $ai = self::substr($ad, $i << 4, 16);
             if (self::strlen($ai) < 16) {
-                $ai = str_pad($ai, 16, "\0", STR_PAD_RIGHT);
+                $ai = str_pad($ai, 16, "\0");
             }
             $state->absorb($ai);
         }
@@ -56,7 +63,7 @@ class ParagonIE_Sodium_Core_AEGIS256 extends ParagonIE_Sodium_Core_AES
             try {
                 // The RFC says to erase msg, so we shall try:
                 ParagonIE_Sodium_Compat::memzero($msg);
-            } catch (SodiumException $ex) {
+            } catch (SodiumException) {
                 // Do nothing if we cannot memzero
             }
             throw new SodiumException('verification failed');
@@ -72,8 +79,14 @@ class ParagonIE_Sodium_Core_AEGIS256 extends ParagonIE_Sodium_Core_AES
      * @return array
      * @throws SodiumException
      */
-    public static function encrypt($msg, $ad, $key, $nonce)
-    {
+    public static function encrypt(
+        #[SensitiveParameter]
+        string $msg,
+        string $ad,
+        #[SensitiveParameter]
+        string $key,
+        string $nonce
+    ): array {
         $state = self::init($key, $nonce);
         $ad_len = self::strlen($ad);
         $msg_len = self::strlen($msg);
@@ -81,7 +94,7 @@ class ParagonIE_Sodium_Core_AEGIS256 extends ParagonIE_Sodium_Core_AES
         for ($i = 0; $i < $ad_blocks; ++$i) {
             $ai = self::substr($ad, $i << 4, 16);
             if (self::strlen($ai) < 16) {
-                $ai = str_pad($ai, 16, "\0", STR_PAD_RIGHT);
+                $ai = str_pad($ai, 16, "\0");
             }
             $state->absorb($ai);
         }
@@ -91,7 +104,7 @@ class ParagonIE_Sodium_Core_AEGIS256 extends ParagonIE_Sodium_Core_AES
         for ($i = 0; $i < $msg_blocks; ++$i) {
             $xi = self::substr($msg, $i << 4, 16);
             if (self::strlen($xi) < 16) {
-                $xi = str_pad($xi, 16, "\0", STR_PAD_RIGHT);
+                $xi = str_pad($xi, 16, "\0");
             }
             $ct .= $state->enc($xi);
         }
@@ -111,8 +124,11 @@ class ParagonIE_Sodium_Core_AEGIS256 extends ParagonIE_Sodium_Core_AES
      * @param string $nonce
      * @return ParagonIE_Sodium_Core_AEGIS_State256
      */
-    public static function init($key, $nonce)
-    {
+    public static function init(
+        #[SensitiveParameter]
+        string $key,
+        string $nonce
+    ): ParagonIE_Sodium_Core_AEGIS_State256 {
         return ParagonIE_Sodium_Core_AEGIS_State256::init($key, $nonce);
     }
 }

diff --git a/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core/AES.php b/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core/AES.php
index d86cff1a5b1f48db5a06d70368762a912a123943..6fd334330364e5bd1783bd30e4f9f2a650fd5af5 100644 (file)
--- a/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core/AES.php
+++ b/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core/AES.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 if (class_exists('ParagonIE_Sodium_Core_AES', false)) {
     return;
@@ -16,9 +17,7 @@ class ParagonIE_Sodium_Core_AES extends ParagonIE_Sodium_Core_Util
     /**
      * @var int[] AES round constants
      */
-    private static $Rcon = array(
-        0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80, 0x1B, 0x36
-    );
+    private const Rcon = [0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80, 0x1B, 0x36];
 
     /**
      * Mutates the values of $q!
@@ -26,7 +25,7 @@ class ParagonIE_Sodium_Core_AES extends ParagonIE_Sodium_Core_Util
      * @param ParagonIE_Sodium_Core_AES_Block $q
      * @return void
      */
-    public static function sbox(ParagonIE_Sodium_Core_AES_Block $q)
+    public static function sbox(ParagonIE_Sodium_Core_AES_Block $q): void
     {
         /**
          * @var int $x0
@@ -189,7 +188,7 @@ class ParagonIE_Sodium_Core_AES extends ParagonIE_Sodium_Core_Util
      * @param ParagonIE_Sodium_Core_AES_Block $q
      * @return void
      */
-    public static function invSbox(ParagonIE_Sodium_Core_AES_Block $q)
+    public static function invSbox(ParagonIE_Sodium_Core_AES_Block $q): void
     {
         self::processInversion($q);
         self::sbox($q);
@@ -205,7 +204,7 @@ class ParagonIE_Sodium_Core_AES extends ParagonIE_Sodium_Core_Util
      * @param ParagonIE_Sodium_Core_AES_Block $q
      * @return void
      */
-    protected static function processInversion(ParagonIE_Sodium_Core_AES_Block $q)
+    protected static function processInversion(ParagonIE_Sodium_Core_AES_Block $q): void
     {
         $q0 = (~$q[0]) & self::U32_MAX;
         $q1 = (~$q[1]) & self::U32_MAX;
@@ -229,7 +228,7 @@ class ParagonIE_Sodium_Core_AES extends ParagonIE_Sodium_Core_Util
      * @param int $x
      * @return int
      */
-    public static function subWord($x)
+    public static function subWord(int $x): int
     {
         $q = ParagonIE_Sodium_Core_AES_Block::fromArray(
             array($x, $x, $x, $x, $x, $x, $x, $x)
@@ -247,22 +246,17 @@ class ParagonIE_Sodium_Core_AES extends ParagonIE_Sodium_Core_Util
      * @return ParagonIE_Sodium_Core_AES_KeySchedule
      * @throws SodiumException
      */
-    public static function keySchedule($key)
-    {
+    public static function keySchedule(
+        #[SensitiveParameter]
+        string $key
+    ): ParagonIE_Sodium_Core_AES_KeySchedule {
         $key_len = self::strlen($key);
-        switch ($key_len) {
-            case 16:
-                $num_rounds = 10;
-                break;
-            case 24:
-                $num_rounds = 12;
-                break;
-            case 32:
-                $num_rounds = 14;
-                break;
-            default:
-                throw new SodiumException('Invalid key length: ' . $key_len);
-        }
+        $num_rounds = match ($key_len) {
+            16 => 10,
+            24 => 12,
+            32 => 14,
+            default => throw new SodiumException('Invalid key length: ' . $key_len),
+        };
         $skey = array();
         $comp_skey = array();
         $nk = $key_len >> 2;
@@ -278,7 +272,8 @@ class ParagonIE_Sodium_Core_AES extends ParagonIE_Sodium_Core_Util
         for ($i = $nk, $j = 0, $k = 0; $i < $nkf; ++$i) {
             if ($j === 0) {
                 $tmp = (($tmp & 0xff) << 24) | ($tmp >> 8);
-                $tmp = (self::subWord($tmp) ^ self::$Rcon[$k]) & self::U32_MAX;
+                /** @psalm-suppress InvalidArrayOffset */
+                $tmp = (self::subWord($tmp) ^ self::Rcon[$k]) & self::U32_MAX;
             } elseif ($nk > 6 && $j === 4) {
                 $tmp = self::subWord($tmp);
             }
@@ -319,8 +314,8 @@ class ParagonIE_Sodium_Core_AES extends ParagonIE_Sodium_Core_Util
     public static function addRoundKey(
         ParagonIE_Sodium_Core_AES_Block $q,
         ParagonIE_Sodium_Core_AES_KeySchedule $skey,
-        $offset = 0
-    ) {
+        int $offset = 0
+    ): void {
         $block = $skey->getRoundKey($offset);
         for ($j = 0; $j < 8; ++$j) {
             $q[$j] = ($q[$j] ^ $block[$j]) & ParagonIE_Sodium_Core_Util::U32_MAX;
@@ -335,8 +330,11 @@ class ParagonIE_Sodium_Core_AES extends ParagonIE_Sodium_Core_Util
      * @return string
      * @throws SodiumException
      */
-    public static function decryptBlockECB($message, $key)
-    {
+    public static function decryptBlockECB(
+        string $message,
+        #[SensitiveParameter]
+        string $key
+    ): string {
         if (self::strlen($message) !== 16) {
             throw new SodiumException('decryptBlockECB() expects a 16 byte message');
         }
@@ -365,8 +363,12 @@ class ParagonIE_Sodium_Core_AES extends ParagonIE_Sodium_Core_Util
      * @return string
      * @throws SodiumException
      */
-    public static function encryptBlockECB($message, $key)
-    {
+    public static function encryptBlockECB(
+        #[SensitiveParameter]
+        string $message,
+        #[SensitiveParameter]
+        string $key
+    ): string {
         if (self::strlen($message) !== 16) {
             throw new SodiumException('encryptBlockECB() expects a 16 byte message');
         }
@@ -398,7 +400,7 @@ class ParagonIE_Sodium_Core_AES extends ParagonIE_Sodium_Core_Util
     public static function bitsliceEncryptBlock(
         ParagonIE_Sodium_Core_AES_Expanded $skey,
         ParagonIE_Sodium_Core_AES_Block $q
-    ) {
+    ): void {
         self::addRoundKey($q, $skey);
         for ($u = 1; $u < $skey->getNumRounds(); ++$u) {
             self::sbox($q);
@@ -416,8 +418,12 @@ class ParagonIE_Sodium_Core_AES extends ParagonIE_Sodium_Core_Util
      * @param string $y
      * @return string
      */
-    public static function aesRound($x, $y)
-    {
+    public static function aesRound(
+        #[SensitiveParameter]
+        string $x,
+        #[SensitiveParameter]
+        string $y
+    ): string {
         $q = ParagonIE_Sodium_Core_AES_Block::init();
         $q[0] = self::load_4(self::substr($x, 0, 4));
         $q[2] = self::load_4(self::substr($x, 4, 4));
@@ -454,8 +460,16 @@ class ParagonIE_Sodium_Core_AES extends ParagonIE_Sodium_Core_Util
      * @param string $rk1 Second round key
      * @return string[]
      */
-    public static function doubleRound($b0, $rk0, $b1, $rk1)
-    {
+    public static function doubleRound(
+        #[SensitiveParameter]
+        string $b0,
+        #[SensitiveParameter]
+        string $rk0,
+        #[SensitiveParameter]
+        string $b1,
+        #[SensitiveParameter]
+        string $rk1
+    ): array {
         $q = ParagonIE_Sodium_Core_AES_Block::init();
         // First block
         $q[0] = self::load_4(self::substr($b0, 0, 4));
@@ -466,7 +480,7 @@ class ParagonIE_Sodium_Core_AES extends ParagonIE_Sodium_Core_Util
         $q[1] = self::load_4(self::substr($b1, 0, 4));
         $q[3] = self::load_4(self::substr($b1, 4, 4));
         $q[5] = self::load_4(self::substr($b1, 8, 4));
-        $q[7] = self::load_4(self::substr($b1, 12, 4));;
+        $q[7] = self::load_4(self::substr($b1, 12, 4));
 
         $rk = ParagonIE_Sodium_Core_AES_Block::init();
         // First round key
@@ -503,7 +517,7 @@ class ParagonIE_Sodium_Core_AES extends ParagonIE_Sodium_Core_Util
     public static function bitsliceDecryptBlock(
         ParagonIE_Sodium_Core_AES_Expanded $skey,
         ParagonIE_Sodium_Core_AES_Block $q
-    ) {
+    ): void {
         self::addRoundKey($q, $skey, ($skey->getNumRounds() << 3));
         for ($u = $skey->getNumRounds() - 1; $u > 0; --$u) {
             $q->inverseShiftRows();

diff --git a/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core/AES/Block.php b/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core/AES/Block.php
index 070eb8d329b074297cf59f1e2e1eb2eed4a16c74..c93c1a487992a6d80f51f1ef00bfb7f5ea0e085f 100644 (file)
--- a/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core/AES/Block.php
+++ b/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core/AES/Block.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 if (class_exists('ParagonIE_Sodium_Core_AES_Block', false)) {
     return;
@@ -6,23 +7,25 @@ if (class_exists('ParagonIE_Sodium_Core_AES_Block', false)) {
 
 /**
  * @internal This should only be used by sodium_compat
+ *
+ * @psalm-suppress MissingTemplateParam
  */
 class ParagonIE_Sodium_Core_AES_Block extends SplFixedArray
 {
     /**
      * @var array<int, int>
      */
-    protected $values = array();
+    protected array $values = array();
 
     /**
      * @var int
      */
-    protected $size;
+    protected int $size;
 
     /**
      * @param int $size
      */
-    public function __construct($size = 8)
+    public function __construct(int $size = 8)
     {
         parent::__construct($size);
         $this->size = $size;
@@ -32,7 +35,7 @@ class ParagonIE_Sodium_Core_AES_Block extends SplFixedArray
     /**
      * @return self
      */
-    public static function init()
+    public static function init(): self
     {
         return new self(8);
     }
@@ -47,7 +50,7 @@ class ParagonIE_Sodium_Core_AES_Block extends SplFixedArray
      * @psalm-suppress MethodSignatureMismatch
      */
     #[ReturnTypeWillChange]
-    public static function fromArray($array, $save_indexes = null)
+    public static function fromArray($array, ?bool $save_indexes = null)
     {
         $count = count($array);
         if ($save_indexes) {
@@ -83,11 +86,8 @@ class ParagonIE_Sodium_Core_AES_Block extends SplFixedArray
      * @psalm-suppress MixedArrayOffset
      */
     #[ReturnTypeWillChange]
-    public function offsetSet($offset, $value)
+    public function offsetSet($offset, $value): void
     {
-        if (!is_int($value)) {
-            throw new InvalidArgumentException('Expected an integer');
-        }
         if (is_null($offset)) {
             $this->values[] = $value;
         } else {
@@ -120,7 +120,7 @@ class ParagonIE_Sodium_Core_AES_Block extends SplFixedArray
      * @psalm-suppress MixedArrayOffset
      */
     #[ReturnTypeWillChange]
-    public function offsetUnset($offset)
+    public function offsetUnset($offset): void
     {
         unset($this->values[$offset]);
     }
@@ -140,7 +140,7 @@ class ParagonIE_Sodium_Core_AES_Block extends SplFixedArray
         if (!isset($this->values[$offset])) {
             $this->values[$offset] = 0;
         }
-        return (int) ($this->values[$offset]);
+        return $this->values[$offset];
     }
 
     /**
@@ -166,10 +166,15 @@ class ParagonIE_Sodium_Core_AES_Block extends SplFixedArray
      * @param int $s shift
      * @param int $x index 1
      * @param int $y index 2
-     * @return self
+     * @return static
      */
-    public function swapN($cl, $ch, $s, $x, $y)
-    {
+    public function swapN(
+        int $cl,
+        int $ch,
+        int $s,
+        int $x,
+        int $y
+    ): static {
         static $u32mask = ParagonIE_Sodium_Core_Util::U32_MAX;
         $a = $this->values[$x] & $u32mask;
         $b = $this->values[$y] & $u32mask;
@@ -183,37 +188,43 @@ class ParagonIE_Sodium_Core_AES_Block extends SplFixedArray
     /**
      * @param int $x index 1
      * @param int $y index 2
-     * @return self
+     * @return static
      */
-    public function swap2($x, $y)
-    {
+    public function swap2(
+        int $x,
+        int $y
+    ): static {
         return $this->swapN(0x55555555, 0xAAAAAAAA, 1, $x, $y);
     }
 
     /**
      * @param int $x index 1
      * @param int $y index 2
-     * @return self
+     * @return static
      */
-    public function swap4($x, $y)
-    {
+    public function swap4(
+        int $x,
+        int $y
+    ): static {
         return $this->swapN(0x33333333, 0xCCCCCCCC, 2, $x, $y);
     }
 
     /**
      * @param int $x index 1
      * @param int $y index 2
-     * @return self
+     * @return static
      */
-    public function swap8($x, $y)
-    {
+    public function swap8(
+        int $x,
+        int $y
+    ): static {
         return $this->swapN(0x0F0F0F0F, 0xF0F0F0F0, 4, $x, $y);
     }
 
     /**
-     * @return self
+     * @return static
      */
-    public function orthogonalize()
+    public function orthogonalize(): static
     {
         return $this
             ->swap2(0, 1)
@@ -233,9 +244,9 @@ class ParagonIE_Sodium_Core_AES_Block extends SplFixedArray
     }
 
     /**
-     * @return self
+     * @return static
      */
-    public function shiftRows()
+    public function shiftRows(): static
     {
         for ($i = 0; $i < 8; ++$i) {
             $x = $this->values[$i] & ParagonIE_Sodium_Core_Util::U32_MAX;
@@ -253,15 +264,15 @@ class ParagonIE_Sodium_Core_AES_Block extends SplFixedArray
      * @param int $x
      * @return int
      */
-    public static function rotr16($x)
+    public static function rotr16(int $x): int
     {
         return (($x << 16) & ParagonIE_Sodium_Core_Util::U32_MAX) | ($x >> 16);
     }
 
     /**
-     * @return self
+     * @return static
      */
-    public function mixColumns()
+    public function mixColumns(): static
     {
         $q0 = $this->values[0];
         $q1 = $this->values[1];
@@ -292,9 +303,9 @@ class ParagonIE_Sodium_Core_AES_Block extends SplFixedArray
     }
 
     /**
-     * @return self
+     * @return static
      */
-    public function inverseMixColumns()
+    public function inverseMixColumns(): static
     {
         $q0 = $this->values[0];
         $q1 = $this->values[1];
@@ -325,9 +336,9 @@ class ParagonIE_Sodium_Core_AES_Block extends SplFixedArray
     }
 
     /**
-     * @return self
+     * @return static
      */
-    public function inverseShiftRows()
+    public function inverseShiftRows(): static
     {
         for ($i = 0; $i < 8; ++$i) {
             $x = $this->values[$i];

diff --git a/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core/AES/Expanded.php b/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core/AES/Expanded.php
index 84a6a476586917aef54df63ef6cb93852b80c156..053b5601d5fd7f4e1b7c45b7b8e02785e6c4f5c8 100644 (file)
--- a/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core/AES/Expanded.php
+++ b/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core/AES/Expanded.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 if (class_exists('ParagonIE_Sodium_Core_AES_Expanded', false)) {
     return;
@@ -8,7 +9,4 @@ if (class_exists('ParagonIE_Sodium_Core_AES_Expanded', false)) {
  * @internal This should only be used by sodium_compat
  */
 class ParagonIE_Sodium_Core_AES_Expanded extends ParagonIE_Sodium_Core_AES_KeySchedule
-{
-    /** @var bool $expanded */
-    protected $expanded = true;
-}
+{}

diff --git a/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core/AES/KeySchedule.php b/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core/AES/KeySchedule.php
index 6b0df18aedd773fd20ac4607ea7a119438343bf4..ade8556f92966a735660dc9d618ac6670a746685 100644 (file)
--- a/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core/AES/KeySchedule.php
+++ b/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core/AES/KeySchedule.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 if (class_exists('ParagonIE_Sodium_Core_AES_KeySchedule', false)) {
     return;
@@ -10,19 +11,19 @@ if (class_exists('ParagonIE_Sodium_Core_AES_KeySchedule', false)) {
 class ParagonIE_Sodium_Core_AES_KeySchedule
 {
     /** @var array<int, int> $skey -- has size 120 */
-    protected $skey;
+    protected array $skey;
 
     /** @var bool $expanded */
-    protected $expanded = false;
+    protected bool $expanded = false;
 
     /** @var int $numRounds */
-    private $numRounds;
+    private int $numRounds;
 
     /**
      * @param array $skey
      * @param int $numRounds
      */
-    public function __construct(array $skey, $numRounds = 10)
+    public function __construct(array $skey, int $numRounds = 10)
     {
         $this->skey = $skey;
         $this->numRounds = $numRounds;
@@ -34,7 +35,7 @@ class ParagonIE_Sodium_Core_AES_KeySchedule
      * @param int $i
      * @return int
      */
-    public function get($i)
+    public function get(int $i): int
     {
         return $this->skey[$i];
     }
@@ -42,7 +43,7 @@ class ParagonIE_Sodium_Core_AES_KeySchedule
     /**
      * @return int
      */
-    public function getNumRounds()
+    public function getNumRounds(): int
     {
         return $this->numRounds;
     }
@@ -51,7 +52,7 @@ class ParagonIE_Sodium_Core_AES_KeySchedule
      * @param int $offset
      * @return ParagonIE_Sodium_Core_AES_Block
      */
-    public function getRoundKey($offset)
+    public function getRoundKey(int $offset): ParagonIE_Sodium_Core_AES_Block
     {
         return ParagonIE_Sodium_Core_AES_Block::fromArray(
             array_slice($this->skey, $offset, 8)
@@ -63,7 +64,7 @@ class ParagonIE_Sodium_Core_AES_KeySchedule
      *
      * @return ParagonIE_Sodium_Core_AES_Expanded
      */
-    public function expand()
+    public function expand(): ParagonIE_Sodium_Core_AES_Expanded
     {
         $exp = new ParagonIE_Sodium_Core_AES_Expanded(
             array_fill(0, 120, 0),

diff --git a/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core/BLAKE2b.php b/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core/BLAKE2b.php
index 6ad4ab7ce67ce3c21826e7b78468ac88268701fe..fbe348b30acfcf39a9240d393da78ea2b1238700 100644 (file)
--- a/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core/BLAKE2b.php
+++ b/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core/BLAKE2b.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 if (class_exists('ParagonIE_Sodium_Core_BLAKE2b', false)) {
     return;
@@ -14,28 +15,26 @@ abstract class ParagonIE_Sodium_Core_BLAKE2b extends ParagonIE_Sodium_Core_Util
     /**
      * @var SplFixedArray
      */
-    protected static $iv;
+    protected static SplFixedArray $iv;
 
     /**
      * @var array<int, array<int, int>>
      */
-    protected static $sigma = array(
-        array(  0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14, 15),
-        array( 14, 10,  4,  8,  9, 15, 13,  6,  1, 12,  0,  2, 11,  7,  5,  3),
-        array( 11,  8, 12,  0,  5,  2, 15, 13, 10, 14,  3,  6,  7,  1,  9,  4),
-        array(  7,  9,  3,  1, 13, 12, 11, 14,  2,  6,  5, 10,  4,  0, 15,  8),
-        array(  9,  0,  5,  7,  2,  4, 10, 15, 14,  1, 11, 12,  6,  8,  3, 13),
-        array(  2, 12,  6, 10,  0, 11,  8,  3,  4, 13,  7,  5, 15, 14,  1,  9),
-        array( 12,  5,  1, 15, 14, 13,  4, 10,  0,  7,  6,  3,  9,  2,  8, 11),
-        array( 13, 11,  7, 14, 12,  1,  3,  9,  5,  0, 15,  4,  8,  6,  2, 10),
-        array(  6, 15, 14,  9, 11,  3,  0,  8, 12,  2, 13,  7,  1,  4, 10,  5),
-        array( 10,  2,  8,  4,  7,  6,  1,  5, 15, 11,  9, 14,  3, 12, 13 , 0),
-        array(  0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14, 15),
-        array( 14, 10,  4,  8,  9, 15, 13,  6,  1, 12,  0,  2, 11,  7,  5,  3)
-    );
-
-    const BLOCKBYTES = 128;
-    const OUTBYTES   = 64;
+    protected const SIGMA = [
+        [  0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14, 15],
+        [ 14, 10,  4,  8,  9, 15, 13,  6,  1, 12,  0,  2, 11,  7,  5,  3],
+        [ 11,  8, 12,  0,  5,  2, 15, 13, 10, 14,  3,  6,  7,  1,  9,  4],
+        [  7,  9,  3,  1, 13, 12, 11, 14,  2,  6,  5, 10,  4,  0, 15,  8],
+        [  9,  0,  5,  7,  2,  4, 10, 15, 14,  1, 11, 12,  6,  8,  3, 13],
+        [  2, 12,  6, 10,  0, 11,  8,  3,  4, 13,  7,  5, 15, 14,  1,  9],
+        [ 12,  5,  1, 15, 14, 13,  4, 10,  0,  7,  6,  3,  9,  2,  8, 11],
+        [ 13, 11,  7, 14, 12,  1,  3,  9,  5,  0, 15,  4,  8,  6,  2, 10],
+        [  6, 15, 14,  9, 11,  3,  0,  8, 12,  2, 13,  7,  1,  4, 10,  5],
+        [ 10,  2,  8,  4,  7,  6,  1,  5, 15, 11,  9, 14,  3, 12, 13 , 0],
+        [  0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14, 15],
+        [ 14, 10,  4,  8,  9, 15, 13,  6,  1, 12,  0,  2, 11,  7,  5,  3]
+    ];
+
     const KEYBYTES   = 64;
 
     /**
@@ -46,13 +45,9 @@ abstract class ParagonIE_Sodium_Core_BLAKE2b extends ParagonIE_Sodium_Core_Util
      * @param int $high
      * @param int $low
      * @return SplFixedArray
-     * @psalm-suppress MixedAssignment
      */
-    public static function new64($high, $low)
+    public static function new64(int $high, int $low): SplFixedArray
     {
-        if (PHP_INT_SIZE === 4) {
-            throw new SodiumException("Error, use 32-bit");
-        }
         $i64 = new SplFixedArray(2);
         $i64[0] = $high & 0xffffffff;
         $i64[1] = $low & 0xffffffff;
@@ -67,8 +62,9 @@ abstract class ParagonIE_Sodium_Core_BLAKE2b extends ParagonIE_Sodium_Core_Util
      *
      * @param int $num
      * @return SplFixedArray
+     * @throws SodiumException
      */
-    protected static function to64($num)
+    protected static function to64(int $num): SplFixedArray
     {
         list($hi, $lo) = self::numericTo64BitInteger($num);
         return self::new64($hi, $lo);
@@ -83,21 +79,17 @@ abstract class ParagonIE_Sodium_Core_BLAKE2b extends ParagonIE_Sodium_Core_Util
      * @param SplFixedArray $x
      * @param SplFixedArray $y
      * @return SplFixedArray
-     * @psalm-suppress MixedArgument
-     * @psalm-suppress MixedAssignment
-     * @psalm-suppress MixedOperand
+     *
+     * @throws SodiumException
      */
-    protected static function add64($x, $y)
+    protected static function add64(SplFixedArray $x, SplFixedArray $y): SplFixedArray
     {
-        if (PHP_INT_SIZE === 4) {
-            throw new SodiumException("Error, use 32-bit");
-        }
         $l = ($x[1] + $y[1]) & 0xffffffff;
         return self::new64(
             (int) ($x[0] + $y[0] + (
                 ($l < $x[1]) ? 1 : 0
             )),
-            (int) $l
+            $l
         );
     }
 
@@ -108,9 +100,13 @@ abstract class ParagonIE_Sodium_Core_BLAKE2b extends ParagonIE_Sodium_Core_Util
      * @param SplFixedArray $y
      * @param SplFixedArray $z
      * @return SplFixedArray
+     * @throws SodiumException
      */
-    protected static function add364($x, $y, $z)
-    {
+    protected static function add364(
+        SplFixedArray $x,
+        SplFixedArray $y,
+        SplFixedArray $z
+    ): SplFixedArray {
         return self::add64($x, self::add64($y, $z));
     }
 
@@ -123,11 +119,8 @@ abstract class ParagonIE_Sodium_Core_BLAKE2b extends ParagonIE_Sodium_Core_Util
      * @throws SodiumException
      * @throws TypeError
      */
-    protected static function xor64(SplFixedArray $x, SplFixedArray $y)
+    protected static function xor64(SplFixedArray $x, SplFixedArray $y): SplFixedArray
     {
-        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');
         }
@@ -152,13 +145,11 @@ abstract class ParagonIE_Sodium_Core_BLAKE2b extends ParagonIE_Sodium_Core_Util
      * @param SplFixedArray $x
      * @param int $c
      * @return SplFixedArray
-     * @psalm-suppress MixedAssignment
+     *
+     * @throws SodiumException
      */
-    public static function rotr64($x, $c)
+    public static function rotr64(SplFixedArray $x, int $c): SplFixedArray
     {
-        if (PHP_INT_SIZE === 4) {
-            throw new SodiumException("Error, use 32-bit");
-        }
         if ($c >= 64) {
             $c %= 64;
         }
@@ -174,9 +165,9 @@ abstract class ParagonIE_Sodium_Core_BLAKE2b extends ParagonIE_Sodium_Core_Util
         }
 
         $l0 = 0;
+        /** @var int $c */
         $c = 64 - $c;
 
-        /** @var int $c */
         if ($c < 32) {
             $h0 = ((int) ($x[0]) << $c) | (
                 (
@@ -208,9 +199,8 @@ abstract class ParagonIE_Sodium_Core_BLAKE2b extends ParagonIE_Sodium_Core_Util
      *
      * @param SplFixedArray $x
      * @return int
-     * @psalm-suppress MixedOperand
      */
-    protected static function flatten64($x)
+    protected static function flatten64(SplFixedArray $x): int
     {
         return (int) ($x[0] * 4294967296 + $x[1]);
     }
@@ -221,17 +211,13 @@ abstract class ParagonIE_Sodium_Core_BLAKE2b extends ParagonIE_Sodium_Core_Util
      * @param SplFixedArray $x
      * @param int $i
      * @return SplFixedArray
-     * @psalm-suppress MixedArgument
-     * @psalm-suppress MixedArrayOffset
      */
-    protected static function load64(SplFixedArray $x, $i)
+    protected static function load64(SplFixedArray $x, int $i): SplFixedArray
     {
-        /** @var int $l */
         $l = (int) ($x[$i])
              | ((int) ($x[$i+1]) << 8)
              | ((int) ($x[$i+2]) << 16)
              | ((int) ($x[$i+3]) << 24);
-        /** @var int $h */
         $h = (int) ($x[$i+4])
              | ((int) ($x[$i+5]) << 8)
              | ((int) ($x[$i+6]) << 16)
@@ -246,9 +232,8 @@ abstract class ParagonIE_Sodium_Core_BLAKE2b extends ParagonIE_Sodium_Core_Util
      * @param int $i
      * @param SplFixedArray $u
      * @return void
-     * @psalm-suppress MixedAssignment
      */
-    protected static function store64(SplFixedArray $x, $i, SplFixedArray $u)
+    protected static function store64(SplFixedArray $x, int $i, SplFixedArray $u): void
     {
         $maxLength = $x->getSize() - 1;
         for ($j = 0; $j < 8; ++$j) {
@@ -257,13 +242,11 @@ abstract class ParagonIE_Sodium_Core_BLAKE2b extends ParagonIE_Sodium_Core_Util
                     ... becomes ...
                [0, 0, 0, 0, 1, 1, 1, 1]
             */
-            /** @var int $uIdx */
             $uIdx = ((7 - $j) & 4) >> 2;
             $x[$i]   = ((int) ($u[$uIdx]) & 0xff);
             if (++$i > $maxLength) {
                 return;
             }
-            /** @psalm-suppress MixedOperand */
             $u[$uIdx] >>= 8;
         }
     }
@@ -274,8 +257,10 @@ abstract class ParagonIE_Sodium_Core_BLAKE2b extends ParagonIE_Sodium_Core_Util
      * @internal You should not use this directly from another application
      *
      * @return void
+     *
+     * @throws SodiumException
      */
-    public static function pseudoConstructor()
+    public static function pseudoConstructor(): void
     {
         static $called = false;
         if ($called) {
@@ -300,11 +285,10 @@ abstract class ParagonIE_Sodium_Core_BLAKE2b extends ParagonIE_Sodium_Core_Util
      * @internal You should not use this directly from another application
      *
      * @return SplFixedArray
-     * @psalm-suppress MixedAssignment
-     * @psalm-suppress MixedArrayAccess
-     * @psalm-suppress MixedArrayAssignment
+     *
+     * @throws SodiumException
      */
-    protected static function context()
+    protected static function context(): SplFixedArray
     {
         $ctx    = new SplFixedArray(6);
         $ctx[0] = new SplFixedArray(8);   // h
@@ -338,13 +322,8 @@ abstract class ParagonIE_Sodium_Core_BLAKE2b extends ParagonIE_Sodium_Core_Util
      * @return void
      * @throws SodiumException
      * @throws TypeError
-     * @psalm-suppress MixedArgument
-     * @psalm-suppress MixedAssignment
-     * @psalm-suppress MixedArrayAccess
-     * @psalm-suppress MixedArrayAssignment
-     * @psalm-suppress MixedArrayOffset
      */
-    protected static function compress(SplFixedArray $ctx, SplFixedArray $buf)
+    protected static function compress(SplFixedArray $ctx, SplFixedArray $buf): void
     {
         $m = new SplFixedArray(16);
         $v = new SplFixedArray(16);
@@ -399,16 +378,22 @@ abstract class ParagonIE_Sodium_Core_BLAKE2b extends ParagonIE_Sodium_Core_Util
      * @return SplFixedArray
      * @throws SodiumException
      * @throws TypeError
-     * @psalm-suppress MixedArgument
-     * @psalm-suppress MixedArrayOffset
      */
-    public static function G($r, $i, $a, $b, $c, $d, SplFixedArray $v, SplFixedArray $m)
-    {
-        $v[$a] = self::add364($v[$a], $v[$b], $m[self::$sigma[$r][$i << 1]]);
+    public static function G(
+        int $r,
+        int $i,
+        int $a,
+        int $b,
+        int $c,
+        int $d,
+        SplFixedArray $v,
+        SplFixedArray $m
+    ): SplFixedArray {
+        $v[$a] = self::add364($v[$a], $v[$b], $m[self::SIGMA[$r][$i << 1]]);
         $v[$d] = self::rotr64(self::xor64($v[$d], $v[$a]), 32);
         $v[$c] = self::add64($v[$c], $v[$d]);
         $v[$b] = self::rotr64(self::xor64($v[$b], $v[$c]), 24);
-        $v[$a] = self::add364($v[$a], $v[$b], $m[self::$sigma[$r][($i << 1) + 1]]);
+        $v[$a] = self::add364($v[$a], $v[$b], $m[self::SIGMA[$r][($i << 1) + 1]]);
         $v[$d] = self::rotr64(self::xor64($v[$d], $v[$a]), 16);
         $v[$c] = self::add64($v[$c], $v[$d]);
         $v[$b] = self::rotr64(self::xor64($v[$b], $v[$c]), 63);
@@ -421,12 +406,10 @@ abstract class ParagonIE_Sodium_Core_BLAKE2b extends ParagonIE_Sodium_Core_Util
      * @param SplFixedArray $ctx
      * @param int $inc
      * @return void
+     *
      * @throws SodiumException
-     * @psalm-suppress MixedArgument
-     * @psalm-suppress MixedArrayAccess
-     * @psalm-suppress MixedArrayAssignment
      */
-    public static function increment_counter($ctx, $inc)
+    public static function increment_counter(SplFixedArray $ctx, int $inc): void
     {
         if ($inc < 0) {
             throw new SodiumException('Increasing by a negative number makes no sense.');
@@ -450,16 +433,11 @@ abstract class ParagonIE_Sodium_Core_BLAKE2b extends ParagonIE_Sodium_Core_Util
      * @param SplFixedArray $p
      * @param int $plen
      * @return void
+     *
      * @throws SodiumException
      * @throws TypeError
-     * @psalm-suppress MixedArgument
-     * @psalm-suppress MixedAssignment
-     * @psalm-suppress MixedArrayAccess
-     * @psalm-suppress MixedArrayAssignment
-     * @psalm-suppress MixedArrayOffset
-     * @psalm-suppress MixedOperand
      */
-    public static function update(SplFixedArray $ctx, SplFixedArray $p, $plen)
+    public static function update(SplFixedArray $ctx, SplFixedArray $p, int $plen): void
     {
         self::pseudoConstructor();
 
@@ -471,7 +449,7 @@ abstract class ParagonIE_Sodium_Core_BLAKE2b extends ParagonIE_Sodium_Core_Util
             if ($plen > $fill) {
                 # memcpy( S->buf + left, in, fill ); /* Fill buffer */
                 for ($i = $fill; $i--;) {
-                    $ctx[3][$i + $left] = $p[$i + $offset];
+                    $ctx[3][$i + $left] = $p[(int) ($i + $offset)];
                 }
 
                 # S->buflen += fill;
@@ -498,7 +476,7 @@ abstract class ParagonIE_Sodium_Core_BLAKE2b extends ParagonIE_Sodium_Core_Util
                 $plen -= $fill;
             } else {
                 for ($i = $plen; $i--;) {
-                    $ctx[3][$i + $left] = $p[$i + $offset];
+                    $ctx[3][$i + $left] = $p[(int) ($i + $offset)];
                 }
                 $ctx[4] += $plen;
                 $offset += $plen;
@@ -513,16 +491,11 @@ abstract class ParagonIE_Sodium_Core_BLAKE2b extends ParagonIE_Sodium_Core_Util
      * @param SplFixedArray $ctx
      * @param SplFixedArray $out
      * @return SplFixedArray
+     *
      * @throws SodiumException
      * @throws TypeError
-     * @psalm-suppress MixedArgument
-     * @psalm-suppress MixedAssignment
-     * @psalm-suppress MixedArrayAccess
-     * @psalm-suppress MixedArrayAssignment
-     * @psalm-suppress MixedArrayOffset
-     * @psalm-suppress MixedOperand
      */
-    public static function finish(SplFixedArray $ctx, SplFixedArray $out)
+    public static function finish(SplFixedArray $ctx, SplFixedArray $out): SplFixedArray
     {
         self::pseudoConstructor();
         if ($ctx[4] > 128) {
@@ -561,20 +534,16 @@ abstract class ParagonIE_Sodium_Core_BLAKE2b extends ParagonIE_Sodium_Core_Util
      * @param SplFixedArray|null $salt
      * @param SplFixedArray|null $personal
      * @return SplFixedArray
+     *
      * @throws SodiumException
      * @throws TypeError
-     * @psalm-suppress MixedArgument
-     * @psalm-suppress MixedAssignment
-     * @psalm-suppress MixedArrayAccess
-     * @psalm-suppress MixedArrayAssignment
-     * @psalm-suppress MixedArrayOffset
      */
     public static function init(
-        $key = null,
-        $outlen = 64,
-        $salt = null,
-        $personal = null
-    ) {
+        ?SplFixedArray $key = null,
+        int $outlen = 64,
+        ?SplFixedArray $salt = null,
+        ?SplFixedArray $personal = null
+    ): SplFixedArray {
         self::pseudoConstructor();
         $klen = 0;
 
@@ -651,9 +620,8 @@ abstract class ParagonIE_Sodium_Core_BLAKE2b extends ParagonIE_Sodium_Core_Util
      *
      * @param string $str
      * @return SplFixedArray
-     * @psalm-suppress MixedArgumentTypeCoercion
      */
-    public static function stringToSplFixedArray($str = '')
+    public static function stringToSplFixedArray(string $str = ''): SplFixedArray
     {
         $values = unpack('C*', $str);
         return SplFixedArray::fromArray(array_values($values));
@@ -668,7 +636,7 @@ abstract class ParagonIE_Sodium_Core_BLAKE2b extends ParagonIE_Sodium_Core_Util
      * @return string
      * @throws TypeError
      */
-    public static function SplFixedArrayToString(SplFixedArray $a)
+    public static function SplFixedArrayToString(SplFixedArray $a): string
     {
         /**
          * @var array<int, int|string> $arr
@@ -685,14 +653,8 @@ abstract class ParagonIE_Sodium_Core_BLAKE2b extends ParagonIE_Sodium_Core_Util
      * @param SplFixedArray $ctx
      * @return string
      * @throws TypeError
-     * @psalm-suppress MixedArgument
-     * @psalm-suppress MixedAssignment
-     * @psalm-suppress MixedArrayAccess
-     * @psalm-suppress MixedArrayAssignment
-     * @psalm-suppress MixedArrayOffset
-     * @psalm-suppress MixedMethodCall
      */
-    public static function contextToString(SplFixedArray $ctx)
+    public static function contextToString(SplFixedArray $ctx): string
     {
         $str = '';
         /** @var array<int, array<int, int>> $ctxA */
@@ -745,9 +707,8 @@ abstract class ParagonIE_Sodium_Core_BLAKE2b extends ParagonIE_Sodium_Core_Util
      * @return SplFixedArray
      * @throws SodiumException
      * @throws TypeError
-     * @psalm-suppress MixedArrayAssignment
      */
-    public static function stringToContext($string)
+    public static function stringToContext(string $string): SplFixedArray
     {
         $ctx = self::context();
 
@@ -759,7 +720,7 @@ abstract class ParagonIE_Sodium_Core_BLAKE2b extends ParagonIE_Sodium_Core_Util
                         self::substr($string, (($i << 3) + 4), 4)
                     ),
                     self::load_4(
-                        self::substr($string, (($i << 3) + 0), 4)
+                        self::substr($string, (($i << 3)), 4)
                     )
                 )
             );

diff --git a/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core/Base64/Original.php b/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core/Base64/Original.php
index dc939eeafb693abca373aa4c3507d4a585575651..683e8f5ff61b2ffae3e3de7a466db8864ad93adf 100644 (file)
--- a/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core/Base64/Original.php
+++ b/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core/Base64/Original.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 /**
  * Class ParagonIE_Sodium_Core_Base64
@@ -18,9 +19,11 @@ class ParagonIE_Sodium_Core_Base64_Original
      * @return string
      * @throws TypeError
      */
-    public static function encode($src)
-    {
-        return self::doEncode($src, true);
+    public static function encode(
+        #[SensitiveParameter]
+        string $src
+    ): string {
+        return self::doEncode($src);
     }
 
     /**
@@ -32,8 +35,10 @@ class ParagonIE_Sodium_Core_Base64_Original
      * @return string
      * @throws TypeError
      */
-    public static function encodeUnpadded($src)
-    {
+    public static function encodeUnpadded(
+        #[SensitiveParameter]
+        string $src
+    ): string {
         return self::doEncode($src, false);
     }
 
@@ -43,8 +48,11 @@ class ParagonIE_Sodium_Core_Base64_Original
      * @return string
      * @throws TypeError
      */
-    protected static function doEncode($src, $pad = true)
-    {
+    protected static function doEncode(
+        #[SensitiveParameter]
+        string $src,
+        bool $pad = true
+    ): string {
         $dest = '';
         $srcLen = ParagonIE_Sodium_Core_Util::strlen($src);
         // Main loop (no padding):
@@ -97,10 +105,12 @@ class ParagonIE_Sodium_Core_Base64_Original
      * @return string
      * @throws RangeException
      * @throws TypeError
-     * @psalm-suppress RedundantCondition
      */
-    public static function decode($src, $strictPadding = false)
-    {
+    public static function decode(
+        #[SensitiveParameter]
+        string $src,
+        bool $strictPadding = false
+    ): string {
         // Remove padding
         $srcLen = ParagonIE_Sodium_Core_Util::strlen($src);
         if ($srcLen === 0) {
@@ -172,11 +182,8 @@ class ParagonIE_Sodium_Core_Base64_Original
                     ((($c0 << 2) | ($c1 >> 4)) & 0xff)
                 );
                 $err |= ($c0 | $c1) >> 8;
-            } elseif ($i < $srcLen && $strictPadding) {
-                $err |= 1;
             }
         }
-        /** @var bool $check */
         $check = ($err === 0);
         if (!$check) {
             throw new RangeException(
@@ -198,8 +205,10 @@ class ParagonIE_Sodium_Core_Base64_Original
      * @param int $src
      * @return int
      */
-    protected static function decode6Bits($src)
-    {
+    protected static function decode6Bits(
+        #[SensitiveParameter]
+        int $src
+    ): int {
         $ret = -1;
 
         // if ($src > 0x40 && $src < 0x5b) $ret += $src - 0x41 + 1; // -64
@@ -227,8 +236,10 @@ class ParagonIE_Sodium_Core_Base64_Original
      * @param int $src
      * @return string
      */
-    protected static function encode6Bits($src)
-    {
+    protected static function encode6Bits(
+        #[SensitiveParameter]
+        int $src
+    ): string {
         $diff = 0x41;
 
         // if ($src > 25) $diff += 0x61 - 0x41 - 26; // 6

diff --git a/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core/Base64/UrlSafe.php b/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core/Base64/UrlSafe.php
index 64bf53b85832931e9dcb19f5e14f8657013fb2ee..04733aa297fbe462a2c8362ca9302aaa5e9a6164 100644 (file)
--- a/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core/Base64/UrlSafe.php
+++ b/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core/Base64/UrlSafe.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 /**
  * Class ParagonIE_Sodium_Core_Base64UrlSafe
@@ -18,9 +19,11 @@ class ParagonIE_Sodium_Core_Base64_UrlSafe
      * @return string
      * @throws TypeError
      */
-    public static function encode($src)
-    {
-        return self::doEncode($src, true);
+    public static function encode(
+        #[SensitiveParameter]
+        string $src
+    ): string {
+        return self::doEncode($src);
     }
 
     /**
@@ -32,8 +35,10 @@ class ParagonIE_Sodium_Core_Base64_UrlSafe
      * @return string
      * @throws TypeError
      */
-    public static function encodeUnpadded($src)
-    {
+    public static function encodeUnpadded(
+        #[SensitiveParameter]
+        string $src
+    ): string {
         return self::doEncode($src, false);
     }
 
@@ -43,8 +48,11 @@ class ParagonIE_Sodium_Core_Base64_UrlSafe
      * @return string
      * @throws TypeError
      */
-    protected static function doEncode($src, $pad = true)
-    {
+    protected static function doEncode(
+        #[SensitiveParameter]
+        string $src,
+        bool $pad = true
+    ): string {
         $dest = '';
         $srcLen = ParagonIE_Sodium_Core_Util::strlen($src);
         // Main loop (no padding):
@@ -97,10 +105,12 @@ class ParagonIE_Sodium_Core_Base64_UrlSafe
      * @return string
      * @throws RangeException
      * @throws TypeError
-     * @psalm-suppress RedundantCondition
      */
-    public static function decode($src, $strictPadding = false)
-    {
+    public static function decode(
+        #[SensitiveParameter]
+        string $src,
+        bool $strictPadding = false
+    ): string {
         // Remove padding
         $srcLen = ParagonIE_Sodium_Core_Util::strlen($src);
         if ($srcLen === 0) {
@@ -172,11 +182,8 @@ class ParagonIE_Sodium_Core_Base64_UrlSafe
                     ((($c0 << 2) | ($c1 >> 4)) & 0xff)
                 );
                 $err |= ($c0 | $c1) >> 8;
-            } elseif ($i < $srcLen && $strictPadding) {
-                $err |= 1;
             }
         }
-        /** @var bool $check */
         $check = ($err === 0);
         if (!$check) {
             throw new RangeException(
@@ -197,8 +204,10 @@ class ParagonIE_Sodium_Core_Base64_UrlSafe
      * @param int $src
      * @return int
      */
-    protected static function decode6Bits($src)
-    {
+    protected static function decode6Bits(
+        #[SensitiveParameter]
+        int $src
+    ): int {
         $ret = -1;
 
         // if ($src > 0x40 && $src < 0x5b) $ret += $src - 0x41 + 1; // -64
@@ -226,8 +235,9 @@ class ParagonIE_Sodium_Core_Base64_UrlSafe
      * @param int $src
      * @return string
      */
-    protected static function encode6Bits($src)
-    {
+    protected static function encode6Bits(
+        int $src
+    ): string {
         $diff = 0x41;
 
         // if ($src > 25) $diff += 0x61 - 0x41 - 26; // 6

diff --git a/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core/ChaCha20.php b/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core/ChaCha20.php
index 806010c7fbf8a6697185e04904aa56789c0d7008..a3adfba981c58e34a7c2c5f1d2482ee6318ac715 100644 (file)
--- a/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core/ChaCha20.php
+++ b/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core/ChaCha20.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 if (class_exists('ParagonIE_Sodium_Core_ChaCha20', false)) {
     return;
@@ -18,11 +19,11 @@ class ParagonIE_Sodium_Core_ChaCha20 extends ParagonIE_Sodium_Core_Util
      * @param int $n
      * @return int
      */
-    public static function rotate($v, $n)
+    public static function rotate(int $v, int $n): int
     {
         $v &= 0xffffffff;
         $n &= 31;
-        return (int) (
+        return (
             0xffffffff & (
                 ($v << $n)
                     |
@@ -42,7 +43,7 @@ class ParagonIE_Sodium_Core_ChaCha20 extends ParagonIE_Sodium_Core_Util
      * @param int $d
      * @return array<int, int>
      */
-    protected static function quarterRound($a, $b, $c, $d)
+    protected static function quarterRound(int $a, int $b, int $c, int $d): array
     {
         # a = PLUS(a,b); d = ROTATE(XOR(d,a),16);
         /** @var int $a */
@@ -63,7 +64,7 @@ class ParagonIE_Sodium_Core_ChaCha20 extends ParagonIE_Sodium_Core_Util
         /** @var int $c */
         $c = ($c + $d) & 0xffffffff;
         $b = self::rotate($b ^ $c, 7);
-        return array((int) $a, (int) $b, (int) $c, (int) $d);
+        return array($a, $b, $c, $d);
     }
 
     /**
@@ -78,28 +79,11 @@ class ParagonIE_Sodium_Core_ChaCha20 extends ParagonIE_Sodium_Core_Util
      */
     public static function encryptBytes(
         ParagonIE_Sodium_Core_ChaCha20_Ctx $ctx,
-        $message = ''
-    ) {
+        #[SensitiveParameter]
+        string $message = ''
+    ): string {
         $bytes = self::strlen($message);
 
-        /*
-        j0 = ctx->input[0];
-        j1 = ctx->input[1];
-        j2 = ctx->input[2];
-        j3 = ctx->input[3];
-        j4 = ctx->input[4];
-        j5 = ctx->input[5];
-        j6 = ctx->input[6];
-        j7 = ctx->input[7];
-        j8 = ctx->input[8];
-        j9 = ctx->input[9];
-        j10 = ctx->input[10];
-        j11 = ctx->input[11];
-        j12 = ctx->input[12];
-        j13 = ctx->input[13];
-        j14 = ctx->input[14];
-        j15 = ctx->input[15];
-        */
         $j0  = (int) $ctx[0];
         $j1  = (int) $ctx[1];
         $j2  = (int) $ctx[2];
@@ -123,118 +107,52 @@ class ParagonIE_Sodium_Core_ChaCha20 extends ParagonIE_Sodium_Core_Util
                 $message .= str_repeat("\x00", 64 - $bytes);
             }
 
-            $x0 =  (int) $j0;
-            $x1 =  (int) $j1;
-            $x2 =  (int) $j2;
-            $x3 =  (int) $j3;
-            $x4 =  (int) $j4;
-            $x5 =  (int) $j5;
-            $x6 =  (int) $j6;
-            $x7 =  (int) $j7;
-            $x8 =  (int) $j8;
-            $x9 =  (int) $j9;
-            $x10 = (int) $j10;
-            $x11 = (int) $j11;
-            $x12 = (int) $j12;
-            $x13 = (int) $j13;
-            $x14 = (int) $j14;
-            $x15 = (int) $j15;
+            $x0 =  $j0;
+            $x1 =  $j1;
+            $x2 =  $j2;
+            $x3 =  $j3;
+            $x4 =  $j4;
+            $x5 =  $j5;
+            $x6 =  $j6;
+            $x7 =  $j7;
+            $x8 =  $j8;
+            $x9 =  $j9;
+            $x10 = $j10;
+            $x11 = $j11;
+            $x12 = $j12;
+            $x13 = $j13;
+            $x14 = $j14;
+            $x15 = $j15;
 
             # for (i = 20; i > 0; i -= 2) {
             for ($i = 20; $i > 0; $i -= 2) {
-                # QUARTERROUND( x0,  x4,  x8,  x12)
-                list($x0, $x4, $x8, $x12) = self::quarterRound($x0, $x4, $x8, $x12);
+                [$x0, $x4, $x8, $x12] = self::quarterRound($x0, $x4, $x8, $x12);
+                [$x1, $x5, $x9, $x13] = self::quarterRound($x1, $x5, $x9, $x13);
+                [$x2, $x6, $x10, $x14] = self::quarterRound($x2, $x6, $x10, $x14);
+                [$x3, $x7, $x11, $x15] = self::quarterRound($x3, $x7, $x11, $x15);
 
-                # QUARTERROUND( x1,  x5,  x9,  x13)
-                list($x1, $x5, $x9, $x13) = self::quarterRound($x1, $x5, $x9, $x13);
-
-                # QUARTERROUND( x2,  x6,  x10,  x14)
-                list($x2, $x6, $x10, $x14) = self::quarterRound($x2, $x6, $x10, $x14);
-
-                # QUARTERROUND( x3,  x7,  x11,  x15)
-                list($x3, $x7, $x11, $x15) = self::quarterRound($x3, $x7, $x11, $x15);
-
-                # QUARTERROUND( x0,  x5,  x10,  x15)
-                list($x0, $x5, $x10, $x15) = self::quarterRound($x0, $x5, $x10, $x15);
-
-                # QUARTERROUND( x1,  x6,  x11,  x12)
-                list($x1, $x6, $x11, $x12) = self::quarterRound($x1, $x6, $x11, $x12);
-
-                # QUARTERROUND( x2,  x7,  x8,  x13)
-                list($x2, $x7, $x8, $x13) = self::quarterRound($x2, $x7, $x8, $x13);
-
-                # QUARTERROUND( x3,  x4,  x9,  x14)
-                list($x3, $x4, $x9, $x14) = self::quarterRound($x3, $x4, $x9, $x14);
+                [$x0, $x5, $x10, $x15] = self::quarterRound($x0, $x5, $x10, $x15);
+                [$x1, $x6, $x11, $x12] = self::quarterRound($x1, $x6, $x11, $x12);
+                [$x2, $x7, $x8, $x13] = self::quarterRound($x2, $x7, $x8, $x13);
+                [$x3, $x4, $x9, $x14] = self::quarterRound($x3, $x4, $x9, $x14);
             }
-            /*
-            x0 = PLUS(x0, j0);
-            x1 = PLUS(x1, j1);
-            x2 = PLUS(x2, j2);
-            x3 = PLUS(x3, j3);
-            x4 = PLUS(x4, j4);
-            x5 = PLUS(x5, j5);
-            x6 = PLUS(x6, j6);
-            x7 = PLUS(x7, j7);
-            x8 = PLUS(x8, j8);
-            x9 = PLUS(x9, j9);
-            x10 = PLUS(x10, j10);
-            x11 = PLUS(x11, j11);
-            x12 = PLUS(x12, j12);
-            x13 = PLUS(x13, j13);
-            x14 = PLUS(x14, j14);
-            x15 = PLUS(x15, j15);
-            */
-            /** @var int $x0 */
             $x0  = ($x0 & 0xffffffff) + $j0;
-            /** @var int $x1 */
             $x1  = ($x1 & 0xffffffff) + $j1;
-            /** @var int $x2 */
             $x2  = ($x2 & 0xffffffff) + $j2;
-            /** @var int $x3 */
             $x3  = ($x3 & 0xffffffff) + $j3;
-            /** @var int $x4 */
             $x4  = ($x4 & 0xffffffff) + $j4;
-            /** @var int $x5 */
             $x5  = ($x5 & 0xffffffff) + $j5;
-            /** @var int $x6 */
             $x6  = ($x6 & 0xffffffff) + $j6;
-            /** @var int $x7 */
             $x7  = ($x7 & 0xffffffff) + $j7;
-            /** @var int $x8 */
             $x8  = ($x8 & 0xffffffff) + $j8;
-            /** @var int $x9 */
             $x9  = ($x9 & 0xffffffff) + $j9;
-            /** @var int $x10 */
             $x10 = ($x10 & 0xffffffff) + $j10;
-            /** @var int $x11 */
             $x11 = ($x11 & 0xffffffff) + $j11;
-            /** @var int $x12 */
             $x12 = ($x12 & 0xffffffff) + $j12;
-            /** @var int $x13 */
             $x13 = ($x13 & 0xffffffff) + $j13;
-            /** @var int $x14 */
             $x14 = ($x14 & 0xffffffff) + $j14;
-            /** @var int $x15 */
             $x15 = ($x15 & 0xffffffff) + $j15;
 
-            /*
-            x0 = XOR(x0, LOAD32_LE(m + 0));
-            x1 = XOR(x1, LOAD32_LE(m + 4));
-            x2 = XOR(x2, LOAD32_LE(m + 8));
-            x3 = XOR(x3, LOAD32_LE(m + 12));
-            x4 = XOR(x4, LOAD32_LE(m + 16));
-            x5 = XOR(x5, LOAD32_LE(m + 20));
-            x6 = XOR(x6, LOAD32_LE(m + 24));
-            x7 = XOR(x7, LOAD32_LE(m + 28));
-            x8 = XOR(x8, LOAD32_LE(m + 32));
-            x9 = XOR(x9, LOAD32_LE(m + 36));
-            x10 = XOR(x10, LOAD32_LE(m + 40));
-            x11 = XOR(x11, LOAD32_LE(m + 44));
-            x12 = XOR(x12, LOAD32_LE(m + 48));
-            x13 = XOR(x13, LOAD32_LE(m + 52));
-            x14 = XOR(x14, LOAD32_LE(m + 56));
-            x15 = XOR(x15, LOAD32_LE(m + 60));
-            */
             $x0  ^= self::load_4(self::substr($message, 0, 4));
             $x1  ^= self::load_4(self::substr($message, 4, 4));
             $x2  ^= self::load_4(self::substr($message, 8, 4));
@@ -252,51 +170,27 @@ class ParagonIE_Sodium_Core_ChaCha20 extends ParagonIE_Sodium_Core_Util
             $x14 ^= self::load_4(self::substr($message, 56, 4));
             $x15 ^= self::load_4(self::substr($message, 60, 4));
 
-            /*
-                j12 = PLUSONE(j12);
-                if (!j12) {
-                    j13 = PLUSONE(j13);
-                }
-             */
             ++$j12;
             if ($j12 & 0xf0000000) {
                 throw new SodiumException('Overflow');
             }
 
-            /*
-            STORE32_LE(c + 0, x0);
-            STORE32_LE(c + 4, x1);
-            STORE32_LE(c + 8, x2);
-            STORE32_LE(c + 12, x3);
-            STORE32_LE(c + 16, x4);
-            STORE32_LE(c + 20, x5);
-            STORE32_LE(c + 24, x6);
-            STORE32_LE(c + 28, x7);
-            STORE32_LE(c + 32, x8);
-            STORE32_LE(c + 36, x9);
-            STORE32_LE(c + 40, x10);
-            STORE32_LE(c + 44, x11);
-            STORE32_LE(c + 48, x12);
-            STORE32_LE(c + 52, x13);
-            STORE32_LE(c + 56, x14);
-            STORE32_LE(c + 60, x15);
-            */
-            $block = self::store32_le((int) ($x0  & 0xffffffff)) .
-                 self::store32_le((int) ($x1  & 0xffffffff)) .
-                 self::store32_le((int) ($x2  & 0xffffffff)) .
-                 self::store32_le((int) ($x3  & 0xffffffff)) .
-                 self::store32_le((int) ($x4  & 0xffffffff)) .
-                 self::store32_le((int) ($x5  & 0xffffffff)) .
-                 self::store32_le((int) ($x6  & 0xffffffff)) .
-                 self::store32_le((int) ($x7  & 0xffffffff)) .
-                 self::store32_le((int) ($x8  & 0xffffffff)) .
-                 self::store32_le((int) ($x9  & 0xffffffff)) .
-                 self::store32_le((int) ($x10 & 0xffffffff)) .
-                 self::store32_le((int) ($x11 & 0xffffffff)) .
-                 self::store32_le((int) ($x12 & 0xffffffff)) .
-                 self::store32_le((int) ($x13 & 0xffffffff)) .
-                 self::store32_le((int) ($x14 & 0xffffffff)) .
-                 self::store32_le((int) ($x15 & 0xffffffff));
+            $block = self::store32_le(($x0  & 0xffffffff)) .
+                 self::store32_le(($x1  & 0xffffffff)) .
+                 self::store32_le(($x2  & 0xffffffff)) .
+                 self::store32_le(($x3  & 0xffffffff)) .
+                 self::store32_le(($x4  & 0xffffffff)) .
+                 self::store32_le(($x5  & 0xffffffff)) .
+                 self::store32_le(($x6  & 0xffffffff)) .
+                 self::store32_le(($x7  & 0xffffffff)) .
+                 self::store32_le(($x8  & 0xffffffff)) .
+                 self::store32_le(($x9  & 0xffffffff)) .
+                 self::store32_le(($x10 & 0xffffffff)) .
+                 self::store32_le(($x11 & 0xffffffff)) .
+                 self::store32_le(($x12 & 0xffffffff)) .
+                 self::store32_le(($x13 & 0xffffffff)) .
+                 self::store32_le(($x14 & 0xffffffff)) .
+                 self::store32_le(($x15 & 0xffffffff));
 
             /* Partial block */
             if ($bytes < 64) {
@@ -329,8 +223,12 @@ class ParagonIE_Sodium_Core_ChaCha20 extends ParagonIE_Sodium_Core_Util
      * @throws SodiumException
      * @throws TypeError
      */
-    public static function stream($len = 64, $nonce = '', $key = '')
-    {
+    public static function stream(
+        int $len = 64,
+        string $nonce = '',
+        #[SensitiveParameter]
+        string $key = ''
+    ): string {
         return self::encryptBytes(
             new ParagonIE_Sodium_Core_ChaCha20_Ctx($key, $nonce),
             str_repeat("\x00", $len)
@@ -347,8 +245,12 @@ class ParagonIE_Sodium_Core_ChaCha20 extends ParagonIE_Sodium_Core_Util
      * @throws SodiumException
      * @throws TypeError
      */
-    public static function ietfStream($len, $nonce = '', $key = '')
-    {
+    public static function ietfStream(
+        int $len,
+        string $nonce = '',
+        #[SensitiveParameter]
+        string $key = ''
+    ): string {
         return self::encryptBytes(
             new ParagonIE_Sodium_Core_ChaCha20_IetfCtx($key, $nonce),
             str_repeat("\x00", $len)
@@ -366,8 +268,14 @@ class ParagonIE_Sodium_Core_ChaCha20 extends ParagonIE_Sodium_Core_Util
      * @throws SodiumException
      * @throws TypeError
      */
-    public static function ietfStreamXorIc($message, $nonce = '', $key = '', $ic = '')
-    {
+    public static function ietfStreamXorIc(
+        #[SensitiveParameter]
+        string $message,
+        string $nonce = '',
+        #[SensitiveParameter]
+        string $key = '',
+        string $ic = ''
+    ): string {
         return self::encryptBytes(
             new ParagonIE_Sodium_Core_ChaCha20_IetfCtx($key, $nonce, $ic),
             $message
@@ -385,8 +293,14 @@ class ParagonIE_Sodium_Core_ChaCha20 extends ParagonIE_Sodium_Core_Util
      * @throws SodiumException
      * @throws TypeError
      */
-    public static function streamXorIc($message, $nonce = '', $key = '', $ic = '')
-    {
+    public static function streamXorIc(
+        #[SensitiveParameter]
+        string $message,
+        string $nonce = '',
+        #[SensitiveParameter]
+        string $key = '',
+        string $ic = ''
+    ): string {
         return self::encryptBytes(
             new ParagonIE_Sodium_Core_ChaCha20_Ctx($key, $nonce, $ic),
             $message

diff --git a/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core/ChaCha20/Ctx.php b/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core/ChaCha20/Ctx.php
index 01e4c46c3e05ca46366f4f55f9c04624f3fd5416..4a4317c6e5d867cdd54d84b93f8901c2223e6741 100644 (file)
--- a/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core/ChaCha20/Ctx.php
+++ b/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core/ChaCha20/Ctx.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 if (class_exists('ParagonIE_Sodium_Core_ChaCha20_Ctx', false)) {
     return;
@@ -6,13 +7,16 @@ if (class_exists('ParagonIE_Sodium_Core_ChaCha20_Ctx', false)) {
 
 /**
  * Class ParagonIE_Sodium_Core_ChaCha20_Ctx
+ *
+ * @template-implements ArrayAccess<int>
+ * @psalm-suppress MissingTemplateParam
  */
 class ParagonIE_Sodium_Core_ChaCha20_Ctx extends ParagonIE_Sodium_Core_Util implements ArrayAccess
 {
     /**
      * @var SplFixedArray internally, <int, int>
      */
-    protected $container;
+    protected SplFixedArray $container;
 
     /**
      * ParagonIE_Sodium_Core_ChaCha20_Ctx constructor.
@@ -26,8 +30,12 @@ class ParagonIE_Sodium_Core_ChaCha20_Ctx extends ParagonIE_Sodium_Core_Util impl
      * @throws InvalidArgumentException
      * @throws TypeError
      */
-    public function __construct($key = '', $iv = '', $counter = '')
-    {
+    public function __construct(
+        #[SensitiveParameter]
+        string $key = '',
+        string $iv = '',
+        string $counter = ''
+    ) {
         if (self::strlen($key) !== 32) {
             throw new InvalidArgumentException('ChaCha20 expects a 256-bit key.');
         }
@@ -67,17 +75,10 @@ class ParagonIE_Sodium_Core_ChaCha20_Ctx extends ParagonIE_Sodium_Core_Util impl
      * @param int $offset
      * @param int $value
      * @return void
-     * @psalm-suppress MixedArrayOffset
      */
     #[ReturnTypeWillChange]
-    public function offsetSet($offset, $value)
+    public function offsetSet($offset, $value): void
     {
-        if (!is_int($offset)) {
-            throw new InvalidArgumentException('Expected an integer');
-        }
-        if (!is_int($value)) {
-            throw new InvalidArgumentException('Expected an integer');
-        }
         $this->container[$offset] = $value;
     }
 
@@ -98,10 +99,9 @@ class ParagonIE_Sodium_Core_ChaCha20_Ctx extends ParagonIE_Sodium_Core_Util impl
      *
      * @param int $offset
      * @return void
-     * @psalm-suppress MixedArrayOffset
      */
     #[ReturnTypeWillChange]
-    public function offsetUnset($offset)
+    public function offsetUnset($offset): void
     {
         unset($this->container[$offset]);
     }
@@ -111,7 +111,6 @@ class ParagonIE_Sodium_Core_ChaCha20_Ctx extends ParagonIE_Sodium_Core_Util impl
      *
      * @param int $offset
      * @return mixed|null
-     * @psalm-suppress MixedArrayOffset
      */
     #[ReturnTypeWillChange]
     public function offsetGet($offset)

diff --git a/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core/ChaCha20/IetfCtx.php b/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core/ChaCha20/IetfCtx.php
index 4d63b9004d00ad5fa05a05b1ec3a47401e50bfdd..f75070a63f19044c8f4835c9fdd59f3e1900bd5a 100644 (file)
--- a/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core/ChaCha20/IetfCtx.php
+++ b/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core/ChaCha20/IetfCtx.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 if (class_exists('ParagonIE_Sodium_Core_ChaCha20_IetfCtx', false)) {
     return;
@@ -21,8 +22,12 @@ class ParagonIE_Sodium_Core_ChaCha20_IetfCtx extends ParagonIE_Sodium_Core_ChaCh
      * @throws InvalidArgumentException
      * @throws TypeError
      */
-    public function __construct($key = '', $iv = '', $counter = '')
-    {
+    public function __construct(
+        #[SensitiveParameter]
+        string $key = '',
+        string $iv = '',
+        string $counter = ''
+    ) {
         if (self::strlen($iv) !== 12) {
             throw new InvalidArgumentException('ChaCha20 expects a 96-bit nonce in IETF mode.');
         }

diff --git a/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core/Curve25519.php b/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core/Curve25519.php
index dfcf26af02cb664aedd09c47ff9a8015b51620de..79576a78bf7ad8cccdc13dd617673666bcd0c6e7 100644 (file)
--- a/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core/Curve25519.php
+++ b/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core/Curve25519.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 if (class_exists('ParagonIE_Sodium_Core_Curve25519', false)) {
     return;
@@ -22,10 +23,10 @@ abstract class ParagonIE_Sodium_Core_Curve25519 extends ParagonIE_Sodium_Core_Cu
      *
      * @return ParagonIE_Sodium_Core_Curve25519_Fe
      */
-    public static function fe_0()
+    public static function fe_0(): ParagonIE_Sodium_Core_Curve25519_Fe
     {
         return ParagonIE_Sodium_Core_Curve25519_Fe::fromArray(
-            array(0, 0, 0, 0, 0, 0, 0, 0, 0, 0)
+            [0, 0, 0, 0, 0, 0, 0, 0, 0, 0]
         );
     }
 
@@ -36,10 +37,10 @@ abstract class ParagonIE_Sodium_Core_Curve25519 extends ParagonIE_Sodium_Core_Cu
      *
      * @return ParagonIE_Sodium_Core_Curve25519_Fe
      */
-    public static function fe_1()
+    public static function fe_1(): ParagonIE_Sodium_Core_Curve25519_Fe
     {
         return ParagonIE_Sodium_Core_Curve25519_Fe::fromArray(
-            array(1, 0, 0, 0, 0, 0, 0, 0, 0, 0)
+            [1, 0, 0, 0, 0, 0, 0, 0, 0, 0]
         );
     }
 
@@ -51,17 +52,15 @@ abstract class ParagonIE_Sodium_Core_Curve25519 extends ParagonIE_Sodium_Core_Cu
      * @param ParagonIE_Sodium_Core_Curve25519_Fe $f
      * @param ParagonIE_Sodium_Core_Curve25519_Fe $g
      * @return ParagonIE_Sodium_Core_Curve25519_Fe
-     * @psalm-suppress MixedAssignment
-     * @psalm-suppress MixedOperand
      */
     public static function fe_add(
         ParagonIE_Sodium_Core_Curve25519_Fe $f,
         ParagonIE_Sodium_Core_Curve25519_Fe $g
-    ) {
+    ): ParagonIE_Sodium_Core_Curve25519_Fe {
         /** @var array<int, int> $arr */
         $arr = array();
         for ($i = 0; $i < 10; ++$i) {
-            $arr[$i] = (int) ($f[$i] + $g[$i]);
+            $arr[$i] = ($f[$i] + $g[$i]);
         }
         return ParagonIE_Sodium_Core_Curve25519_Fe::fromArray($arr);
     }
@@ -75,13 +74,12 @@ abstract class ParagonIE_Sodium_Core_Curve25519 extends ParagonIE_Sodium_Core_Cu
      * @param ParagonIE_Sodium_Core_Curve25519_Fe $g
      * @param int $b
      * @return ParagonIE_Sodium_Core_Curve25519_Fe
-     * @psalm-suppress MixedAssignment
      */
     public static function fe_cmov(
         ParagonIE_Sodium_Core_Curve25519_Fe $f,
         ParagonIE_Sodium_Core_Curve25519_Fe $g,
-        $b = 0
-    ) {
+        int $b = 0
+    ): ParagonIE_Sodium_Core_Curve25519_Fe {
         /** @var array<int, int> $h */
         $h = array();
         $b *= -1;
@@ -92,20 +90,6 @@ abstract class ParagonIE_Sodium_Core_Curve25519 extends ParagonIE_Sodium_Core_Cu
         return ParagonIE_Sodium_Core_Curve25519_Fe::fromArray($h);
     }
 
-    /**
-     * Create a copy of a field element.
-     *
-     * @internal You should not use this directly from another application
-     *
-     * @param ParagonIE_Sodium_Core_Curve25519_Fe $f
-     * @return ParagonIE_Sodium_Core_Curve25519_Fe
-     */
-    public static function fe_copy(ParagonIE_Sodium_Core_Curve25519_Fe $f)
-    {
-        $h = clone $f;
-        return $h;
-    }
-
     /**
      * Give: 32-byte string.
      * Receive: A field element object to use for internal calculations.
@@ -117,8 +101,10 @@ abstract class ParagonIE_Sodium_Core_Curve25519 extends ParagonIE_Sodium_Core_Cu
      * @throws RangeException
      * @throws TypeError
      */
-    public static function fe_frombytes($s)
-    {
+    public static function fe_frombytes(
+        #[SensitiveParameter]
+        string $s
+    ): ParagonIE_Sodium_Core_Curve25519_Fe {
         if (self::strlen($s) !== 32) {
             throw new RangeException('Expected a 32-byte string.');
         }
@@ -166,18 +152,7 @@ abstract class ParagonIE_Sodium_Core_Curve25519 extends ParagonIE_Sodium_Core_Cu
         $h8 -= $carry8 << 26;
 
         return ParagonIE_Sodium_Core_Curve25519_Fe::fromArray(
-            array(
-                (int) $h0,
-                (int) $h1,
-                (int) $h2,
-                (int) $h3,
-                (int) $h4,
-                (int) $h5,
-                (int) $h6,
-                (int) $h7,
-                (int) $h8,
-                (int) $h9
-            )
+            [$h0, $h1, $h2, $h3, $h4, $h5, $h6, $h7, $h8, $h9]
         );
     }
 
@@ -189,18 +164,18 @@ abstract class ParagonIE_Sodium_Core_Curve25519 extends ParagonIE_Sodium_Core_Cu
      * @param ParagonIE_Sodium_Core_Curve25519_Fe $h
      * @return string
      */
-    public static function fe_tobytes(ParagonIE_Sodium_Core_Curve25519_Fe $h)
+    public static function fe_tobytes(ParagonIE_Sodium_Core_Curve25519_Fe $h): string
     {
-        $h0 = (int) $h[0];
-        $h1 = (int) $h[1];
-        $h2 = (int) $h[2];
-        $h3 = (int) $h[3];
-        $h4 = (int) $h[4];
-        $h5 = (int) $h[5];
-        $h6 = (int) $h[6];
-        $h7 = (int) $h[7];
-        $h8 = (int) $h[8];
-        $h9 = (int) $h[9];
+        $h0 = $h[0];
+        $h1 = $h[1];
+        $h2 = $h[2];
+        $h3 = $h[3];
+        $h4 = $h[4];
+        $h5 = $h[5];
+        $h6 = $h[6];
+        $h7 = $h[7];
+        $h8 = $h[8];
+        $h9 = $h[9];
 
         $q = (self::mul($h9, 19, 5) + (1 << 24)) >> 25;
         $q = ($h0 + $q) >> 26;
@@ -246,44 +221,40 @@ abstract class ParagonIE_Sodium_Core_Curve25519 extends ParagonIE_Sodium_Core_Cu
         $carry9 = $h9 >> 25;
         $h9 -= $carry9 << 25;
 
-        /**
-         * @var array<int, int>
-         */
-        $s = array(
-            (int) (($h0 >> 0) & 0xff),
-            (int) (($h0 >> 8) & 0xff),
-            (int) (($h0 >> 16) & 0xff),
-            (int) ((($h0 >> 24) | ($h1 << 2)) & 0xff),
-            (int) (($h1 >> 6) & 0xff),
-            (int) (($h1 >> 14) & 0xff),
-            (int) ((($h1 >> 22) | ($h2 << 3)) & 0xff),
-            (int) (($h2 >> 5) & 0xff),
-            (int) (($h2 >> 13) & 0xff),
-            (int) ((($h2 >> 21) | ($h3 << 5)) & 0xff),
-            (int) (($h3 >> 3) & 0xff),
-            (int) (($h3 >> 11) & 0xff),
-            (int) ((($h3 >> 19) | ($h4 << 6)) & 0xff),
-            (int) (($h4 >> 2) & 0xff),
-            (int) (($h4 >> 10) & 0xff),
-            (int) (($h4 >> 18) & 0xff),
-            (int) (($h5 >> 0) & 0xff),
-            (int) (($h5 >> 8) & 0xff),
-            (int) (($h5 >> 16) & 0xff),
-            (int) ((($h5 >> 24) | ($h6 << 1)) & 0xff),
-            (int) (($h6 >> 7) & 0xff),
-            (int) (($h6 >> 15) & 0xff),
-            (int) ((($h6 >> 23) | ($h7 << 3)) & 0xff),
-            (int) (($h7 >> 5) & 0xff),
-            (int) (($h7 >> 13) & 0xff),
-            (int) ((($h7 >> 21) | ($h8 << 4)) & 0xff),
-            (int) (($h8 >> 4) & 0xff),
-            (int) (($h8 >> 12) & 0xff),
-            (int) ((($h8 >> 20) | ($h9 << 6)) & 0xff),
-            (int) (($h9 >> 2) & 0xff),
-            (int) (($h9 >> 10) & 0xff),
-            (int) (($h9 >> 18) & 0xff)
-        );
-        return self::intArrayToString($s);
+        return self::intArrayToString([
+            (($h0 >> 0) & 0xff),
+            (($h0 >> 8) & 0xff),
+            (($h0 >> 16) & 0xff),
+            ((($h0 >> 24) | ($h1 << 2)) & 0xff),
+            (($h1 >> 6) & 0xff),
+            (($h1 >> 14) & 0xff),
+            ((($h1 >> 22) | ($h2 << 3)) & 0xff),
+            (($h2 >> 5) & 0xff),
+            (($h2 >> 13) & 0xff),
+            ((($h2 >> 21) | ($h3 << 5)) & 0xff),
+            (($h3 >> 3) & 0xff),
+            (($h3 >> 11) & 0xff),
+            ((($h3 >> 19) | ($h4 << 6)) & 0xff),
+            (($h4 >> 2) & 0xff),
+            (($h4 >> 10) & 0xff),
+            (($h4 >> 18) & 0xff),
+            (($h5 >> 0) & 0xff),
+            (($h5 >> 8) & 0xff),
+            (($h5 >> 16) & 0xff),
+            ((($h5 >> 24) | ($h6 << 1)) & 0xff),
+            (($h6 >> 7) & 0xff),
+            (($h6 >> 15) & 0xff),
+            ((($h6 >> 23) | ($h7 << 3)) & 0xff),
+            (($h7 >> 5) & 0xff),
+            (($h7 >> 13) & 0xff),
+            ((($h7 >> 21) | ($h8 << 4)) & 0xff),
+            (($h8 >> 4) & 0xff),
+            (($h8 >> 12) & 0xff),
+            ((($h8 >> 20) | ($h9 << 6)) & 0xff),
+            (($h9 >> 2) & 0xff),
+            (($h9 >> 10) & 0xff),
+            (($h9 >> 18) & 0xff)
+        ]);
     }
 
     /**
@@ -296,10 +267,10 @@ abstract class ParagonIE_Sodium_Core_Curve25519 extends ParagonIE_Sodium_Core_Cu
      * @throws SodiumException
      * @throws TypeError
      */
-    public static function fe_isnegative(ParagonIE_Sodium_Core_Curve25519_Fe $f)
+    public static function fe_isnegative(ParagonIE_Sodium_Core_Curve25519_Fe $f): int
     {
         $str = self::fe_tobytes($f);
-        return (int) (self::chrToInt($str[0]) & 1);
+        return (self::chrToInt($str[0]) & 1);
     }
 
     /**
@@ -312,16 +283,14 @@ abstract class ParagonIE_Sodium_Core_Curve25519 extends ParagonIE_Sodium_Core_Cu
      * @throws SodiumException
      * @throws TypeError
      */
-    public static function fe_isnonzero(ParagonIE_Sodium_Core_Curve25519_Fe $f)
+    public static function fe_isnonzero(ParagonIE_Sodium_Core_Curve25519_Fe $f): bool
     {
         static $zero;
         if ($zero === null) {
             $zero = str_repeat("\x00", 32);
         }
-        /** @var string $zero */
-        /** @var string $str */
         $str = self::fe_tobytes($f);
-        return !self::verify_32($str, (string) $zero);
+        return !self::verify_32($str, $zero);
     }
 
     /**
@@ -341,143 +310,123 @@ abstract class ParagonIE_Sodium_Core_Curve25519 extends ParagonIE_Sodium_Core_Cu
     public static function fe_mul(
         ParagonIE_Sodium_Core_Curve25519_Fe $f,
         ParagonIE_Sodium_Core_Curve25519_Fe $g
-    ) {
+    ): ParagonIE_Sodium_Core_Curve25519_Fe {
         // Ensure limbs aren't oversized.
         $f = self::fe_normalize($f);
         $g = self::fe_normalize($g);
-        $f0 = $f[0];
-        $f1 = $f[1];
-        $f2 = $f[2];
-        $f3 = $f[3];
-        $f4 = $f[4];
-        $f5 = $f[5];
-        $f6 = $f[6];
-        $f7 = $f[7];
-        $f8 = $f[8];
-        $f9 = $f[9];
-        $g0 = $g[0];
-        $g1 = $g[1];
-        $g2 = $g[2];
-        $g3 = $g[3];
-        $g4 = $g[4];
-        $g5 = $g[5];
-        $g6 = $g[6];
-        $g7 = $g[7];
-        $g8 = $g[8];
-        $g9 = $g[9];
-        $g1_19 = self::mul($g1, 19, 5);
-        $g2_19 = self::mul($g2, 19, 5);
-        $g3_19 = self::mul($g3, 19, 5);
-        $g4_19 = self::mul($g4, 19, 5);
-        $g5_19 = self::mul($g5, 19, 5);
-        $g6_19 = self::mul($g6, 19, 5);
-        $g7_19 = self::mul($g7, 19, 5);
-        $g8_19 = self::mul($g8, 19, 5);
-        $g9_19 = self::mul($g9, 19, 5);
-        $f1_2 = $f1 << 1;
-        $f3_2 = $f3 << 1;
-        $f5_2 = $f5 << 1;
-        $f7_2 = $f7 << 1;
-        $f9_2 = $f9 << 1;
-        $f0g0    = self::mul($f0,    $g0, 26);
-        $f0g1    = self::mul($f0,    $g1, 25);
-        $f0g2    = self::mul($f0,    $g2, 26);
-        $f0g3    = self::mul($f0,    $g3, 25);
-        $f0g4    = self::mul($f0,    $g4, 26);
-        $f0g5    = self::mul($f0,    $g5, 25);
-        $f0g6    = self::mul($f0,    $g6, 26);
-        $f0g7    = self::mul($f0,    $g7, 25);
-        $f0g8    = self::mul($f0,    $g8, 26);
-        $f0g9    = self::mul($f0,    $g9, 26);
-        $f1g0    = self::mul($f1,    $g0, 26);
-        $f1g1_2  = self::mul($f1_2,  $g1, 25);
-        $f1g2    = self::mul($f1,    $g2, 26);
-        $f1g3_2  = self::mul($f1_2,  $g3, 25);
-        $f1g4    = self::mul($f1,    $g4, 26);
-        $f1g5_2  = self::mul($f1_2,  $g5, 25);
-        $f1g6    = self::mul($f1,    $g6, 26);
-        $f1g7_2  = self::mul($f1_2,  $g7, 25);
-        $f1g8    = self::mul($f1,    $g8, 26);
+        $g1_19 = self::mul($g[1], 19, 5);
+        $g2_19 = self::mul($g[2], 19, 5);
+        $g3_19 = self::mul($g[3], 19, 5);
+        $g4_19 = self::mul($g[4], 19, 5);
+        $g5_19 = self::mul($g[5], 19, 5);
+        $g6_19 = self::mul($g[6], 19, 5);
+        $g7_19 = self::mul($g[7], 19, 5);
+        $g8_19 = self::mul($g[8], 19, 5);
+        $g9_19 = self::mul($g[9], 19, 5);
+        $f1_2 = $f[1] << 1;
+        $f3_2 = $f[3] << 1;
+        $f5_2 = $f[5] << 1;
+        $f7_2 = $f[7] << 1;
+        $f9_2 = $f[9] << 1;
+        $f0g0    = self::mul($f[0],  $g[0], 26);
+        $f0g1    = self::mul($f[0],  $g[1], 25);
+        $f0g2    = self::mul($f[0],  $g[2], 26);
+        $f0g3    = self::mul($f[0],  $g[3], 25);
+        $f0g4    = self::mul($f[0],  $g[4], 26);
+        $f0g5    = self::mul($f[0],  $g[5], 25);
+        $f0g6    = self::mul($f[0],  $g[6], 26);
+        $f0g7    = self::mul($f[0],  $g[7], 25);
+        $f0g8    = self::mul($f[0],  $g[8], 26);
+        $f0g9    = self::mul($f[0],  $g[9], 26);
+        $f1g0    = self::mul($f[1],  $g[0], 26);
+        $f1g1_2  = self::mul($f1_2,  $g[1], 25);
+        $f1g2    = self::mul($f[1],  $g[2], 26);
+        $f1g3_2  = self::mul($f1_2,  $g[3], 25);
+        $f1g4    = self::mul($f[1],  $g[4], 26);
+        $f1g5_2  = self::mul($f1_2,  $g[5], 25);
+        $f1g6    = self::mul($f[1],  $g[6], 26);
+        $f1g7_2  = self::mul($f1_2,  $g[7], 25);
+        $f1g8    = self::mul($f[1],  $g[8], 26);
         $f1g9_38 = self::mul($g9_19, $f1_2, 26);
-        $f2g0    = self::mul($f2,    $g0, 26);
-        $f2g1    = self::mul($f2,    $g1, 25);
-        $f2g2    = self::mul($f2,    $g2, 26);
-        $f2g3    = self::mul($f2,    $g3, 25);
-        $f2g4    = self::mul($f2,    $g4, 26);
-        $f2g5    = self::mul($f2,    $g5, 25);
-        $f2g6    = self::mul($f2,    $g6, 26);
-        $f2g7    = self::mul($f2,    $g7, 25);
-        $f2g8_19 = self::mul($g8_19, $f2, 26);
-        $f2g9_19 = self::mul($g9_19, $f2, 26);
-        $f3g0    = self::mul($f3,    $g0, 26);
-        $f3g1_2  = self::mul($f3_2,  $g1, 25);
-        $f3g2    = self::mul($f3,    $g2, 26);
-        $f3g3_2  = self::mul($f3_2,  $g3, 25);
-        $f3g4    = self::mul($f3,    $g4, 26);
-        $f3g5_2  = self::mul($f3_2,  $g5, 25);
-        $f3g6    = self::mul($f3,    $g6, 26);
+        $f2g0    = self::mul($f[2],  $g[0], 26);
+        $f2g1    = self::mul($f[2],  $g[1], 25);
+        $f2g2    = self::mul($f[2],  $g[2], 26);
+        $f2g3    = self::mul($f[2],  $g[3], 25);
+        $f2g4    = self::mul($f[2],  $g[4], 26);
+        $f2g5    = self::mul($f[2],  $g[5], 25);
+        $f2g6    = self::mul($f[2],  $g[6], 26);
+        $f2g7    = self::mul($f[2],  $g[7], 25);
+        $f2g8_19 = self::mul($g8_19, $f[2], 26);
+        $f2g9_19 = self::mul($g9_19, $f[2], 26);
+        $f3g0    = self::mul($f[3],  $g[0], 26);
+        $f3g1_2  = self::mul($f3_2,  $g[1], 25);
+        $f3g2    = self::mul($f[3],  $g[2], 26);
+        $f3g3_2  = self::mul($f3_2,  $g[3], 25);
+        $f3g4    = self::mul($f[3],  $g[4], 26);
+        $f3g5_2  = self::mul($f3_2,  $g[5], 25);
+        $f3g6    = self::mul($f[3],  $g[6], 26);
         $f3g7_38 = self::mul($g7_19, $f3_2, 26);
-        $f3g8_19 = self::mul($g8_19, $f3, 25);
+        $f3g8_19 = self::mul($g8_19, $f[3], 25);
         $f3g9_38 = self::mul($g9_19, $f3_2, 26);
-        $f4g0    = self::mul($f4,    $g0, 26);
-        $f4g1    = self::mul($f4,    $g1, 25);
-        $f4g2    = self::mul($f4,    $g2, 26);
-        $f4g3    = self::mul($f4,    $g3, 25);
-        $f4g4    = self::mul($f4,    $g4, 26);
-        $f4g5    = self::mul($f4,    $g5, 25);
-        $f4g6_19 = self::mul($g6_19, $f4, 26);
-        $f4g7_19 = self::mul($g7_19, $f4, 26);
-        $f4g8_19 = self::mul($g8_19, $f4, 26);
-        $f4g9_19 = self::mul($g9_19, $f4, 26);
-        $f5g0    = self::mul($f5,    $g0, 26);
-        $f5g1_2  = self::mul($f5_2,  $g1, 25);
-        $f5g2    = self::mul($f5,    $g2, 26);
-        $f5g3_2  = self::mul($f5_2,  $g3, 25);
-        $f5g4    = self::mul($f5,    $g4, 26);
+        $f4g0    = self::mul($f[4],  $g[0], 26);
+        $f4g1    = self::mul($f[4],  $g[1], 25);
+        $f4g2    = self::mul($f[4],  $g[2], 26);
+        $f4g3    = self::mul($f[4],  $g[3], 25);
+        $f4g4    = self::mul($f[4],  $g[4], 26);
+        $f4g5    = self::mul($f[4],  $g[5], 25);
+        $f4g6_19 = self::mul($g6_19, $f[4], 26);
+        $f4g7_19 = self::mul($g7_19, $f[4], 26);
+        $f4g8_19 = self::mul($g8_19, $f[4], 26);
+        $f4g9_19 = self::mul($g9_19, $f[4], 26);
+        $f5g0    = self::mul($f[5],  $g[0], 26);
+        $f5g1_2  = self::mul($f5_2,  $g[1], 25);
+        $f5g2    = self::mul($f[5],  $g[2], 26);
+        $f5g3_2  = self::mul($f5_2,  $g[3], 25);
+        $f5g4    = self::mul($f[5],  $g[4], 26);
         $f5g5_38 = self::mul($g5_19, $f5_2, 26);
-        $f5g6_19 = self::mul($g6_19, $f5, 25);
+        $f5g6_19 = self::mul($g6_19, $f[5], 25);
         $f5g7_38 = self::mul($g7_19, $f5_2, 26);
-        $f5g8_19 = self::mul($g8_19, $f5, 25);
+        $f5g8_19 = self::mul($g8_19, $f[5], 25);
         $f5g9_38 = self::mul($g9_19, $f5_2, 26);
-        $f6g0    = self::mul($f6,    $g0, 26);
-        $f6g1    = self::mul($f6,    $g1, 25);
-        $f6g2    = self::mul($f6,    $g2, 26);
-        $f6g3    = self::mul($f6,    $g3, 25);
-        $f6g4_19 = self::mul($g4_19, $f6, 26);
-        $f6g5_19 = self::mul($g5_19, $f6, 26);
-        $f6g6_19 = self::mul($g6_19, $f6, 26);
-        $f6g7_19 = self::mul($g7_19, $f6, 26);
-        $f6g8_19 = self::mul($g8_19, $f6, 26);
-        $f6g9_19 = self::mul($g9_19, $f6, 26);
-        $f7g0    = self::mul($f7,    $g0, 26);
-        $f7g1_2  = self::mul($f7_2,  $g1, 25);
-        $f7g2    = self::mul($f7,    $g2, 26);
+        $f6g0    = self::mul($f[6],  $g[0], 26);
+        $f6g1    = self::mul($f[6],  $g[1], 25);
+        $f6g2    = self::mul($f[6],  $g[2], 26);
+        $f6g3    = self::mul($f[6],  $g[3], 25);
+        $f6g4_19 = self::mul($g4_19, $f[6], 26);
+        $f6g5_19 = self::mul($g5_19, $f[6], 26);
+        $f6g6_19 = self::mul($g6_19, $f[6], 26);
+        $f6g7_19 = self::mul($g7_19, $f[6], 26);
+        $f6g8_19 = self::mul($g8_19, $f[6], 26);
+        $f6g9_19 = self::mul($g9_19, $f[6], 26);
+        $f7g0    = self::mul($f[7],  $g[0], 26);
+        $f7g1_2  = self::mul($f7_2,  $g[1], 25);
+        $f7g2    = self::mul($f[7],  $g[2], 26);
         $f7g3_38 = self::mul($g3_19, $f7_2, 26);
-        $f7g4_19 = self::mul($g4_19, $f7, 26);
+        $f7g4_19 = self::mul($g4_19, $f[7], 26);
         $f7g5_38 = self::mul($g5_19, $f7_2, 26);
-        $f7g6_19 = self::mul($g6_19, $f7, 25);
+        $f7g6_19 = self::mul($g6_19, $f[7], 25);
         $f7g7_38 = self::mul($g7_19, $f7_2, 26);
-        $f7g8_19 = self::mul($g8_19, $f7, 25);
+        $f7g8_19 = self::mul($g8_19, $f[7], 25);
         $f7g9_38 = self::mul($g9_19,$f7_2, 26);
-        $f8g0    = self::mul($f8,    $g0, 26);
-        $f8g1    = self::mul($f8,    $g1, 25);
-        $f8g2_19 = self::mul($g2_19, $f8, 26);
-        $f8g3_19 = self::mul($g3_19, $f8, 26);
-        $f8g4_19 = self::mul($g4_19, $f8, 26);
-        $f8g5_19 = self::mul($g5_19, $f8, 26);
-        $f8g6_19 = self::mul($g6_19, $f8, 26);
-        $f8g7_19 = self::mul($g7_19, $f8, 26);
-        $f8g8_19 = self::mul($g8_19, $f8, 26);
-        $f8g9_19 = self::mul($g9_19, $f8, 26);
-        $f9g0    = self::mul($f9,    $g0, 26);
+        $f8g0    = self::mul($f[8],  $g[0], 26);
+        $f8g1    = self::mul($f[8],  $g[1], 25);
+        $f8g2_19 = self::mul($g2_19, $f[8], 26);
+        $f8g3_19 = self::mul($g3_19, $f[8], 26);
+        $f8g4_19 = self::mul($g4_19, $f[8], 26);
+        $f8g5_19 = self::mul($g5_19, $f[8], 26);
+        $f8g6_19 = self::mul($g6_19, $f[8], 26);
+        $f8g7_19 = self::mul($g7_19, $f[8], 26);
+        $f8g8_19 = self::mul($g8_19, $f[8], 26);
+        $f8g9_19 = self::mul($g9_19, $f[8], 26);
+        $f9g0    = self::mul($f[9],  $g[0], 26);
         $f9g1_38 = self::mul($g1_19, $f9_2, 26);
-        $f9g2_19 = self::mul($g2_19, $f9, 25);
+        $f9g2_19 = self::mul($g2_19, $f[9], 25);
         $f9g3_38 = self::mul($g3_19, $f9_2, 26);
-        $f9g4_19 = self::mul($g4_19, $f9, 25);
+        $f9g4_19 = self::mul($g4_19, $f[9], 25);
         $f9g5_38 = self::mul($g5_19, $f9_2, 26);
-        $f9g6_19 = self::mul($g6_19, $f9, 25);
+        $f9g6_19 = self::mul($g6_19, $f[9], 25);
         $f9g7_38 = self::mul($g7_19, $f9_2, 26);
-        $f9g8_19 = self::mul($g8_19, $f9, 25);
+        $f9g8_19 = self::mul($g8_19, $f[9], 25);
         $f9g9_38 = self::mul($g9_19, $f9_2, 26);
 
         $h0 = $f0g0 + $f1g9_38 + $f2g8_19 + $f3g7_38 + $f4g6_19 + $f5g5_38 + $f6g4_19 + $f7g3_38 + $f8g2_19 + $f9g1_38;
@@ -536,18 +485,7 @@ abstract class ParagonIE_Sodium_Core_Curve25519 extends ParagonIE_Sodium_Core_Cu
 
         return self::fe_normalize(
             ParagonIE_Sodium_Core_Curve25519_Fe::fromArray(
-                array(
-                    (int) $h0,
-                    (int) $h1,
-                    (int) $h2,
-                    (int) $h3,
-                    (int) $h4,
-                    (int) $h5,
-                    (int) $h6,
-                    (int) $h7,
-                    (int) $h8,
-                    (int) $h9
-                )
+                [$h0, $h1, $h2, $h3, $h4, $h5, $h6, $h7, $h8, $h9]
             )
         );
     }
@@ -561,9 +499,8 @@ abstract class ParagonIE_Sodium_Core_Curve25519 extends ParagonIE_Sodium_Core_Cu
      *
      * @param ParagonIE_Sodium_Core_Curve25519_Fe $f
      * @return ParagonIE_Sodium_Core_Curve25519_Fe
-     * @psalm-suppress MixedAssignment
      */
-    public static function fe_neg(ParagonIE_Sodium_Core_Curve25519_Fe $f)
+    public static function fe_neg(ParagonIE_Sodium_Core_Curve25519_Fe $f): ParagonIE_Sodium_Core_Curve25519_Fe
     {
         $h = new ParagonIE_Sodium_Core_Curve25519_Fe();
         for ($i = 0; $i < 10; ++$i) {
@@ -582,88 +519,78 @@ abstract class ParagonIE_Sodium_Core_Curve25519 extends ParagonIE_Sodium_Core_Cu
      * @param ParagonIE_Sodium_Core_Curve25519_Fe $f
      * @return ParagonIE_Sodium_Core_Curve25519_Fe
      */
-    public static function fe_sq(ParagonIE_Sodium_Core_Curve25519_Fe $f)
-    {
+    public static function fe_sq(
+        ParagonIE_Sodium_Core_Curve25519_Fe $f
+    ): ParagonIE_Sodium_Core_Curve25519_Fe {
         $f = self::fe_normalize($f);
-        $f0 = (int) $f[0];
-        $f1 = (int) $f[1];
-        $f2 = (int) $f[2];
-        $f3 = (int) $f[3];
-        $f4 = (int) $f[4];
-        $f5 = (int) $f[5];
-        $f6 = (int) $f[6];
-        $f7 = (int) $f[7];
-        $f8 = (int) $f[8];
-        $f9 = (int) $f[9];
-
-        $f0_2 = $f0 << 1;
-        $f1_2 = $f1 << 1;
-        $f2_2 = $f2 << 1;
-        $f3_2 = $f3 << 1;
-        $f4_2 = $f4 << 1;
-        $f5_2 = $f5 << 1;
-        $f6_2 = $f6 << 1;
-        $f7_2 = $f7 << 1;
-        $f5_38 = self::mul($f5, 38, 6);
-        $f6_19 = self::mul($f6, 19, 5);
-        $f7_38 = self::mul($f7, 38, 6);
-        $f8_19 = self::mul($f8, 19, 5);
-        $f9_38 = self::mul($f9, 38, 6);
-        $f0f0    = self::mul($f0,    $f0,    26);
-        $f0f1_2  = self::mul($f0_2,  $f1,    26);
-        $f0f2_2  = self::mul($f0_2,  $f2,    26);
-        $f0f3_2  = self::mul($f0_2,  $f3,    26);
-        $f0f4_2  = self::mul($f0_2,  $f4,    26);
-        $f0f5_2  = self::mul($f0_2,  $f5,    26);
-        $f0f6_2  = self::mul($f0_2,  $f6,    26);
-        $f0f7_2  = self::mul($f0_2,  $f7,    26);
-        $f0f8_2  = self::mul($f0_2,  $f8,    26);
-        $f0f9_2  = self::mul($f0_2,  $f9,    26);
-        $f1f1_2  = self::mul($f1_2,  $f1,    26);
-        $f1f2_2  = self::mul($f1_2,  $f2,    26);
+        $f0_2 = $f[0] << 1;
+        $f1_2 = $f[1] << 1;
+        $f2_2 = $f[2] << 1;
+        $f3_2 = $f[3] << 1;
+        $f4_2 = $f[4] << 1;
+        $f5_2 = $f[5] << 1;
+        $f6_2 = $f[6] << 1;
+        $f7_2 = $f[7] << 1;
+        $f5_38 = self::mul($f[5], 38, 6);
+        $f6_19 = self::mul($f[6], 19, 5);
+        $f7_38 = self::mul($f[7], 38, 6);
+        $f8_19 = self::mul($f[8], 19, 5);
+        $f9_38 = self::mul($f[9], 38, 6);
+        $f0f0    = self::mul($f[0],  $f[0],  26);
+        $f0f1_2  = self::mul($f0_2,  $f[1],  26);
+        $f0f2_2  = self::mul($f0_2,  $f[2],  26);
+        $f0f3_2  = self::mul($f0_2,  $f[3],  26);
+        $f0f4_2  = self::mul($f0_2,  $f[4],  26);
+        $f0f5_2  = self::mul($f0_2,  $f[5],  26);
+        $f0f6_2  = self::mul($f0_2,  $f[6],  26);
+        $f0f7_2  = self::mul($f0_2,  $f[7],  26);
+        $f0f8_2  = self::mul($f0_2,  $f[8],  26);
+        $f0f9_2  = self::mul($f0_2,  $f[9],  26);
+        $f1f1_2  = self::mul($f1_2,  $f[1],  26);
+        $f1f2_2  = self::mul($f1_2,  $f[2],  26);
         $f1f3_4  = self::mul($f1_2,  $f3_2,  26);
-        $f1f4_2  = self::mul($f1_2,  $f4,    26);
+        $f1f4_2  = self::mul($f1_2,  $f[4],  26);
         $f1f5_4  = self::mul($f1_2,  $f5_2,  26);
-        $f1f6_2  = self::mul($f1_2,  $f6,    26);
+        $f1f6_2  = self::mul($f1_2,  $f[6],  26);
         $f1f7_4  = self::mul($f1_2,  $f7_2,  26);
-        $f1f8_2  = self::mul($f1_2,  $f8,    26);
+        $f1f8_2  = self::mul($f1_2,  $f[8],  26);
         $f1f9_76 = self::mul($f9_38, $f1_2,  27);
-        $f2f2    = self::mul($f2,    $f2,    27);
-        $f2f3_2  = self::mul($f2_2,  $f3,    27);
-        $f2f4_2  = self::mul($f2_2,  $f4,    27);
-        $f2f5_2  = self::mul($f2_2,  $f5,    27);
-        $f2f6_2  = self::mul($f2_2,  $f6,    27);
-        $f2f7_2  = self::mul($f2_2,  $f7,    27);
+        $f2f2    = self::mul($f[2],  $f[2],  27);
+        $f2f3_2  = self::mul($f2_2,  $f[3],  27);
+        $f2f4_2  = self::mul($f2_2,  $f[4],  27);
+        $f2f5_2  = self::mul($f2_2,  $f[5],  27);
+        $f2f6_2  = self::mul($f2_2,  $f[6],  27);
+        $f2f7_2  = self::mul($f2_2,  $f[7],  27);
         $f2f8_38 = self::mul($f8_19, $f2_2,  27);
-        $f2f9_38 = self::mul($f9_38, $f2,    26);
-        $f3f3_2  = self::mul($f3_2,  $f3,    26);
-        $f3f4_2  = self::mul($f3_2,  $f4,    26);
+        $f2f9_38 = self::mul($f9_38, $f[2],  26);
+        $f3f3_2  = self::mul($f3_2,  $f[3],  26);
+        $f3f4_2  = self::mul($f3_2,  $f[4],  26);
         $f3f5_4  = self::mul($f3_2,  $f5_2,  26);
-        $f3f6_2  = self::mul($f3_2,  $f6,    26);
+        $f3f6_2  = self::mul($f3_2,  $f[6],    26);
         $f3f7_76 = self::mul($f7_38, $f3_2,  26);
         $f3f8_38 = self::mul($f8_19, $f3_2,  26);
         $f3f9_76 = self::mul($f9_38, $f3_2,  26);
-        $f4f4    = self::mul($f4,    $f4,    26);
-        $f4f5_2  = self::mul($f4_2,  $f5,    26);
+        $f4f4    = self::mul($f[4],  $f[4],  26);
+        $f4f5_2  = self::mul($f4_2,  $f[5],  26);
         $f4f6_38 = self::mul($f6_19, $f4_2,  27);
-        $f4f7_38 = self::mul($f7_38, $f4,    26);
+        $f4f7_38 = self::mul($f7_38, $f[4],  26);
         $f4f8_38 = self::mul($f8_19, $f4_2,  27);
-        $f4f9_38 = self::mul($f9_38, $f4,    26);
-        $f5f5_38 = self::mul($f5_38, $f5,    26);
+        $f4f9_38 = self::mul($f9_38, $f[4],  26);
+        $f5f5_38 = self::mul($f5_38, $f[5],  26);
         $f5f6_38 = self::mul($f6_19, $f5_2,  26);
         $f5f7_76 = self::mul($f7_38, $f5_2,  26);
         $f5f8_38 = self::mul($f8_19, $f5_2,  26);
         $f5f9_76 = self::mul($f9_38, $f5_2,  26);
-        $f6f6_19 = self::mul($f6_19, $f6,    26);
-        $f6f7_38 = self::mul($f7_38, $f6,    26);
+        $f6f6_19 = self::mul($f6_19, $f[6],  26);
+        $f6f7_38 = self::mul($f7_38, $f[6],  26);
         $f6f8_38 = self::mul($f8_19, $f6_2,  27);
-        $f6f9_38 = self::mul($f9_38, $f6,    26);
-        $f7f7_38 = self::mul($f7_38, $f7,    26);
+        $f6f9_38 = self::mul($f9_38, $f[6],  26);
+        $f7f7_38 = self::mul($f7_38, $f[7],  26);
         $f7f8_38 = self::mul($f8_19, $f7_2,  26);
         $f7f9_76 = self::mul($f9_38, $f7_2,  26);
-        $f8f8_19 = self::mul($f8_19, $f8,    26);
-        $f8f9_38 = self::mul($f9_38, $f8,    26);
-        $f9f9_38 = self::mul($f9_38, $f9,    26);
+        $f8f8_19 = self::mul($f8_19, $f[8],  26);
+        $f8f9_38 = self::mul($f9_38, $f[8],  26);
+        $f9f9_38 = self::mul($f9_38, $f[9],  26);
         $h0 = $f0f0   + $f1f9_76 + $f2f8_38 + $f3f7_76 + $f4f6_38 + $f5f5_38;
         $h1 = $f0f1_2 + $f2f9_38 + $f3f8_38 + $f4f7_38 + $f5f6_38;
         $h2 = $f0f2_2 + $f1f1_2  + $f3f9_76 + $f4f8_38 + $f5f7_76 + $f6f6_19;
@@ -720,18 +647,7 @@ abstract class ParagonIE_Sodium_Core_Curve25519 extends ParagonIE_Sodium_Core_Cu
 
         return self::fe_normalize(
             ParagonIE_Sodium_Core_Curve25519_Fe::fromArray(
-                array(
-                    (int) $h0,
-                    (int) $h1,
-                    (int) $h2,
-                    (int) $h3,
-                    (int) $h4,
-                    (int) $h5,
-                    (int) $h6,
-                    (int) $h7,
-                    (int) $h8,
-                    (int) $h9
-                )
+                [$h0, $h1, $h2, $h3, $h4, $h5, $h6, $h7, $h8, $h9]
             )
         );
     }
@@ -747,99 +663,88 @@ abstract class ParagonIE_Sodium_Core_Curve25519 extends ParagonIE_Sodium_Core_Cu
      * @param ParagonIE_Sodium_Core_Curve25519_Fe $f
      * @return ParagonIE_Sodium_Core_Curve25519_Fe
      */
-    public static function fe_sq2(ParagonIE_Sodium_Core_Curve25519_Fe $f)
+    public static function fe_sq2(ParagonIE_Sodium_Core_Curve25519_Fe $f): ParagonIE_Sodium_Core_Curve25519_Fe
     {
         $f = self::fe_normalize($f);
-        $f0 = (int) $f[0];
-        $f1 = (int) $f[1];
-        $f2 = (int) $f[2];
-        $f3 = (int) $f[3];
-        $f4 = (int) $f[4];
-        $f5 = (int) $f[5];
-        $f6 = (int) $f[6];
-        $f7 = (int) $f[7];
-        $f8 = (int) $f[8];
-        $f9 = (int) $f[9];
-
-        $f0_2 = $f0 << 1;
-        $f1_2 = $f1 << 1;
-        $f2_2 = $f2 << 1;
-        $f3_2 = $f3 << 1;
-        $f4_2 = $f4 << 1;
-        $f5_2 = $f5 << 1;
-        $f6_2 = $f6 << 1;
-        $f7_2 = $f7 << 1;
-        $f5_38 = self::mul($f5, 38, 6); /* 1.959375*2^30 */
-        $f6_19 = self::mul($f6, 19, 5); /* 1.959375*2^30 */
-        $f7_38 = self::mul($f7, 38, 6); /* 1.959375*2^30 */
-        $f8_19 = self::mul($f8, 19, 5); /* 1.959375*2^30 */
-        $f9_38 = self::mul($f9, 38, 6); /* 1.959375*2^30 */
-        $f0f0 = self::mul($f0, $f0, 24);
-        $f0f1_2 = self::mul($f0_2, $f1, 24);
-        $f0f2_2 = self::mul($f0_2, $f2, 24);
-        $f0f3_2 = self::mul($f0_2, $f3, 24);
-        $f0f4_2 = self::mul($f0_2, $f4, 24);
-        $f0f5_2 = self::mul($f0_2, $f5, 24);
-        $f0f6_2 = self::mul($f0_2, $f6, 24);
-        $f0f7_2 = self::mul($f0_2, $f7, 24);
-        $f0f8_2 = self::mul($f0_2, $f8, 24);
-        $f0f9_2 = self::mul($f0_2, $f9, 24);
-        $f1f1_2 = self::mul($f1_2,  $f1, 24);
-        $f1f2_2 = self::mul($f1_2,  $f2, 24);
+        $f0_2 = $f[0] << 1;
+        $f1_2 = $f[1] << 1;
+        $f2_2 = $f[2] << 1;
+        $f3_2 = $f[3] << 1;
+        $f4_2 = $f[4] << 1;
+        $f5_2 = $f[5] << 1;
+        $f6_2 = $f[6] << 1;
+        $f7_2 = $f[7] << 1;
+        $f5_38 = self::mul($f[5], 38, 6); /* 1.959375*2^30 */
+        $f6_19 = self::mul($f[6], 19, 5); /* 1.959375*2^30 */
+        $f7_38 = self::mul($f[7], 38, 6); /* 1.959375*2^30 */
+        $f8_19 = self::mul($f[8], 19, 5); /* 1.959375*2^30 */
+        $f9_38 = self::mul($f[9], 38, 6); /* 1.959375*2^30 */
+        $f0f0 = self::mul($f[0], $f[0], 24);
+        $f0f1_2 = self::mul($f0_2, $f[1], 24);
+        $f0f2_2 = self::mul($f0_2, $f[2], 24);
+        $f0f3_2 = self::mul($f0_2, $f[3], 24);
+        $f0f4_2 = self::mul($f0_2, $f[4], 24);
+        $f0f5_2 = self::mul($f0_2, $f[5], 24);
+        $f0f6_2 = self::mul($f0_2, $f[6], 24);
+        $f0f7_2 = self::mul($f0_2, $f[7], 24);
+        $f0f8_2 = self::mul($f0_2, $f[8], 24);
+        $f0f9_2 = self::mul($f0_2, $f[9], 24);
+        $f1f1_2 = self::mul($f1_2,  $f[1], 24);
+        $f1f2_2 = self::mul($f1_2,  $f[2], 24);
         $f1f3_4 = self::mul($f1_2,  $f3_2, 24);
-        $f1f4_2 = self::mul($f1_2,  $f4, 24);
+        $f1f4_2 = self::mul($f1_2,  $f[4], 24);
         $f1f5_4 = self::mul($f1_2,  $f5_2, 24);
-        $f1f6_2 = self::mul($f1_2,  $f6, 24);
+        $f1f6_2 = self::mul($f1_2,  $f[6], 24);
         $f1f7_4 = self::mul($f1_2,  $f7_2, 24);
-        $f1f8_2 = self::mul($f1_2,  $f8, 24);
+        $f1f8_2 = self::mul($f1_2,  $f[8], 24);
         $f1f9_76 = self::mul($f9_38, $f1_2, 24);
-        $f2f2 = self::mul($f2,  $f2, 24);
-        $f2f3_2 = self::mul($f2_2,  $f3, 24);
-        $f2f4_2 = self::mul($f2_2,  $f4, 24);
-        $f2f5_2 = self::mul($f2_2,  $f5, 24);
-        $f2f6_2 = self::mul($f2_2,  $f6, 24);
-        $f2f7_2 = self::mul($f2_2,  $f7, 24);
+        $f2f2 = self::mul($f[2],  $f[2], 24);
+        $f2f3_2 = self::mul($f2_2,  $f[3], 24);
+        $f2f4_2 = self::mul($f2_2,  $f[4], 24);
+        $f2f5_2 = self::mul($f2_2,  $f[5], 24);
+        $f2f6_2 = self::mul($f2_2,  $f[6], 24);
+        $f2f7_2 = self::mul($f2_2,  $f[7], 24);
         $f2f8_38 = self::mul($f8_19, $f2_2, 25);
-        $f2f9_38 = self::mul($f9_38, $f2, 24);
-        $f3f3_2 = self::mul($f3_2,  $f3, 24);
-        $f3f4_2 = self::mul($f3_2,  $f4, 24);
+        $f2f9_38 = self::mul($f9_38, $f[2], 24);
+        $f3f3_2 = self::mul($f3_2,  $f[3], 24);
+        $f3f4_2 = self::mul($f3_2,  $f[4], 24);
         $f3f5_4 = self::mul($f3_2,  $f5_2, 24);
-        $f3f6_2 = self::mul($f3_2,  $f6, 24);
+        $f3f6_2 = self::mul($f3_2,  $f[6], 24);
         $f3f7_76 = self::mul($f7_38, $f3_2, 24);
         $f3f8_38 = self::mul($f8_19, $f3_2, 24);
         $f3f9_76 = self::mul($f9_38, $f3_2, 24);
-        $f4f4 = self::mul($f4,  $f4, 24);
-        $f4f5_2 = self::mul($f4_2,  $f5, 24);
+        $f4f4 = self::mul($f[4],  $f[4], 24);
+        $f4f5_2 = self::mul($f4_2,  $f[5], 24);
         $f4f6_38 = self::mul($f6_19, $f4_2, 25);
-        $f4f7_38 = self::mul($f7_38, $f4, 24);
+        $f4f7_38 = self::mul($f7_38, $f[4], 24);
         $f4f8_38 = self::mul($f8_19, $f4_2, 25);
-        $f4f9_38 = self::mul($f9_38, $f4, 24);
-        $f5f5_38 = self::mul($f5_38, $f5, 24);
+        $f4f9_38 = self::mul($f9_38, $f[4], 24);
+        $f5f5_38 = self::mul($f5_38, $f[5], 24);
         $f5f6_38 = self::mul($f6_19, $f5_2, 24);
         $f5f7_76 = self::mul($f7_38, $f5_2, 24);
         $f5f8_38 = self::mul($f8_19, $f5_2, 24);
         $f5f9_76 = self::mul($f9_38, $f5_2, 24);
-        $f6f6_19 = self::mul($f6_19, $f6, 24);
-        $f6f7_38 = self::mul($f7_38, $f6, 24);
+        $f6f6_19 = self::mul($f6_19, $f[6], 24);
+        $f6f7_38 = self::mul($f7_38, $f[6], 24);
         $f6f8_38 = self::mul($f8_19, $f6_2, 25);
-        $f6f9_38 = self::mul($f9_38, $f6, 24);
-        $f7f7_38 = self::mul($f7_38, $f7, 24);
+        $f6f9_38 = self::mul($f9_38, $f[6], 24);
+        $f7f7_38 = self::mul($f7_38, $f[7], 24);
         $f7f8_38 = self::mul($f8_19, $f7_2, 24);
         $f7f9_76 = self::mul($f9_38, $f7_2, 24);
-        $f8f8_19 = self::mul($f8_19, $f8, 24);
-        $f8f9_38 = self::mul($f9_38, $f8, 24);
-        $f9f9_38 = self::mul($f9_38, $f9, 24);
-
-        $h0 = (int) ($f0f0 + $f1f9_76 + $f2f8_38 + $f3f7_76 + $f4f6_38 + $f5f5_38) << 1;
-        $h1 = (int) ($f0f1_2 + $f2f9_38 + $f3f8_38 + $f4f7_38 + $f5f6_38) << 1;
-        $h2 = (int) ($f0f2_2 + $f1f1_2  + $f3f9_76 + $f4f8_38 + $f5f7_76 + $f6f6_19) << 1;
-        $h3 = (int) ($f0f3_2 + $f1f2_2  + $f4f9_38 + $f5f8_38 + $f6f7_38) << 1;
-        $h4 = (int) ($f0f4_2 + $f1f3_4  + $f2f2    + $f5f9_76 + $f6f8_38 + $f7f7_38) << 1;
-        $h5 = (int) ($f0f5_2 + $f1f4_2  + $f2f3_2  + $f6f9_38 + $f7f8_38) << 1;
-        $h6 = (int) ($f0f6_2 + $f1f5_4  + $f2f4_2  + $f3f3_2  + $f7f9_76 + $f8f8_19) << 1;
-        $h7 = (int) ($f0f7_2 + $f1f6_2  + $f2f5_2  + $f3f4_2  + $f8f9_38) << 1;
-        $h8 = (int) ($f0f8_2 + $f1f7_4  + $f2f6_2  + $f3f5_4  + $f4f4    + $f9f9_38) << 1;
-        $h9 = (int) ($f0f9_2 + $f1f8_2  + $f2f7_2  + $f3f6_2  + $f4f5_2) << 1;
+        $f8f8_19 = self::mul($f8_19, $f[8], 24);
+        $f8f9_38 = self::mul($f9_38, $f[8], 24);
+        $f9f9_38 = self::mul($f9_38, $f[9], 24);
+
+        $h0 = ($f0f0 + $f1f9_76 + $f2f8_38 + $f3f7_76 + $f4f6_38 + $f5f5_38) << 1;
+        $h1 = ($f0f1_2 + $f2f9_38 + $f3f8_38 + $f4f7_38 + $f5f6_38) << 1;
+        $h2 = ($f0f2_2 + $f1f1_2  + $f3f9_76 + $f4f8_38 + $f5f7_76 + $f6f6_19) << 1;
+        $h3 = ($f0f3_2 + $f1f2_2  + $f4f9_38 + $f5f8_38 + $f6f7_38) << 1;
+        $h4 = ($f0f4_2 + $f1f3_4  + $f2f2    + $f5f9_76 + $f6f8_38 + $f7f7_38) << 1;
+        $h5 = ($f0f5_2 + $f1f4_2  + $f2f3_2  + $f6f9_38 + $f7f8_38) << 1;
+        $h6 = ($f0f6_2 + $f1f5_4  + $f2f4_2  + $f3f3_2  + $f7f9_76 + $f8f8_19) << 1;
+        $h7 = ($f0f7_2 + $f1f6_2  + $f2f5_2  + $f3f4_2  + $f8f9_38) << 1;
+        $h8 = ($f0f8_2 + $f1f7_4  + $f2f6_2  + $f3f5_4  + $f4f4    + $f9f9_38) << 1;
+        $h9 = ($f0f9_2 + $f1f8_2  + $f2f7_2  + $f3f6_2  + $f4f5_2) << 1;
 
         $carry0 = ($h0 + (1 << 25)) >> 26;
         $h1 += $carry0;
@@ -886,18 +791,7 @@ abstract class ParagonIE_Sodium_Core_Curve25519 extends ParagonIE_Sodium_Core_Cu
 
         return self::fe_normalize(
             ParagonIE_Sodium_Core_Curve25519_Fe::fromArray(
-                array(
-                    (int) $h0,
-                    (int) $h1,
-                    (int) $h2,
-                    (int) $h3,
-                    (int) $h4,
-                    (int) $h5,
-                    (int) $h6,
-                    (int) $h7,
-                    (int) $h8,
-                    (int) $h9
-                )
+                [$h0, $h1, $h2, $h3, $h4, $h5, $h6, $h7, $h8, $h9]
             )
         );
     }
@@ -908,13 +802,13 @@ abstract class ParagonIE_Sodium_Core_Curve25519 extends ParagonIE_Sodium_Core_Cu
      * @param ParagonIE_Sodium_Core_Curve25519_Fe $Z
      * @return ParagonIE_Sodium_Core_Curve25519_Fe
      */
-    public static function fe_invert(ParagonIE_Sodium_Core_Curve25519_Fe $Z)
-    {
-        $z = clone $Z;
-        $t0 = self::fe_sq($z);
+    public static function fe_invert(
+        ParagonIE_Sodium_Core_Curve25519_Fe $Z
+    ): ParagonIE_Sodium_Core_Curve25519_Fe {
+        $t0 = self::fe_sq($Z);
         $t1 = self::fe_sq($t0);
         $t1 = self::fe_sq($t1);
-        $t1 = self::fe_mul($z, $t1);
+        $t1 = self::fe_mul($Z, $t1);
         $t0 = self::fe_mul($t0, $t1);
         $t2 = self::fe_sq($t0);
         $t1 = self::fe_mul($t1, $t2);
@@ -968,17 +862,9 @@ abstract class ParagonIE_Sodium_Core_Curve25519 extends ParagonIE_Sodium_Core_Cu
      * @param ParagonIE_Sodium_Core_Curve25519_Fe $z
      * @return ParagonIE_Sodium_Core_Curve25519_Fe
      */
-    public static function fe_pow22523(ParagonIE_Sodium_Core_Curve25519_Fe $z)
+    public static function fe_pow22523(ParagonIE_Sodium_Core_Curve25519_Fe $z): ParagonIE_Sodium_Core_Curve25519_Fe
     {
         $z = self::fe_normalize($z);
-        # fe_sq(t0, z);
-        # fe_sq(t1, t0);
-        # fe_sq(t1, t1);
-        # fe_mul(t1, z, t1);
-        # fe_mul(t0, t0, t1);
-        # fe_sq(t0, t0);
-        # fe_mul(t0, t1, t0);
-        # fe_sq(t1, t0);
         $t0 = self::fe_sq($z);
         $t1 = self::fe_sq($t0);
         $t1 = self::fe_sq($t1);
@@ -988,89 +874,52 @@ abstract class ParagonIE_Sodium_Core_Curve25519 extends ParagonIE_Sodium_Core_Cu
         $t0 = self::fe_mul($t1, $t0);
         $t1 = self::fe_sq($t0);
 
-        # for (i = 1; i < 5; ++i) {
-        #     fe_sq(t1, t1);
-        # }
         for ($i = 1; $i < 5; ++$i) {
             $t1 = self::fe_sq($t1);
         }
 
-        # fe_mul(t0, t1, t0);
-        # fe_sq(t1, t0);
         $t0 = self::fe_mul($t1, $t0);
         $t1 = self::fe_sq($t0);
 
-        # for (i = 1; i < 10; ++i) {
-        #     fe_sq(t1, t1);
-        # }
         for ($i = 1; $i < 10; ++$i) {
             $t1 = self::fe_sq($t1);
         }
 
-        # fe_mul(t1, t1, t0);
-        # fe_sq(t2, t1);
         $t1 = self::fe_mul($t1, $t0);
         $t2 = self::fe_sq($t1);
 
-        # for (i = 1; i < 20; ++i) {
-        #     fe_sq(t2, t2);
-        # }
         for ($i = 1; $i < 20; ++$i) {
             $t2 = self::fe_sq($t2);
         }
 
-        # fe_mul(t1, t2, t1);
-        # fe_sq(t1, t1);
         $t1 = self::fe_mul($t2, $t1);
         $t1 = self::fe_sq($t1);
 
-        # for (i = 1; i < 10; ++i) {
-        #     fe_sq(t1, t1);
-        # }
         for ($i = 1; $i < 10; ++$i) {
             $t1 = self::fe_sq($t1);
         }
 
-        # fe_mul(t0, t1, t0);
-        # fe_sq(t1, t0);
         $t0 = self::fe_mul($t1, $t0);
         $t1 = self::fe_sq($t0);
 
-        # for (i = 1; i < 50; ++i) {
-        #     fe_sq(t1, t1);
-        # }
         for ($i = 1; $i < 50; ++$i) {
             $t1 = self::fe_sq($t1);
         }
 
-        # fe_mul(t1, t1, t0);
-        # fe_sq(t2, t1);
         $t1 = self::fe_mul($t1, $t0);
         $t2 = self::fe_sq($t1);
 
-        # for (i = 1; i < 100; ++i) {
-        #     fe_sq(t2, t2);
-        # }
         for ($i = 1; $i < 100; ++$i) {
             $t2 = self::fe_sq($t2);
         }
 
-        # fe_mul(t1, t2, t1);
-        # fe_sq(t1, t1);
         $t1 = self::fe_mul($t2, $t1);
         $t1 = self::fe_sq($t1);
 
-        # for (i = 1; i < 50; ++i) {
-        #     fe_sq(t1, t1);
-        # }
         for ($i = 1; $i < 50; ++$i) {
             $t1 = self::fe_sq($t1);
         }
 
-        # fe_mul(t0, t1, t0);
-        # fe_sq(t0, t0);
-        # fe_sq(t0, t0);
-        # fe_mul(out, t0, z);
         $t0 = self::fe_mul($t1, $t0);
         $t0 = self::fe_sq($t0);
         $t0 = self::fe_sq($t0);
@@ -1094,23 +943,24 @@ abstract class ParagonIE_Sodium_Core_Curve25519 extends ParagonIE_Sodium_Core_Cu
      * @param ParagonIE_Sodium_Core_Curve25519_Fe $f
      * @param ParagonIE_Sodium_Core_Curve25519_Fe $g
      * @return ParagonIE_Sodium_Core_Curve25519_Fe
-     * @psalm-suppress MixedOperand
      */
-    public static function fe_sub(ParagonIE_Sodium_Core_Curve25519_Fe $f, ParagonIE_Sodium_Core_Curve25519_Fe $g)
-    {
+    public static function fe_sub(
+        ParagonIE_Sodium_Core_Curve25519_Fe $f,
+        ParagonIE_Sodium_Core_Curve25519_Fe $g
+    ): ParagonIE_Sodium_Core_Curve25519_Fe {
         return self::fe_normalize(
             ParagonIE_Sodium_Core_Curve25519_Fe::fromArray(
                 array(
-                    (int) ($f[0] - $g[0]),
-                    (int) ($f[1] - $g[1]),
-                    (int) ($f[2] - $g[2]),
-                    (int) ($f[3] - $g[3]),
-                    (int) ($f[4] - $g[4]),
-                    (int) ($f[5] - $g[5]),
-                    (int) ($f[6] - $g[6]),
-                    (int) ($f[7] - $g[7]),
-                    (int) ($f[8] - $g[8]),
-                    (int) ($f[9] - $g[9])
+                    ($f[0] - $g[0]),
+                    ($f[1] - $g[1]),
+                    ($f[2] - $g[2]),
+                    ($f[3] - $g[3]),
+                    ($f[4] - $g[4]),
+                    ($f[5] - $g[5]),
+                    ($f[6] - $g[6]),
+                    ($f[7] - $g[7]),
+                    ($f[8] - $g[8]),
+                    ($f[9] - $g[9])
                 )
             )
         );
@@ -1130,7 +980,7 @@ abstract class ParagonIE_Sodium_Core_Curve25519 extends ParagonIE_Sodium_Core_Cu
     public static function ge_add(
         ParagonIE_Sodium_Core_Curve25519_Ge_P3 $p,
         ParagonIE_Sodium_Core_Curve25519_Ge_Cached $q
-    ) {
+    ): ParagonIE_Sodium_Core_Curve25519_Ge_P1p1 {
         $r = new ParagonIE_Sodium_Core_Curve25519_Ge_P1p1();
         $r->X = self::fe_add($p->Y, $p->X);
         $r->Y = self::fe_sub($p->Y, $p->X);
@@ -1155,21 +1005,20 @@ abstract class ParagonIE_Sodium_Core_Curve25519 extends ParagonIE_Sodium_Core_Cu
      * @throws SodiumException
      * @throws TypeError
      */
-    public static function slide($a)
+    public static function slide(string $a): array
     {
         if (self::strlen($a) < 256) {
             if (self::strlen($a) < 16) {
-                $a = str_pad($a, 256, '0', STR_PAD_RIGHT);
+                $a = str_pad($a, 256, '0');
             }
         }
         /** @var array<int, int> $r */
         $r = array();
 
-        /** @var int $i */
         for ($i = 0; $i < 256; ++$i) {
-            $r[$i] = (int) (
+            $r[$i] = (
                 1 & (
-                    self::chrToInt($a[(int) ($i >> 3)])
+                    self::chrToInt($a[($i >> 3)])
                         >>
                     ($i & 7)
                 )
@@ -1210,63 +1059,38 @@ abstract class ParagonIE_Sodium_Core_Curve25519 extends ParagonIE_Sodium_Core_Cu
      * @throws SodiumException
      * @throws TypeError
      */
-    public static function ge_frombytes_negate_vartime($s)
-    {
+    public static function ge_frombytes_negate_vartime(
+        string $s
+    ): ParagonIE_Sodium_Core_Curve25519_Ge_P3 {
         static $d = null;
         if (!$d) {
-            $d = ParagonIE_Sodium_Core_Curve25519_Fe::fromArray(self::$d);
+            $d = ParagonIE_Sodium_Core_Curve25519_Fe::fromArray(self::D);
         }
-
-        # fe_frombytes(h->Y,s);
-        # fe_1(h->Z);
         $h = new ParagonIE_Sodium_Core_Curve25519_Ge_P3(
             self::fe_0(),
             self::fe_frombytes($s),
             self::fe_1()
         );
 
-        # fe_sq(u,h->Y);
-        # fe_mul(v,u,d);
-        # fe_sub(u,u,h->Z);       /* u = y^2-1 */
-        # fe_add(v,v,h->Z);       /* v = dy^2+1 */
         $u = self::fe_sq($h->Y);
-        /** @var ParagonIE_Sodium_Core_Curve25519_Fe $d */
         $v = self::fe_mul($u, $d);
         $u = self::fe_sub($u, $h->Z); /* u =  y^2 - 1 */
         $v = self::fe_add($v, $h->Z); /* v = dy^2 + 1 */
 
-        # fe_sq(v3,v);
-        # fe_mul(v3,v3,v);        /* v3 = v^3 */
-        # fe_sq(h->X,v3);
-        # fe_mul(h->X,h->X,v);
-        # fe_mul(h->X,h->X,u);    /* x = uv^7 */
         $v3 = self::fe_sq($v);
         $v3 = self::fe_mul($v3, $v); /* v3 = v^3 */
         $h->X = self::fe_sq($v3);
         $h->X = self::fe_mul($h->X, $v);
         $h->X = self::fe_mul($h->X, $u); /* x = uv^7 */
 
-        # fe_pow22523(h->X,h->X); /* x = (uv^7)^((q-5)/8) */
-        # fe_mul(h->X,h->X,v3);
-        # fe_mul(h->X,h->X,u);    /* x = uv^3(uv^7)^((q-5)/8) */
         $h->X = self::fe_pow22523($h->X); /* x = (uv^7)^((q-5)/8) */
         $h->X = self::fe_mul($h->X, $v3);
         $h->X = self::fe_mul($h->X, $u); /* x = uv^3(uv^7)^((q-5)/8) */
 
-        # fe_sq(vxx,h->X);
-        # fe_mul(vxx,vxx,v);
-        # fe_sub(check,vxx,u);    /* vx^2-u */
         $vxx = self::fe_sq($h->X);
         $vxx = self::fe_mul($vxx, $v);
         $check = self::fe_sub($vxx, $u); /* vx^2 - u */
 
-        # if (fe_isnonzero(check)) {
-        #     fe_add(check,vxx,u);  /* vx^2+u */
-        #     if (fe_isnonzero(check)) {
-        #         return -1;
-        #     }
-        #     fe_mul(h->X,h->X,sqrtm1);
-        # }
         if (self::fe_isnonzero($check)) {
             $check = self::fe_add($vxx, $u); /* vx^2 + u */
             if (self::fe_isnonzero($check)) {
@@ -1274,13 +1098,9 @@ abstract class ParagonIE_Sodium_Core_Curve25519 extends ParagonIE_Sodium_Core_Cu
             }
             $h->X = self::fe_mul(
                 $h->X,
-                ParagonIE_Sodium_Core_Curve25519_Fe::fromArray(self::$sqrtm1)
+                ParagonIE_Sodium_Core_Curve25519_Fe::fromArray(self::SQRTM1)
             );
         }
-
-        # if (fe_isnegative(h->X) == (s[31] >> 7)) {
-        #     fe_neg(h->X,h->X);
-        # }
         $i = self::chrToInt($s[31]);
         if (self::fe_isnegative($h->X) === ($i >> 7)) {
             $h->X = self::fe_neg($h->X);
@@ -1303,7 +1123,7 @@ abstract class ParagonIE_Sodium_Core_Curve25519 extends ParagonIE_Sodium_Core_Cu
         ParagonIE_Sodium_Core_Curve25519_Ge_P1p1 $R,
         ParagonIE_Sodium_Core_Curve25519_Ge_P3 $p,
         ParagonIE_Sodium_Core_Curve25519_Ge_Precomp $q
-    ) {
+    ): ParagonIE_Sodium_Core_Curve25519_Ge_P1p1 {
         $r = clone $R;
         $r->X = self::fe_add($p->Y, $p->X);
         $r->Y = self::fe_sub($p->Y, $p->X);
@@ -1331,7 +1151,7 @@ abstract class ParagonIE_Sodium_Core_Curve25519 extends ParagonIE_Sodium_Core_Cu
         ParagonIE_Sodium_Core_Curve25519_Ge_P1p1 $R,
         ParagonIE_Sodium_Core_Curve25519_Ge_P3 $p,
         ParagonIE_Sodium_Core_Curve25519_Ge_Precomp $q
-    ) {
+    ): ParagonIE_Sodium_Core_Curve25519_Ge_P1p1 {
         $r = clone $R;
 
         $r->X = self::fe_add($p->Y, $p->X);
@@ -1354,8 +1174,9 @@ abstract class ParagonIE_Sodium_Core_Curve25519 extends ParagonIE_Sodium_Core_Cu
      * @param ParagonIE_Sodium_Core_Curve25519_Ge_P1p1 $p
      * @return ParagonIE_Sodium_Core_Curve25519_Ge_P2
      */
-    public static function ge_p1p1_to_p2(ParagonIE_Sodium_Core_Curve25519_Ge_P1p1 $p)
-    {
+    public static function ge_p1p1_to_p2(
+        ParagonIE_Sodium_Core_Curve25519_Ge_P1p1 $p
+    ): ParagonIE_Sodium_Core_Curve25519_Ge_P2{
         $r = new ParagonIE_Sodium_Core_Curve25519_Ge_P2();
         $r->X = self::fe_mul($p->X, $p->T);
         $r->Y = self::fe_mul($p->Y, $p->Z);
@@ -1369,8 +1190,9 @@ abstract class ParagonIE_Sodium_Core_Curve25519 extends ParagonIE_Sodium_Core_Cu
      * @param ParagonIE_Sodium_Core_Curve25519_Ge_P1p1 $p
      * @return ParagonIE_Sodium_Core_Curve25519_Ge_P3
      */
-    public static function ge_p1p1_to_p3(ParagonIE_Sodium_Core_Curve25519_Ge_P1p1 $p)
-    {
+    public static function ge_p1p1_to_p3(
+        ParagonIE_Sodium_Core_Curve25519_Ge_P1p1 $p
+    ): ParagonIE_Sodium_Core_Curve25519_Ge_P3 {
         $r = new ParagonIE_Sodium_Core_Curve25519_Ge_P3();
         $r->X = self::fe_mul($p->X, $p->T);
         $r->Y = self::fe_mul($p->Y, $p->Z);
@@ -1384,7 +1206,7 @@ abstract class ParagonIE_Sodium_Core_Curve25519 extends ParagonIE_Sodium_Core_Cu
      *
      * @return ParagonIE_Sodium_Core_Curve25519_Ge_P2
      */
-    public static function ge_p2_0()
+    public static function ge_p2_0(): ParagonIE_Sodium_Core_Curve25519_Ge_P2
     {
         return new ParagonIE_Sodium_Core_Curve25519_Ge_P2(
             self::fe_0(),
@@ -1399,8 +1221,9 @@ abstract class ParagonIE_Sodium_Core_Curve25519 extends ParagonIE_Sodium_Core_Cu
      * @param ParagonIE_Sodium_Core_Curve25519_Ge_P2 $p
      * @return ParagonIE_Sodium_Core_Curve25519_Ge_P1p1
      */
-    public static function ge_p2_dbl(ParagonIE_Sodium_Core_Curve25519_Ge_P2 $p)
-    {
+    public static function ge_p2_dbl(
+        ParagonIE_Sodium_Core_Curve25519_Ge_P2 $p
+    ): ParagonIE_Sodium_Core_Curve25519_Ge_P1p1 {
         $r = new ParagonIE_Sodium_Core_Curve25519_Ge_P1p1();
 
         $r->X = self::fe_sq($p->X);
@@ -1421,7 +1244,7 @@ abstract class ParagonIE_Sodium_Core_Curve25519 extends ParagonIE_Sodium_Core_Cu
      *
      * @return ParagonIE_Sodium_Core_Curve25519_Ge_P3
      */
-    public static function ge_p3_0()
+    public static function ge_p3_0(): ParagonIE_Sodium_Core_Curve25519_Ge_P3
     {
         return new ParagonIE_Sodium_Core_Curve25519_Ge_P3(
             self::fe_0(),
@@ -1437,17 +1260,18 @@ abstract class ParagonIE_Sodium_Core_Curve25519 extends ParagonIE_Sodium_Core_Cu
      * @param ParagonIE_Sodium_Core_Curve25519_Ge_P3 $p
      * @return ParagonIE_Sodium_Core_Curve25519_Ge_Cached
      */
-    public static function ge_p3_to_cached(ParagonIE_Sodium_Core_Curve25519_Ge_P3 $p)
-    {
+    public static function ge_p3_to_cached(
+        ParagonIE_Sodium_Core_Curve25519_Ge_P3 $p
+    ): ParagonIE_Sodium_Core_Curve25519_Ge_Cached {
         static $d2 = null;
         if ($d2 === null) {
-            $d2 = ParagonIE_Sodium_Core_Curve25519_Fe::fromArray(self::$d2);
+            $d2 = ParagonIE_Sodium_Core_Curve25519_Fe::fromArray(self::D2);
         }
         /** @var ParagonIE_Sodium_Core_Curve25519_Fe $d2 */
         $r = new ParagonIE_Sodium_Core_Curve25519_Ge_Cached();
         $r->YplusX = self::fe_add($p->Y, $p->X);
         $r->YminusX = self::fe_sub($p->Y, $p->X);
-        $r->Z = self::fe_copy($p->Z);
+        $r->Z = clone $p->Z;
         $r->T2d = self::fe_mul($p->T, $d2);
         return $r;
     }
@@ -1458,12 +1282,13 @@ abstract class ParagonIE_Sodium_Core_Curve25519 extends ParagonIE_Sodium_Core_Cu
      * @param ParagonIE_Sodium_Core_Curve25519_Ge_P3 $p
      * @return ParagonIE_Sodium_Core_Curve25519_Ge_P2
      */
-    public static function ge_p3_to_p2(ParagonIE_Sodium_Core_Curve25519_Ge_P3 $p)
-    {
+    public static function ge_p3_to_p2(
+        ParagonIE_Sodium_Core_Curve25519_Ge_P3 $p
+    ): ParagonIE_Sodium_Core_Curve25519_Ge_P2 {
         return new ParagonIE_Sodium_Core_Curve25519_Ge_P2(
-            self::fe_copy($p->X),
-            self::fe_copy($p->Y),
-            self::fe_copy($p->Z)
+            $p->X,
+            $p->Y,
+            $p->Z
         );
     }
 
@@ -1475,8 +1300,9 @@ abstract class ParagonIE_Sodium_Core_Curve25519 extends ParagonIE_Sodium_Core_Cu
      * @throws SodiumException
      * @throws TypeError
      */
-    public static function ge_p3_tobytes(ParagonIE_Sodium_Core_Curve25519_Ge_P3 $h)
-    {
+    public static function ge_p3_tobytes(
+        ParagonIE_Sodium_Core_Curve25519_Ge_P3 $h
+    ): string {
         $recip = self::fe_invert($h->Z);
         $x = self::fe_mul($h->X, $recip);
         $y = self::fe_mul($h->Y, $recip);
@@ -1493,16 +1319,16 @@ abstract class ParagonIE_Sodium_Core_Curve25519 extends ParagonIE_Sodium_Core_Cu
      * @param ParagonIE_Sodium_Core_Curve25519_Ge_P3 $p
      * @return ParagonIE_Sodium_Core_Curve25519_Ge_P1p1
      */
-    public static function ge_p3_dbl(ParagonIE_Sodium_Core_Curve25519_Ge_P3 $p)
-    {
-        $q = self::ge_p3_to_p2($p);
-        return self::ge_p2_dbl($q);
+    public static function ge_p3_dbl(
+        ParagonIE_Sodium_Core_Curve25519_Ge_P3 $p
+    ): ParagonIE_Sodium_Core_Curve25519_Ge_P1p1 {
+        return self::ge_p2_dbl(self::ge_p3_to_p2($p));
     }
 
     /**
      * @return ParagonIE_Sodium_Core_Curve25519_Ge_Precomp
      */
-    public static function ge_precomp_0()
+    public static function ge_precomp_0(): ParagonIE_Sodium_Core_Curve25519_Ge_Precomp
     {
         return new ParagonIE_Sodium_Core_Curve25519_Ge_Precomp(
             self::fe_1(),
@@ -1518,9 +1344,9 @@ abstract class ParagonIE_Sodium_Core_Curve25519 extends ParagonIE_Sodium_Core_Cu
      * @param int $c
      * @return int
      */
-    public static function equal($b, $c)
+    public static function equal(int $b, int $c): int
     {
-        return (int) ((($b ^ $c) - 1) >> 31) & 1;
+        return ((($b ^ $c) - 1) >> 31) & 1;
     }
 
     /**
@@ -1529,15 +1355,16 @@ abstract class ParagonIE_Sodium_Core_Curve25519 extends ParagonIE_Sodium_Core_Cu
      * @param int|string $char
      * @return int (1 = yes, 0 = no)
      * @throws SodiumException
+     *
      * @throws TypeError
      */
-    public static function negative($char)
+    public static function negative(int|string $char): int
     {
         if (is_int($char)) {
             return ($char >> 63) & 1;
         }
         $x = self::chrToInt(self::substr($char, 0, 1));
-        return (int) ($x >> 63);
+        return ($x >> 63);
     }
 
     /**
@@ -1553,11 +1380,9 @@ abstract class ParagonIE_Sodium_Core_Curve25519 extends ParagonIE_Sodium_Core_Cu
     public static function cmov(
         ParagonIE_Sodium_Core_Curve25519_Ge_Precomp $t,
         ParagonIE_Sodium_Core_Curve25519_Ge_Precomp $u,
-        $b
-    ) {
-        if (!is_int($b)) {
-            throw new InvalidArgumentException('Expected an integer.');
-        }
+        #[SensitiveParameter]
+        int $b
+    ): ParagonIE_Sodium_Core_Curve25519_Ge_Precomp {
         return new ParagonIE_Sodium_Core_Curve25519_Ge_Precomp(
             self::fe_cmov($t->yplusx,  $u->yplusx,  $b),
             self::fe_cmov($t->yminusx, $u->yminusx, $b),
@@ -1574,8 +1399,9 @@ abstract class ParagonIE_Sodium_Core_Curve25519 extends ParagonIE_Sodium_Core_Cu
     public static function ge_cmov_cached(
         ParagonIE_Sodium_Core_Curve25519_Ge_Cached $t,
         ParagonIE_Sodium_Core_Curve25519_Ge_Cached $u,
-        $b
-    ) {
+        #[SensitiveParameter]
+        int $b
+    ): ParagonIE_Sodium_Core_Curve25519_Ge_Cached {
         $b &= 1;
         $ret = new ParagonIE_Sodium_Core_Curve25519_Ge_Cached();
         $ret->YplusX  = self::fe_cmov($t->YplusX,  $u->YplusX,  $b);
@@ -1591,14 +1417,14 @@ abstract class ParagonIE_Sodium_Core_Curve25519 extends ParagonIE_Sodium_Core_Cu
      * @return ParagonIE_Sodium_Core_Curve25519_Ge_Cached
      * @throws SodiumException
      */
-    public static function ge_cmov8_cached(array $cached, $b)
-    {
-        // const unsigned char bnegative = negative(b);
-        // const unsigned char babs      = b - (((-bnegative) & b) * ((signed char) 1 << 1));
-        $bnegative = self::negative($b);
-        $babs = $b - (((-$bnegative) & $b) << 1);
+    public static function ge_cmov8_cached(
+        array $cached,
+        #[SensitiveParameter]
+        int $b
+    ): ParagonIE_Sodium_Core_Curve25519_Ge_Cached {
+        $bNegative = self::negative($b);
+        $babs = $b - (((-$bNegative) & $b) << 1);
 
-        // ge25519_cached_0(t);
         $t = new ParagonIE_Sodium_Core_Curve25519_Ge_Cached(
             self::fe_1(),
             self::fe_1(),
@@ -1606,29 +1432,17 @@ abstract class ParagonIE_Sodium_Core_Curve25519 extends ParagonIE_Sodium_Core_Cu
             self::fe_0()
         );
 
-        // ge25519_cmov_cached(t, &cached[0], equal(babs, 1));
-        // ge25519_cmov_cached(t, &cached[1], equal(babs, 2));
-        // ge25519_cmov_cached(t, &cached[2], equal(babs, 3));
-        // ge25519_cmov_cached(t, &cached[3], equal(babs, 4));
-        // ge25519_cmov_cached(t, &cached[4], equal(babs, 5));
-        // ge25519_cmov_cached(t, &cached[5], equal(babs, 6));
-        // ge25519_cmov_cached(t, &cached[6], equal(babs, 7));
-        // ge25519_cmov_cached(t, &cached[7], equal(babs, 8));
         for ($x = 0; $x < 8; ++$x) {
             $t = self::ge_cmov_cached($t, $cached[$x], self::equal($babs, $x + 1));
         }
 
-        // fe25519_copy(minust.YplusX, t->YminusX);
-        // fe25519_copy(minust.YminusX, t->YplusX);
-        // fe25519_copy(minust.Z, t->Z);
-        // fe25519_neg(minust.T2d, t->T2d);
         $minust = new ParagonIE_Sodium_Core_Curve25519_Ge_Cached(
-            self::fe_copy($t->YminusX),
-            self::fe_copy($t->YplusX),
-            self::fe_copy($t->Z),
+            $t->YminusX,
+            $t->YplusX,
+            $t->Z,
             self::fe_neg($t->T2d)
         );
-        return self::ge_cmov_cached($t, $minust, $bnegative);
+        return self::ge_cmov_cached($t, $minust, $bNegative);
     }
 
     /**
@@ -1639,17 +1453,14 @@ abstract class ParagonIE_Sodium_Core_Curve25519 extends ParagonIE_Sodium_Core_Cu
      * @return ParagonIE_Sodium_Core_Curve25519_Ge_Precomp
      * @throws SodiumException
      * @throws TypeError
-     * @psalm-suppress MixedArgument
-     * @psalm-suppress MixedArrayAccess
-     * @psalm-suppress MixedArrayOffset
      */
-    public static function ge_select($pos = 0, $b = 0)
+    public static function ge_select(int $pos = 0, int $b = 0): ParagonIE_Sodium_Core_Curve25519_Ge_Precomp
     {
         static $base = null;
         if ($base === null) {
             $base = array();
             /** @var int $i */
-            foreach (self::$base as $i => $bas) {
+            foreach (self::BASE as $i => $bas) {
                 for ($j = 0; $j < 8; ++$j) {
                     $base[$i][$j] = new ParagonIE_Sodium_Core_Curve25519_Ge_Precomp(
                         ParagonIE_Sodium_Core_Curve25519_Fe::fromArray($bas[$j][0]),
@@ -1660,9 +1471,6 @@ abstract class ParagonIE_Sodium_Core_Curve25519 extends ParagonIE_Sodium_Core_Cu
             }
         }
         /** @var array<int, array<int, ParagonIE_Sodium_Core_Curve25519_Ge_Precomp>> $base */
-        if (!is_int($pos)) {
-            throw new InvalidArgumentException('Position must be an integer');
-        }
         if ($pos < 0 || $pos > 31) {
             throw new RangeException('Position is out of range [0, 31]');
         }
@@ -1679,8 +1487,8 @@ abstract class ParagonIE_Sodium_Core_Curve25519 extends ParagonIE_Sodium_Core_Cu
             );
         }
         $minusT = new ParagonIE_Sodium_Core_Curve25519_Ge_Precomp(
-            self::fe_copy($t->yminusx),
-            self::fe_copy($t->yplusx),
+            $t->yminusx,
+            $t->yplusx,
             self::fe_neg($t->xy2d)
         );
         return self::cmov($t, $minusT, $bnegative);
@@ -1700,7 +1508,7 @@ abstract class ParagonIE_Sodium_Core_Curve25519 extends ParagonIE_Sodium_Core_Cu
     public static function ge_sub(
         ParagonIE_Sodium_Core_Curve25519_Ge_P3 $p,
         ParagonIE_Sodium_Core_Curve25519_Ge_Cached $q
-    ) {
+    ): ParagonIE_Sodium_Core_Curve25519_Ge_P1p1 {
         $r = new ParagonIE_Sodium_Core_Curve25519_Ge_P1p1();
 
         $r->X = self::fe_add($p->Y, $p->X);
@@ -1726,7 +1534,7 @@ abstract class ParagonIE_Sodium_Core_Curve25519 extends ParagonIE_Sodium_Core_Cu
      * @throws SodiumException
      * @throws TypeError
      */
-    public static function ge_tobytes(ParagonIE_Sodium_Core_Curve25519_Ge_P2 $h)
+    public static function ge_tobytes(ParagonIE_Sodium_Core_Curve25519_Ge_P2 $h): string
     {
         $recip = self::fe_invert($h->Z);
         $x = self::fe_mul($h->X, $recip);
@@ -1747,14 +1555,12 @@ abstract class ParagonIE_Sodium_Core_Curve25519 extends ParagonIE_Sodium_Core_Cu
      * @return ParagonIE_Sodium_Core_Curve25519_Ge_P2
      * @throws SodiumException
      * @throws TypeError
-     * @psalm-suppress MixedArgument
-     * @psalm-suppress MixedArrayAccess
      */
     public static function ge_double_scalarmult_vartime(
-        $a,
+        string $a,
         ParagonIE_Sodium_Core_Curve25519_Ge_P3 $A,
-        $b
-    ) {
+        string $b
+    ): ParagonIE_Sodium_Core_Curve25519_Ge_P2 {
         /** @var array<int, ParagonIE_Sodium_Core_Curve25519_Ge_Cached> $Ai */
         $Ai = array();
 
@@ -1763,9 +1569,9 @@ abstract class ParagonIE_Sodium_Core_Curve25519 extends ParagonIE_Sodium_Core_Cu
         if (!$Bi) {
             for ($i = 0; $i < 8; ++$i) {
                 $Bi[$i] = new ParagonIE_Sodium_Core_Curve25519_Ge_Precomp(
-                    ParagonIE_Sodium_Core_Curve25519_Fe::fromArray(self::$base2[$i][0]),
-                    ParagonIE_Sodium_Core_Curve25519_Fe::fromArray(self::$base2[$i][1]),
-                    ParagonIE_Sodium_Core_Curve25519_Fe::fromArray(self::$base2[$i][2])
+                    ParagonIE_Sodium_Core_Curve25519_Fe::fromArray(self::BASE2[$i][0]),
+                    ParagonIE_Sodium_Core_Curve25519_Fe::fromArray(self::BASE2[$i][1]),
+                    ParagonIE_Sodium_Core_Curve25519_Fe::fromArray(self::BASE2[$i][2])
                 );
             }
         }
@@ -1778,38 +1584,21 @@ abstract class ParagonIE_Sodium_Core_Curve25519 extends ParagonIE_Sodium_Core_Cu
             );
         }
 
-        # slide(aslide,a);
-        # slide(bslide,b);
         /** @var array<int, int> $aslide */
         $aslide = self::slide($a);
         /** @var array<int, int> $bslide */
         $bslide = self::slide($b);
 
-        # ge_p3_to_cached(&Ai[0],A);
-        # ge_p3_dbl(&t,A); ge_p1p1_to_p3(&A2,&t);
         $Ai[0] = self::ge_p3_to_cached($A);
         $t = self::ge_p3_dbl($A);
         $A2 = self::ge_p1p1_to_p3($t);
 
-        # ge_add(&t,&A2,&Ai[0]); ge_p1p1_to_p3(&u,&t); ge_p3_to_cached(&Ai[1],&u);
-        # ge_add(&t,&A2,&Ai[1]); ge_p1p1_to_p3(&u,&t); ge_p3_to_cached(&Ai[2],&u);
-        # ge_add(&t,&A2,&Ai[2]); ge_p1p1_to_p3(&u,&t); ge_p3_to_cached(&Ai[3],&u);
-        # ge_add(&t,&A2,&Ai[3]); ge_p1p1_to_p3(&u,&t); ge_p3_to_cached(&Ai[4],&u);
-        # ge_add(&t,&A2,&Ai[4]); ge_p1p1_to_p3(&u,&t); ge_p3_to_cached(&Ai[5],&u);
-        # ge_add(&t,&A2,&Ai[5]); ge_p1p1_to_p3(&u,&t); ge_p3_to_cached(&Ai[6],&u);
-        # ge_add(&t,&A2,&Ai[6]); ge_p1p1_to_p3(&u,&t); ge_p3_to_cached(&Ai[7],&u);
         for ($i = 0; $i < 7; ++$i) {
             $t = self::ge_add($A2, $Ai[$i]);
             $u = self::ge_p1p1_to_p3($t);
             $Ai[$i + 1] = self::ge_p3_to_cached($u);
         }
-
-        # ge_p2_0(r);
         $r = self::ge_p2_0();
-
-        # for (i = 255;i >= 0;--i) {
-        #     if (aslide[i] || bslide[i]) break;
-        # }
         $i = 255;
         for (; $i >= 0; --$i) {
             if ($aslide[$i] || $bslide[$i]) {
@@ -1817,24 +1606,16 @@ abstract class ParagonIE_Sodium_Core_Curve25519 extends ParagonIE_Sodium_Core_Cu
             }
         }
 
-        # for (;i >= 0;--i) {
         for (; $i >= 0; --$i) {
-            # ge_p2_dbl(&t,r);
             $t = self::ge_p2_dbl($r);
 
-            # if (aslide[i] > 0) {
             if ($aslide[$i] > 0) {
-                # ge_p1p1_to_p3(&u,&t);
-                # ge_add(&t,&u,&Ai[aslide[i]/2]);
                 $u = self::ge_p1p1_to_p3($t);
                 $t = self::ge_add(
                     $u,
                     $Ai[(int) floor($aslide[$i] / 2)]
                 );
-            # } else if (aslide[i] < 0) {
             } elseif ($aslide[$i] < 0) {
-                # ge_p1p1_to_p3(&u,&t);
-                # ge_sub(&t,&u,&Ai[(-aslide[i])/2]);
                 $u = self::ge_p1p1_to_p3($t);
                 $t = self::ge_sub(
                     $u,
@@ -1842,24 +1623,16 @@ abstract class ParagonIE_Sodium_Core_Curve25519 extends ParagonIE_Sodium_Core_Cu
                 );
             }
 
-            # if (bslide[i] > 0) {
             if ($bslide[$i] > 0) {
-                /** @var int $index */
                 $index = (int) floor($bslide[$i] / 2);
-                # ge_p1p1_to_p3(&u,&t);
-                # ge_madd(&t,&u,&Bi[bslide[i]/2]);
                 $u = self::ge_p1p1_to_p3($t);
                 $t = self::ge_madd($t, $u, $Bi[$index]);
             # } else if (bslide[i] < 0) {
             } elseif ($bslide[$i] < 0) {
-                /** @var int $index */
                 $index = (int) floor(-$bslide[$i] / 2);
-                # ge_p1p1_to_p3(&u,&t);
-                # ge_msub(&t,&u,&Bi[(-bslide[i])/2]);
                 $u = self::ge_p1p1_to_p3($t);
                 $t = self::ge_msub($t, $u, $Bi[$index]);
             }
-            # ge_p1p1_to_p2(r,&t);
             $r = self::ge_p1p1_to_p2($t);
         }
         return $r;
@@ -1873,87 +1646,53 @@ abstract class ParagonIE_Sodium_Core_Curve25519 extends ParagonIE_Sodium_Core_Cu
      * @return ParagonIE_Sodium_Core_Curve25519_Ge_P3
      * @throws SodiumException
      * @throws TypeError
-     * @psalm-suppress MixedAssignment
-     * @psalm-suppress MixedOperand
      */
-    public static function ge_scalarmult($a, $p)
-    {
+    public static function ge_scalarmult(
+        #[SensitiveParameter]
+        string $a,
+        ParagonIE_Sodium_Core_Curve25519_Ge_P3 $p
+    ): ParagonIE_Sodium_Core_Curve25519_Ge_P3 {
         $e = array_fill(0, 64, 0);
 
         /** @var ParagonIE_Sodium_Core_Curve25519_Ge_Cached[] $pi */
         $pi = array();
 
-        //        ge25519_p3_to_cached(&pi[1 - 1], p);   /* p */
         $pi[0] = self::ge_p3_to_cached($p);
 
-        //        ge25519_p3_dbl(&t2, p);
-        //        ge25519_p1p1_to_p3(&p2, &t2);
-        //        ge25519_p3_to_cached(&pi[2 - 1], &p2); /* 2p = 2*p */
         $t2 = self::ge_p3_dbl($p);
         $p2 = self::ge_p1p1_to_p3($t2);
         $pi[1] = self::ge_p3_to_cached($p2);
 
-        //        ge25519_add_cached(&t3, p, &pi[2 - 1]);
-        //        ge25519_p1p1_to_p3(&p3, &t3);
-        //        ge25519_p3_to_cached(&pi[3 - 1], &p3); /* 3p = 2p+p */
         $t3 = self::ge_add($p, $pi[1]);
         $p3 = self::ge_p1p1_to_p3($t3);
         $pi[2] = self::ge_p3_to_cached($p3);
 
-        //        ge25519_p3_dbl(&t4, &p2);
-        //        ge25519_p1p1_to_p3(&p4, &t4);
-        //        ge25519_p3_to_cached(&pi[4 - 1], &p4); /* 4p = 2*2p */
         $t4 = self::ge_p3_dbl($p2);
         $p4 = self::ge_p1p1_to_p3($t4);
         $pi[3] = self::ge_p3_to_cached($p4);
 
-        //        ge25519_add_cached(&t5, p, &pi[4 - 1]);
-        //        ge25519_p1p1_to_p3(&p5, &t5);
-        //        ge25519_p3_to_cached(&pi[5 - 1], &p5); /* 5p = 4p+p */
         $t5 = self::ge_add($p, $pi[3]);
         $p5 = self::ge_p1p1_to_p3($t5);
         $pi[4] = self::ge_p3_to_cached($p5);
 
-        //        ge25519_p3_dbl(&t6, &p3);
-        //        ge25519_p1p1_to_p3(&p6, &t6);
-        //        ge25519_p3_to_cached(&pi[6 - 1], &p6); /* 6p = 2*3p */
         $t6 = self::ge_p3_dbl($p3);
         $p6 = self::ge_p1p1_to_p3($t6);
         $pi[5] = self::ge_p3_to_cached($p6);
 
-        //        ge25519_add_cached(&t7, p, &pi[6 - 1]);
-        //        ge25519_p1p1_to_p3(&p7, &t7);
-        //        ge25519_p3_to_cached(&pi[7 - 1], &p7); /* 7p = 6p+p */
         $t7 = self::ge_add($p, $pi[5]);
         $p7 = self::ge_p1p1_to_p3($t7);
         $pi[6] = self::ge_p3_to_cached($p7);
 
-        //        ge25519_p3_dbl(&t8, &p4);
-        //        ge25519_p1p1_to_p3(&p8, &t8);
-        //        ge25519_p3_to_cached(&pi[8 - 1], &p8); /* 8p = 2*4p */
         $t8 = self::ge_p3_dbl($p4);
         $p8 = self::ge_p1p1_to_p3($t8);
         $pi[7] = self::ge_p3_to_cached($p8);
 
-
-        //        for (i = 0; i < 32; ++i) {
-        //            e[2 * i + 0] = (a[i] >> 0) & 15;
-        //            e[2 * i + 1] = (a[i] >> 4) & 15;
-        //        }
         for ($i = 0; $i < 32; ++$i) {
             $e[($i << 1)    ] =  self::chrToInt($a[$i]) & 15;
             $e[($i << 1) + 1] = (self::chrToInt($a[$i]) >> 4) & 15;
         }
         //        /* each e[i] is between 0 and 15 */
         //        /* e[63] is between 0 and 7 */
-
-        //        carry = 0;
-        //        for (i = 0; i < 63; ++i) {
-        //            e[i] += carry;
-        //            carry = e[i] + 8;
-        //            carry >>= 4;
-        //            e[i] -= carry * ((signed char) 1 << 4);
-        //        }
         $carry = 0;
         for ($i = 0; $i < 63; ++$i) {
             $e[$i] += $carry;
@@ -1961,28 +1700,14 @@ abstract class ParagonIE_Sodium_Core_Curve25519 extends ParagonIE_Sodium_Core_Cu
             $carry >>= 4;
             $e[$i] -= $carry << 4;
         }
-        //        e[63] += carry;
-        //        /* each e[i] is between -8 and 8 */
         $e[63] += $carry;
 
-        //        ge25519_p3_0(h);
         $h = self::ge_p3_0();
 
-        //        for (i = 63; i != 0; i--) {
         for ($i = 63; $i != 0; --$i) {
-            // ge25519_cmov8_cached(&t, pi, e[i]);
             $t = self::ge_cmov8_cached($pi, $e[$i]);
-            // ge25519_add_cached(&r, h, &t);
             $r = self::ge_add($h, $t);
 
-            // ge25519_p1p1_to_p2(&s, &r);
-            // ge25519_p2_dbl(&r, &s);
-            // ge25519_p1p1_to_p2(&s, &r);
-            // ge25519_p2_dbl(&r, &s);
-            // ge25519_p1p1_to_p2(&s, &r);
-            // ge25519_p2_dbl(&r, &s);
-            // ge25519_p1p1_to_p2(&s, &r);
-            // ge25519_p2_dbl(&r, &s);
             $s = self::ge_p1p1_to_p2($r);
             $r = self::ge_p2_dbl($s);
             $s = self::ge_p1p1_to_p2($r);
@@ -1992,13 +1717,9 @@ abstract class ParagonIE_Sodium_Core_Curve25519 extends ParagonIE_Sodium_Core_Cu
             $s = self::ge_p1p1_to_p2($r);
             $r = self::ge_p2_dbl($s);
 
-            // ge25519_p1p1_to_p3(h, &r);  /* *16 */
             $h = self::ge_p1p1_to_p3($r); /* *16 */
         }
 
-        //        ge25519_cmov8_cached(&t, pi, e[i]);
-        //        ge25519_add_cached(&r, h, &t);
-        //        ge25519_p1p1_to_p3(h, &r);
         $t = self::ge_cmov8_cached($pi, $e[0]);
         $r = self::ge_add($h, $t);
         return self::ge_p1p1_to_p3($r);
@@ -2011,19 +1732,19 @@ abstract class ParagonIE_Sodium_Core_Curve25519 extends ParagonIE_Sodium_Core_Cu
      * @return ParagonIE_Sodium_Core_Curve25519_Ge_P3
      * @throws SodiumException
      * @throws TypeError
-     * @psalm-suppress MixedAssignment
-     * @psalm-suppress MixedOperand
      */
-    public static function ge_scalarmult_base($a)
-    {
+    public static function ge_scalarmult_base(
+        #[SensitiveParameter]
+        string $a
+    ): ParagonIE_Sodium_Core_Curve25519_Ge_P3 {
         /** @var array<int, int> $e */
         $e = array();
         $r = new ParagonIE_Sodium_Core_Curve25519_Ge_P1p1();
 
         for ($i = 0; $i < 32; ++$i) {
-            $dbl = (int) $i << 1;
-            $e[$dbl] = (int) self::chrToInt($a[$i]) & 15;
-            $e[$dbl + 1] = (int) (self::chrToInt($a[$i]) >> 4) & 15;
+            $dbl = $i << 1;
+            $e[$dbl] = self::chrToInt($a[$i]) & 15;
+            $e[$dbl + 1] = (self::chrToInt($a[$i]) >> 4) & 15;
         }
 
         $carry = 0;
@@ -2033,7 +1754,7 @@ abstract class ParagonIE_Sodium_Core_Curve25519 extends ParagonIE_Sodium_Core_Cu
             $carry >>= 4;
             $e[$i] -= $carry << 4;
         }
-        $e[63] += (int) $carry;
+        $e[63] += $carry;
 
         $h = self::ge_p3_0();
 
@@ -2074,8 +1795,14 @@ abstract class ParagonIE_Sodium_Core_Curve25519 extends ParagonIE_Sodium_Core_Cu
      * @return string
      * @throws TypeError
      */
-    public static function sc_muladd($a, $b, $c)
-    {
+    public static function sc_muladd(
+        #[SensitiveParameter]
+        string $a,
+        #[SensitiveParameter]
+        string $b,
+        #[SensitiveParameter]
+        string $c
+    ): string {
         $a0 = 2097151 & self::load_3(self::substr($a, 0, 3));
         $a1 = 2097151 & (self::load_4(self::substr($a, 2, 4)) >> 5);
         $a2 = 2097151 & (self::load_3(self::substr($a, 5, 3)) >> 2);
@@ -2478,44 +2205,40 @@ abstract class ParagonIE_Sodium_Core_Curve25519 extends ParagonIE_Sodium_Core_Cu
         $s11 += $carry10;
         $s10 -= $carry10 << 21;
 
-        /**
-         * @var array<int, int>
-         */
-        $arr = array(
-            (int) (0xff & ($s0 >> 0)),
-            (int) (0xff & ($s0 >> 8)),
-            (int) (0xff & (($s0 >> 16) | $s1 << 5)),
-            (int) (0xff & ($s1 >> 3)),
-            (int) (0xff & ($s1 >> 11)),
-            (int) (0xff & (($s1 >> 19) | $s2 << 2)),
-            (int) (0xff & ($s2 >> 6)),
-            (int) (0xff & (($s2 >> 14) | $s3 << 7)),
-            (int) (0xff & ($s3 >> 1)),
-            (int) (0xff & ($s3 >> 9)),
-            (int) (0xff & (($s3 >> 17) | $s4 << 4)),
-            (int) (0xff & ($s4 >> 4)),
-            (int) (0xff & ($s4 >> 12)),
-            (int) (0xff & (($s4 >> 20) | $s5 << 1)),
-            (int) (0xff & ($s5 >> 7)),
-            (int) (0xff & (($s5 >> 15) | $s6 << 6)),
-            (int) (0xff & ($s6 >> 2)),
-            (int) (0xff & ($s6 >> 10)),
-            (int) (0xff & (($s6 >> 18) | $s7 << 3)),
-            (int) (0xff & ($s7 >> 5)),
-            (int) (0xff & ($s7 >> 13)),
-            (int) (0xff & ($s8 >> 0)),
-            (int) (0xff & ($s8 >> 8)),
-            (int) (0xff & (($s8 >> 16) | $s9 << 5)),
-            (int) (0xff & ($s9 >> 3)),
-            (int) (0xff & ($s9 >> 11)),
-            (int) (0xff & (($s9 >> 19) | $s10 << 2)),
-            (int) (0xff & ($s10 >> 6)),
-            (int) (0xff & (($s10 >> 14) | $s11 << 7)),
-            (int) (0xff & ($s11 >> 1)),
-            (int) (0xff & ($s11 >> 9)),
+        return self::intArrayToString([
+            (0xff & ($s0 >> 0)),
+            (0xff & ($s0 >> 8)),
+            (0xff & (($s0 >> 16) | $s1 << 5)),
+            (0xff & ($s1 >> 3)),
+            (0xff & ($s1 >> 11)),
+            (0xff & (($s1 >> 19) | $s2 << 2)),
+            (0xff & ($s2 >> 6)),
+            (0xff & (($s2 >> 14) | $s3 << 7)),
+            (0xff & ($s3 >> 1)),
+            (0xff & ($s3 >> 9)),
+            (0xff & (($s3 >> 17) | $s4 << 4)),
+            (0xff & ($s4 >> 4)),
+            (0xff & ($s4 >> 12)),
+            (0xff & (($s4 >> 20) | $s5 << 1)),
+            (0xff & ($s5 >> 7)),
+            (0xff & (($s5 >> 15) | $s6 << 6)),
+            (0xff & ($s6 >> 2)),
+            (0xff & ($s6 >> 10)),
+            (0xff & (($s6 >> 18) | $s7 << 3)),
+            (0xff & ($s7 >> 5)),
+            (0xff & ($s7 >> 13)),
+            (0xff & ($s8 >> 0)),
+            (0xff & ($s8 >> 8)),
+            (0xff & (($s8 >> 16) | $s9 << 5)),
+            (0xff & ($s9 >> 3)),
+            (0xff & ($s9 >> 11)),
+            (0xff & (($s9 >> 19) | $s10 << 2)),
+            (0xff & ($s10 >> 6)),
+            (0xff & (($s10 >> 14) | $s11 << 7)),
+            (0xff & ($s11 >> 1)),
+            (0xff & ($s11 >> 9)),
             0xff & ($s11 >> 17)
-        );
-        return self::intArrayToString($arr);
+        ]);
     }
 
     /**
@@ -2525,8 +2248,10 @@ abstract class ParagonIE_Sodium_Core_Curve25519 extends ParagonIE_Sodium_Core_Cu
      * @return string
      * @throws TypeError
      */
-    public static function sc_reduce($s)
-    {
+    public static function sc_reduce(
+        #[SensitiveParameter]
+        string $s
+    ): string {
         $s0 = 2097151 & self::load_3(self::substr($s, 0, 3));
         $s1 = 2097151 & (self::load_4(self::substr($s, 2, 4)) >> 5);
         $s2 = 2097151 & (self::load_3(self::substr($s, 5, 3)) >> 2);
@@ -2796,44 +2521,40 @@ abstract class ParagonIE_Sodium_Core_Curve25519 extends ParagonIE_Sodium_Core_Cu
         $s11 += $carry10;
         $s10 -= $carry10 << 21;
 
-        /**
-         * @var array<int, int>
-         */
-        $arr = array(
-            (int) ($s0 >> 0),
-            (int) ($s0 >> 8),
-            (int) (($s0 >> 16) | $s1 << 5),
-            (int) ($s1 >> 3),
-            (int) ($s1 >> 11),
-            (int) (($s1 >> 19) | $s2 << 2),
-            (int) ($s2 >> 6),
-            (int) (($s2 >> 14) | $s3 << 7),
-            (int) ($s3 >> 1),
-            (int) ($s3 >> 9),
-            (int) (($s3 >> 17) | $s4 << 4),
-            (int) ($s4 >> 4),
-            (int) ($s4 >> 12),
-            (int) (($s4 >> 20) | $s5 << 1),
-            (int) ($s5 >> 7),
-            (int) (($s5 >> 15) | $s6 << 6),
-            (int) ($s6 >> 2),
-            (int) ($s6 >> 10),
-            (int) (($s6 >> 18) | $s7 << 3),
-            (int) ($s7 >> 5),
-            (int) ($s7 >> 13),
-            (int) ($s8 >> 0),
-            (int) ($s8 >> 8),
-            (int) (($s8 >> 16) | $s9 << 5),
-            (int) ($s9 >> 3),
-            (int) ($s9 >> 11),
-            (int) (($s9 >> 19) | $s10 << 2),
-            (int) ($s10 >> 6),
-            (int) (($s10 >> 14) | $s11 << 7),
-            (int) ($s11 >> 1),
-            (int) ($s11 >> 9),
-            (int) $s11 >> 17
-        );
-        return self::intArrayToString($arr);
+        return self::intArrayToString([
+            ($s0 >> 0),
+            ($s0 >> 8),
+            (($s0 >> 16) | $s1 << 5),
+            ($s1 >> 3),
+            ($s1 >> 11),
+            (($s1 >> 19) | $s2 << 2),
+            ($s2 >> 6),
+            (($s2 >> 14) | $s3 << 7),
+            ($s3 >> 1),
+            ($s3 >> 9),
+            (($s3 >> 17) | $s4 << 4),
+            ($s4 >> 4),
+            ($s4 >> 12),
+            (($s4 >> 20) | $s5 << 1),
+            ($s5 >> 7),
+            (($s5 >> 15) | $s6 << 6),
+            ($s6 >> 2),
+            ($s6 >> 10),
+            (($s6 >> 18) | $s7 << 3),
+            ($s7 >> 5),
+            ($s7 >> 13),
+            ($s8 >> 0),
+            ($s8 >> 8),
+            (($s8 >> 16) | $s9 << 5),
+            ($s9 >> 3),
+            ($s9 >> 11),
+            (($s9 >> 19) | $s10 << 2),
+            ($s10 >> 6),
+            (($s10 >> 14) | $s11 << 7),
+            ($s11 >> 1),
+            ($s11 >> 9),
+            $s11 >> 17
+        ]);
     }
 
     /**
@@ -2842,8 +2563,9 @@ abstract class ParagonIE_Sodium_Core_Curve25519 extends ParagonIE_Sodium_Core_Cu
      * @param ParagonIE_Sodium_Core_Curve25519_Ge_P3 $A
      * @return ParagonIE_Sodium_Core_Curve25519_Ge_P3
      */
-    public static function ge_mul_l(ParagonIE_Sodium_Core_Curve25519_Ge_P3 $A)
-    {
+    public static function ge_mul_l(
+        ParagonIE_Sodium_Core_Curve25519_Ge_P3 $A
+    ): ParagonIE_Sodium_Core_Curve25519_Ge_P3 {
         $aslide = array(
             13, 0, 0, 0, 0, -1, 0, 0, 0, 0, -11, 0, 0, 0, 0, 0, 0, -5, 0, 0, 0,
             0, 0, 0, -3, 0, 0, 0, 0, -13, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 3, 0,
@@ -2862,19 +2584,13 @@ abstract class ParagonIE_Sodium_Core_Curve25519 extends ParagonIE_Sodium_Core_Cu
         /** @var array<int, ParagonIE_Sodium_Core_Curve25519_Ge_Cached> $Ai size 8 */
         $Ai = array();
 
-        # ge_p3_to_cached(&Ai[0], A);
         $Ai[0] = self::ge_p3_to_cached($A);
-        # ge_p3_dbl(&t, A);
         $t = self::ge_p3_dbl($A);
-        # ge_p1p1_to_p3(&A2, &t);
         $A2 = self::ge_p1p1_to_p3($t);
 
         for ($i = 1; $i < 8; ++$i) {
-            # ge_add(&t, &A2, &Ai[0]);
             $t = self::ge_add($A2, $Ai[$i - 1]);
-            # ge_p1p1_to_p3(&u, &t);
             $u = self::ge_p1p1_to_p3($t);
-            # ge_p3_to_cached(&Ai[i], &u);
             $Ai[$i] = self::ge_p3_to_cached($u);
         }
 
@@ -2882,19 +2598,14 @@ abstract class ParagonIE_Sodium_Core_Curve25519 extends ParagonIE_Sodium_Core_Cu
         for ($i = 252; $i >= 0; --$i) {
             $t = self::ge_p3_dbl($r);
             if ($aslide[$i] > 0) {
-                # ge_p1p1_to_p3(&u, &t);
                 $u = self::ge_p1p1_to_p3($t);
-                # ge_add(&t, &u, &Ai[aslide[i] / 2]);
                 $t = self::ge_add($u, $Ai[(int)($aslide[$i] / 2)]);
             } elseif ($aslide[$i] < 0) {
-                # ge_p1p1_to_p3(&u, &t);
                 $u = self::ge_p1p1_to_p3($t);
-                # ge_sub(&t, &u, &Ai[(-aslide[i]) / 2]);
                 $t = self::ge_sub($u, $Ai[(int)(-$aslide[$i] / 2)]);
             }
         }
 
-        # ge_p1p1_to_p3(r, &t);
         return self::ge_p1p1_to_p3($t);
     }
 
@@ -2903,20 +2614,12 @@ abstract class ParagonIE_Sodium_Core_Curve25519 extends ParagonIE_Sodium_Core_Cu
      * @param string $b
      * @return string
      */
-    public static function sc25519_mul($a, $b)
-    {
-        //    int64_t a0  = 2097151 & load_3(a);
-        //    int64_t a1  = 2097151 & (load_4(a + 2) >> 5);
-        //    int64_t a2  = 2097151 & (load_3(a + 5) >> 2);
-        //    int64_t a3  = 2097151 & (load_4(a + 7) >> 7);
-        //    int64_t a4  = 2097151 & (load_4(a + 10) >> 4);
-        //    int64_t a5  = 2097151 & (load_3(a + 13) >> 1);
-        //    int64_t a6  = 2097151 & (load_4(a + 15) >> 6);
-        //    int64_t a7  = 2097151 & (load_3(a + 18) >> 3);
-        //    int64_t a8  = 2097151 & load_3(a + 21);
-        //    int64_t a9  = 2097151 & (load_4(a + 23) >> 5);
-        //    int64_t a10 = 2097151 & (load_3(a + 26) >> 2);
-        //    int64_t a11 = (load_4(a + 28) >> 7);
+    public static function sc25519_mul(
+        #[SensitiveParameter]
+        string $a,
+        #[SensitiveParameter]
+        string $b
+    ): string {
         $a0  = 2097151 &  self::load_3(self::substr($a, 0, 3));
         $a1  = 2097151 & (self::load_4(self::substr($a, 2, 4)) >> 5);
         $a2  = 2097151 & (self::load_3(self::substr($a, 5, 3)) >> 2);
@@ -2930,18 +2633,6 @@ abstract class ParagonIE_Sodium_Core_Curve25519 extends ParagonIE_Sodium_Core_Cu
         $a10 = 2097151 & (self::load_3(self::substr($a, 26, 3)) >> 2);
         $a11 = (self::load_4(self::substr($a, 28, 4)) >> 7);
 
-        //    int64_t b0  = 2097151 & load_3(b);
-        //    int64_t b1  = 2097151 & (load_4(b + 2) >> 5);
-        //    int64_t b2  = 2097151 & (load_3(b + 5) >> 2);
-        //    int64_t b3  = 2097151 & (load_4(b + 7) >> 7);
-        //    int64_t b4  = 2097151 & (load_4(b + 10) >> 4);
-        //    int64_t b5  = 2097151 & (load_3(b + 13) >> 1);
-        //    int64_t b6  = 2097151 & (load_4(b + 15) >> 6);
-        //    int64_t b7  = 2097151 & (load_3(b + 18) >> 3);
-        //    int64_t b8  = 2097151 & load_3(b + 21);
-        //    int64_t b9  = 2097151 & (load_4(b + 23) >> 5);
-        //    int64_t b10 = 2097151 & (load_3(b + 26) >> 2);
-        //    int64_t b11 = (load_4(b + 28) >> 7);
         $b0  = 2097151 &  self::load_3(self::substr($b, 0, 3));
         $b1  = 2097151 & (self::load_4(self::substr($b, 2, 4)) >> 5);
         $b2  = 2097151 & (self::load_3(self::substr($b, 5, 3)) >> 2);
@@ -2955,40 +2646,6 @@ abstract class ParagonIE_Sodium_Core_Curve25519 extends ParagonIE_Sodium_Core_Cu
         $b10 = 2097151 & (self::load_3(self::substr($b, 26, 3)) >> 2);
         $b11 = (self::load_4(self::substr($b, 28, 4)) >> 7);
 
-        //    s0 = a0 * b0;
-        //    s1 = a0 * b1 + a1 * b0;
-        //    s2 = a0 * b2 + a1 * b1 + a2 * b0;
-        //    s3 = a0 * b3 + a1 * b2 + a2 * b1 + a3 * b0;
-        //    s4 = a0 * b4 + a1 * b3 + a2 * b2 + a3 * b1 + a4 * b0;
-        //    s5 = a0 * b5 + a1 * b4 + a2 * b3 + a3 * b2 + a4 * b1 + a5 * b0;
-        //    s6 = a0 * b6 + a1 * b5 + a2 * b4 + a3 * b3 + a4 * b2 + a5 * b1 + a6 * b0;
-        //    s7 = a0 * b7 + a1 * b6 + a2 * b5 + a3 * b4 + a4 * b3 + a5 * b2 +
-        //        a6 * b1 + a7 * b0;
-        //    s8 = a0 * b8 + a1 * b7 + a2 * b6 + a3 * b5 + a4 * b4 + a5 * b3 +
-        //        a6 * b2 + a7 * b1 + a8 * b0;
-        //    s9 = a0 * b9 + a1 * b8 + a2 * b7 + a3 * b6 + a4 * b5 + a5 * b4 +
-        //        a6 * b3 + a7 * b2 + a8 * b1 + a9 * b0;
-        //    s10 = a0 * b10 + a1 * b9 + a2 * b8 + a3 * b7 + a4 * b6 + a5 * b5 +
-        //        a6 * b4 + a7 * b3 + a8 * b2 + a9 * b1 + a10 * b0;
-        //    s11 = a0 * b11 + a1 * b10 + a2 * b9 + a3 * b8 + a4 * b7 + a5 * b6 +
-        //        a6 * b5 + a7 * b4 + a8 * b3 + a9 * b2 + a10 * b1 + a11 * b0;
-        //    s12 = a1 * b11 + a2 * b10 + a3 * b9 + a4 * b8 + a5 * b7 + a6 * b6 +
-        //        a7 * b5 + a8 * b4 + a9 * b3 + a10 * b2 + a11 * b1;
-        //    s13 = a2 * b11 + a3 * b10 + a4 * b9 + a5 * b8 + a6 * b7 + a7 * b6 +
-        //        a8 * b5 + a9 * b4 + a10 * b3 + a11 * b2;
-        //    s14 = a3 * b11 + a4 * b10 + a5 * b9 + a6 * b8 + a7 * b7 + a8 * b6 +
-        //        a9 * b5 + a10 * b4 + a11 * b3;
-        //    s15 = a4 * b11 + a5 * b10 + a6 * b9 + a7 * b8 + a8 * b7 + a9 * b6 +
-        //        a10 * b5 + a11 * b4;
-        //    s16 =
-        //        a5 * b11 + a6 * b10 + a7 * b9 + a8 * b8 + a9 * b7 + a10 * b6 + a11 * b5;
-        //    s17 = a6 * b11 + a7 * b10 + a8 * b9 + a9 * b8 + a10 * b7 + a11 * b6;
-        //    s18 = a7 * b11 + a8 * b10 + a9 * b9 + a10 * b8 + a11 * b7;
-        //    s19 = a8 * b11 + a9 * b10 + a10 * b9 + a11 * b8;
-        //    s20 = a9 * b11 + a10 * b10 + a11 * b9;
-        //    s21 = a10 * b11 + a11 * b10;
-        //    s22 = a11 * b11;
-        //    s23 = 0;
         $s0 = self::mul($a0, $b0, 22);
         $s1 = self::mul($a0, $b1, 22) + self::mul($a1, $b0, 22);
         $s2 = self::mul($a0, $b2, 22) + self::mul($a1, $b1, 22) + self::mul($a2, $b0, 22);
@@ -3038,152 +2695,77 @@ abstract class ParagonIE_Sodium_Core_Curve25519 extends ParagonIE_Sodium_Core_Cu
         $s22 = self::mul($a11, $b11, 22);
         $s23 = 0;
 
-        //    carry0 = (s0 + (int64_t) (1L << 20)) >> 21;
-        //    s1 += carry0;
-        //    s0 -= carry0 * ((uint64_t) 1L << 21);
         $carry0 = ($s0 + (1 << 20)) >> 21;
         $s1 += $carry0;
         $s0 -= $carry0 << 21;
-        //    carry2 = (s2 + (int64_t) (1L << 20)) >> 21;
-        //    s3 += carry2;
-        //    s2 -= carry2 * ((uint64_t) 1L << 21);
         $carry2 = ($s2 + (1 << 20)) >> 21;
         $s3 += $carry2;
         $s2 -= $carry2 << 21;
-        //    carry4 = (s4 + (int64_t) (1L << 20)) >> 21;
-        //    s5 += carry4;
-        //    s4 -= carry4 * ((uint64_t) 1L << 21);
         $carry4 = ($s4 + (1 << 20)) >> 21;
         $s5 += $carry4;
         $s4 -= $carry4 << 21;
-        //    carry6 = (s6 + (int64_t) (1L << 20)) >> 21;
-        //    s7 += carry6;
-        //    s6 -= carry6 * ((uint64_t) 1L << 21);
         $carry6 = ($s6 + (1 << 20)) >> 21;
         $s7 += $carry6;
         $s6 -= $carry6 << 21;
-        //    carry8 = (s8 + (int64_t) (1L << 20)) >> 21;
-        //    s9 += carry8;
-        //    s8 -= carry8 * ((uint64_t) 1L << 21);
         $carry8 = ($s8 + (1 << 20)) >> 21;
         $s9 += $carry8;
         $s8 -= $carry8 << 21;
-        //    carry10 = (s10 + (int64_t) (1L << 20)) >> 21;
-        //    s11 += carry10;
-        //    s10 -= carry10 * ((uint64_t) 1L << 21);
         $carry10 = ($s10 + (1 << 20)) >> 21;
         $s11 += $carry10;
         $s10 -= $carry10 << 21;
-        //    carry12 = (s12 + (int64_t) (1L << 20)) >> 21;
-        //    s13 += carry12;
-        //    s12 -= carry12 * ((uint64_t) 1L << 21);
         $carry12 = ($s12 + (1 << 20)) >> 21;
         $s13 += $carry12;
         $s12 -= $carry12 << 21;
-        //    carry14 = (s14 + (int64_t) (1L << 20)) >> 21;
-        //    s15 += carry14;
-        //    s14 -= carry14 * ((uint64_t) 1L << 21);
         $carry14 = ($s14 + (1 << 20)) >> 21;
         $s15 += $carry14;
         $s14 -= $carry14 << 21;
-        //    carry16 = (s16 + (int64_t) (1L << 20)) >> 21;
-        //    s17 += carry16;
-        //    s16 -= carry16 * ((uint64_t) 1L << 21);
         $carry16 = ($s16 + (1 << 20)) >> 21;
         $s17 += $carry16;
         $s16 -= $carry16 << 21;
-        //    carry18 = (s18 + (int64_t) (1L << 20)) >> 21;
-        //    s19 += carry18;
-        //    s18 -= carry18 * ((uint64_t) 1L << 21);
         $carry18 = ($s18 + (1 << 20)) >> 21;
         $s19 += $carry18;
         $s18 -= $carry18 << 21;
-        //    carry20 = (s20 + (int64_t) (1L << 20)) >> 21;
-        //    s21 += carry20;
-        //    s20 -= carry20 * ((uint64_t) 1L << 21);
         $carry20 = ($s20 + (1 << 20)) >> 21;
         $s21 += $carry20;
         $s20 -= $carry20 << 21;
-        //    carry22 = (s22 + (int64_t) (1L << 20)) >> 21;
-        //    s23 += carry22;
-        //    s22 -= carry22 * ((uint64_t) 1L << 21);
         $carry22 = ($s22 + (1 << 20)) >> 21;
         $s23 += $carry22;
         $s22 -= $carry22 << 21;
 
-        //    carry1 = (s1 + (int64_t) (1L << 20)) >> 21;
-        //    s2 += carry1;
-        //    s1 -= carry1 * ((uint64_t) 1L << 21);
         $carry1 = ($s1 + (1 << 20)) >> 21;
         $s2 += $carry1;
         $s1 -= $carry1 << 21;
-        //    carry3 = (s3 + (int64_t) (1L << 20)) >> 21;
-        //    s4 += carry3;
-        //    s3 -= carry3 * ((uint64_t) 1L << 21);
         $carry3 = ($s3 + (1 << 20)) >> 21;
         $s4 += $carry3;
         $s3 -= $carry3 << 21;
-        //    carry5 = (s5 + (int64_t) (1L << 20)) >> 21;
-        //    s6 += carry5;
-        //    s5 -= carry5 * ((uint64_t) 1L << 21);
         $carry5 = ($s5 + (1 << 20)) >> 21;
         $s6 += $carry5;
         $s5 -= $carry5 << 21;
-        //    carry7 = (s7 + (int64_t) (1L << 20)) >> 21;
-        //    s8 += carry7;
-        //    s7 -= carry7 * ((uint64_t) 1L << 21);
         $carry7 = ($s7 + (1 << 20)) >> 21;
         $s8 += $carry7;
         $s7 -= $carry7 << 21;
-        //    carry9 = (s9 + (int64_t) (1L << 20)) >> 21;
-        //    s10 += carry9;
-        //    s9 -= carry9 * ((uint64_t) 1L << 21);
         $carry9 = ($s9 + (1 << 20)) >> 21;
         $s10 += $carry9;
         $s9 -= $carry9 << 21;
-        //    carry11 = (s11 + (int64_t) (1L << 20)) >> 21;
-        //    s12 += carry11;
-        //    s11 -= carry11 * ((uint64_t) 1L << 21);
         $carry11 = ($s11 + (1 << 20)) >> 21;
         $s12 += $carry11;
         $s11 -= $carry11 << 21;
-        //    carry13 = (s13 + (int64_t) (1L << 20)) >> 21;
-        //    s14 += carry13;
-        //    s13 -= carry13 * ((uint64_t) 1L << 21);
         $carry13 = ($s13 + (1 << 20)) >> 21;
         $s14 += $carry13;
         $s13 -= $carry13 << 21;
-        //    carry15 = (s15 + (int64_t) (1L << 20)) >> 21;
-        //    s16 += carry15;
-        //    s15 -= carry15 * ((uint64_t) 1L << 21);
         $carry15 = ($s15 + (1 << 20)) >> 21;
         $s16 += $carry15;
         $s15 -= $carry15 << 21;
-        //    carry17 = (s17 + (int64_t) (1L << 20)) >> 21;
-        //    s18 += carry17;
-        //    s17 -= carry17 * ((uint64_t) 1L << 21);
         $carry17 = ($s17 + (1 << 20)) >> 21;
         $s18 += $carry17;
         $s17 -= $carry17 << 21;
-        //    carry19 = (s19 + (int64_t) (1L << 20)) >> 21;
-        //    s20 += carry19;
-        //    s19 -= carry19 * ((uint64_t) 1L << 21);
         $carry19 = ($s19 + (1 << 20)) >> 21;
         $s20 += $carry19;
         $s19 -= $carry19 << 21;
-        //    carry21 = (s21 + (int64_t) (1L << 20)) >> 21;
-        //    s22 += carry21;
-        //    s21 -= carry21 * ((uint64_t) 1L << 21);
         $carry21 = ($s21 + (1 << 20)) >> 21;
         $s22 += $carry21;
         $s21 -= $carry21 << 21;
 
-        //    s11 += s23 * 666643;
-        //    s12 += s23 * 470296;
-        //    s13 += s23 * 654183;
-        //    s14 -= s23 * 997805;
-        //    s15 += s23 * 136657;
-        //    s16 -= s23 * 683901;
         $s11 += self::mul($s23, 666643, 20);
         $s12 += self::mul($s23, 470296, 19);
         $s13 += self::mul($s23, 654183, 20);
@@ -3191,12 +2773,6 @@ abstract class ParagonIE_Sodium_Core_Curve25519 extends ParagonIE_Sodium_Core_Cu
         $s15 += self::mul($s23, 136657, 18);
         $s16 -= self::mul($s23, 683901, 20);
 
-        //    s10 += s22 * 666643;
-        //    s11 += s22 * 470296;
-        //    s12 += s22 * 654183;
-        //    s13 -= s22 * 997805;
-        //    s14 += s22 * 136657;
-        //    s15 -= s22 * 683901;
         $s10 += self::mul($s22, 666643, 20);
         $s11 += self::mul($s22, 470296, 19);
         $s12 += self::mul($s22, 654183, 20);
@@ -3204,12 +2780,6 @@ abstract class ParagonIE_Sodium_Core_Curve25519 extends ParagonIE_Sodium_Core_Cu
         $s14 += self::mul($s22, 136657, 18);
         $s15 -= self::mul($s22, 683901, 20);
 
-        //    s9 += s21 * 666643;
-        //    s10 += s21 * 470296;
-        //    s11 += s21 * 654183;
-        //    s12 -= s21 * 997805;
-        //    s13 += s21 * 136657;
-        //    s14 -= s21 * 683901;
         $s9 += self::mul($s21, 666643, 20);
         $s10 += self::mul($s21, 470296, 19);
         $s11 += self::mul($s21, 654183, 20);
@@ -3217,12 +2787,6 @@ abstract class ParagonIE_Sodium_Core_Curve25519 extends ParagonIE_Sodium_Core_Cu
         $s13 += self::mul($s21, 136657, 18);
         $s14 -= self::mul($s21, 683901, 20);
 
-        //    s8 += s20 * 666643;
-        //    s9 += s20 * 470296;
-        //    s10 += s20 * 654183;
-        //    s11 -= s20 * 997805;
-        //    s12 += s20 * 136657;
-        //    s13 -= s20 * 683901;
         $s8 += self::mul($s20, 666643, 20);
         $s9 += self::mul($s20, 470296, 19);
         $s10 += self::mul($s20, 654183, 20);
@@ -3230,12 +2794,6 @@ abstract class ParagonIE_Sodium_Core_Curve25519 extends ParagonIE_Sodium_Core_Cu
         $s12 += self::mul($s20, 136657, 18);
         $s13 -= self::mul($s20, 683901, 20);
 
-        //    s7 += s19 * 666643;
-        //    s8 += s19 * 470296;
-        //    s9 += s19 * 654183;
-        //    s10 -= s19 * 997805;
-        //    s11 += s19 * 136657;
-        //    s12 -= s19 * 683901;
         $s7 += self::mul($s19, 666643, 20);
         $s8 += self::mul($s19, 470296, 19);
         $s9 += self::mul($s19, 654183, 20);
@@ -3243,12 +2801,6 @@ abstract class ParagonIE_Sodium_Core_Curve25519 extends ParagonIE_Sodium_Core_Cu
         $s11 += self::mul($s19, 136657, 18);
         $s12 -= self::mul($s19, 683901, 20);
 
-        //    s6 += s18 * 666643;
-        //    s7 += s18 * 470296;
-        //    s8 += s18 * 654183;
-        //    s9 -= s18 * 997805;
-        //    s10 += s18 * 136657;
-        //    s11 -= s18 * 683901;
         $s6 += self::mul($s18, 666643, 20);
         $s7 += self::mul($s18, 470296, 19);
         $s8 += self::mul($s18, 654183, 20);
@@ -3256,80 +2808,41 @@ abstract class ParagonIE_Sodium_Core_Curve25519 extends ParagonIE_Sodium_Core_Cu
         $s10 += self::mul($s18, 136657, 18);
         $s11 -= self::mul($s18, 683901, 20);
 
-        //    carry6 = (s6 + (int64_t) (1L << 20)) >> 21;
-        //    s7 += carry6;
-        //    s6 -= carry6 * ((uint64_t) 1L << 21);
         $carry6 = ($s6 + (1 << 20)) >> 21;
         $s7 += $carry6;
         $s6 -= $carry6 << 21;
-        //    carry8 = (s8 + (int64_t) (1L << 20)) >> 21;
-        //    s9 += carry8;
-        //    s8 -= carry8 * ((uint64_t) 1L << 21);
         $carry8 = ($s8 + (1 << 20)) >> 21;
         $s9 += $carry8;
         $s8 -= $carry8 << 21;
-        //    carry10 = (s10 + (int64_t) (1L << 20)) >> 21;
-        //    s11 += carry10;
-        //    s10 -= carry10 * ((uint64_t) 1L << 21);
         $carry10 = ($s10 + (1 << 20)) >> 21;
         $s11 += $carry10;
         $s10 -= $carry10 << 21;
-        //    carry12 = (s12 + (int64_t) (1L << 20)) >> 21;
-        //    s13 += carry12;
-        //    s12 -= carry12 * ((uint64_t) 1L << 21);
         $carry12 = ($s12 + (1 << 20)) >> 21;
         $s13 += $carry12;
         $s12 -= $carry12 << 21;
-        //    carry14 = (s14 + (int64_t) (1L << 20)) >> 21;
-        //    s15 += carry14;
-        //    s14 -= carry14 * ((uint64_t) 1L << 21);
         $carry14 = ($s14 + (1 << 20)) >> 21;
         $s15 += $carry14;
         $s14 -= $carry14 << 21;
-        //    carry16 = (s16 + (int64_t) (1L << 20)) >> 21;
-        //    s17 += carry16;
-        //    s16 -= carry16 * ((uint64_t) 1L << 21);
         $carry16 = ($s16 + (1 << 20)) >> 21;
         $s17 += $carry16;
         $s16 -= $carry16 << 21;
 
-        //    carry7 = (s7 + (int64_t) (1L << 20)) >> 21;
-        //    s8 += carry7;
-        //    s7 -= carry7 * ((uint64_t) 1L << 21);
         $carry7 = ($s7 + (1 << 20)) >> 21;
         $s8 += $carry7;
         $s7 -= $carry7 << 21;
-        //    carry9 = (s9 + (int64_t) (1L << 20)) >> 21;
-        //    s10 += carry9;
-        //    s9 -= carry9 * ((uint64_t) 1L << 21);
         $carry9 = ($s9 + (1 << 20)) >> 21;
         $s10 += $carry9;
         $s9 -= $carry9 << 21;
-        //    carry11 = (s11 + (int64_t) (1L << 20)) >> 21;
-        //    s12 += carry11;
-        //    s11 -= carry11 * ((uint64_t) 1L << 21);
         $carry11 = ($s11 + (1 << 20)) >> 21;
         $s12 += $carry11;
         $s11 -= $carry11 << 21;
-        //    carry13 = (s13 + (int64_t) (1L << 20)) >> 21;
-        //    s14 += carry13;
-        //    s13 -= carry13 * ((uint64_t) 1L << 21);
         $carry13 = ($s13 + (1 << 20)) >> 21;
         $s14 += $carry13;
         $s13 -= $carry13 << 21;
-        //    carry15 = (s15 + (int64_t) (1L << 20)) >> 21;
-        //    s16 += carry15;
-        //    s15 -= carry15 * ((uint64_t) 1L << 21);
         $carry15 = ($s15 + (1 << 20)) >> 21;
         $s16 += $carry15;
         $s15 -= $carry15 << 21;
 
-        //    s5 += s17 * 666643;
-        //    s6 += s17 * 470296;
-        //    s7 += s17 * 654183;
-        //    s8 -= s17 * 997805;
-        //    s9 += s17 * 136657;
-        //    s10 -= s17 * 683901;
         $s5 += self::mul($s17, 666643, 20);
         $s6 += self::mul($s17, 470296, 19);
         $s7 += self::mul($s17, 654183, 20);
@@ -3337,12 +2850,6 @@ abstract class ParagonIE_Sodium_Core_Curve25519 extends ParagonIE_Sodium_Core_Cu
         $s9 += self::mul($s17, 136657, 18);
         $s10 -= self::mul($s17, 683901, 20);
 
-        //    s4 += s16 * 666643;
-        //    s5 += s16 * 470296;
-        //    s6 += s16 * 654183;
-        //    s7 -= s16 * 997805;
-        //    s8 += s16 * 136657;
-        //    s9 -= s16 * 683901;
         $s4 += self::mul($s16, 666643, 20);
         $s5 += self::mul($s16, 470296, 19);
         $s6 += self::mul($s16, 654183, 20);
@@ -3350,12 +2857,6 @@ abstract class ParagonIE_Sodium_Core_Curve25519 extends ParagonIE_Sodium_Core_Cu
         $s8 += self::mul($s16, 136657, 18);
         $s9 -= self::mul($s16, 683901, 20);
 
-        //    s3 += s15 * 666643;
-        //    s4 += s15 * 470296;
-        //    s5 += s15 * 654183;
-        //    s6 -= s15 * 997805;
-        //    s7 += s15 * 136657;
-        //    s8 -= s15 * 683901;
         $s3 += self::mul($s15, 666643, 20);
         $s4 += self::mul($s15, 470296, 19);
         $s5 += self::mul($s15, 654183, 20);
@@ -3363,12 +2864,6 @@ abstract class ParagonIE_Sodium_Core_Curve25519 extends ParagonIE_Sodium_Core_Cu
         $s7 += self::mul($s15, 136657, 18);
         $s8 -= self::mul($s15, 683901, 20);
 
-        //    s2 += s14 * 666643;
-        //    s3 += s14 * 470296;
-        //    s4 += s14 * 654183;
-        //    s5 -= s14 * 997805;
-        //    s6 += s14 * 136657;
-        //    s7 -= s14 * 683901;
         $s2 += self::mul($s14, 666643, 20);
         $s3 += self::mul($s14, 470296, 19);
         $s4 += self::mul($s14, 654183, 20);
@@ -3376,12 +2871,6 @@ abstract class ParagonIE_Sodium_Core_Curve25519 extends ParagonIE_Sodium_Core_Cu
         $s6 += self::mul($s14, 136657, 18);
         $s7 -= self::mul($s14, 683901, 20);
 
-        //    s1 += s13 * 666643;
-        //    s2 += s13 * 470296;
-        //    s3 += s13 * 654183;
-        //    s4 -= s13 * 997805;
-        //    s5 += s13 * 136657;
-        //    s6 -= s13 * 683901;
         $s1 += self::mul($s13, 666643, 20);
         $s2 += self::mul($s13, 470296, 19);
         $s3 += self::mul($s13, 654183, 20);
@@ -3389,13 +2878,6 @@ abstract class ParagonIE_Sodium_Core_Curve25519 extends ParagonIE_Sodium_Core_Cu
         $s5 += self::mul($s13, 136657, 18);
         $s6 -= self::mul($s13, 683901, 20);
 
-        //    s0 += s12 * 666643;
-        //    s1 += s12 * 470296;
-        //    s2 += s12 * 654183;
-        //    s3 -= s12 * 997805;
-        //    s4 += s12 * 136657;
-        //    s5 -= s12 * 683901;
-        //    s12 = 0;
         $s0 += self::mul($s12, 666643, 20);
         $s1 += self::mul($s12, 470296, 19);
         $s2 += self::mul($s12, 654183, 20);
@@ -3404,87 +2886,44 @@ abstract class ParagonIE_Sodium_Core_Curve25519 extends ParagonIE_Sodium_Core_Cu
         $s5 -= self::mul($s12, 683901, 20);
         $s12 = 0;
 
-        //    carry0 = (s0 + (int64_t) (1L << 20)) >> 21;
-        //    s1 += carry0;
-        //    s0 -= carry0 * ((uint64_t) 1L << 21);
         $carry0 = ($s0 + (1 << 20)) >> 21;
         $s1 += $carry0;
         $s0 -= $carry0 << 21;
-        //    carry2 = (s2 + (int64_t) (1L << 20)) >> 21;
-        //    s3 += carry2;
-        //    s2 -= carry2 * ((uint64_t) 1L << 21);
         $carry2 = ($s2 + (1 << 20)) >> 21;
         $s3 += $carry2;
         $s2 -= $carry2 << 21;
-        //    carry4 = (s4 + (int64_t) (1L << 20)) >> 21;
-        //    s5 += carry4;
-        //    s4 -= carry4 * ((uint64_t) 1L << 21);
         $carry4 = ($s4 + (1 << 20)) >> 21;
         $s5 += $carry4;
         $s4 -= $carry4 << 21;
-        //    carry6 = (s6 + (int64_t) (1L << 20)) >> 21;
-        //    s7 += carry6;
-        //    s6 -= carry6 * ((uint64_t) 1L << 21);
         $carry6 = ($s6 + (1 << 20)) >> 21;
         $s7 += $carry6;
         $s6 -= $carry6 << 21;
-        //    carry8 = (s8 + (int64_t) (1L << 20)) >> 21;
-        //    s9 += carry8;
-        //    s8 -= carry8 * ((uint64_t) 1L << 21);
         $carry8 = ($s8 + (1 << 20)) >> 21;
         $s9 += $carry8;
         $s8 -= $carry8 << 21;
-        //    carry10 = (s10 + (int64_t) (1L << 20)) >> 21;
-        //    s11 += carry10;
-        //    s10 -= carry10 * ((uint64_t) 1L << 21);
         $carry10 = ($s10 + (1 << 20)) >> 21;
         $s11 += $carry10;
         $s10 -= $carry10 << 21;
 
-        //    carry1 = (s1 + (int64_t) (1L << 20)) >> 21;
-        //    s2 += carry1;
-        //    s1 -= carry1 * ((uint64_t) 1L << 21);
         $carry1 = ($s1 + (1 << 20)) >> 21;
         $s2 += $carry1;
         $s1 -= $carry1 << 21;
-        //    carry3 = (s3 + (int64_t) (1L << 20)) >> 21;
-        //    s4 += carry3;
-        //    s3 -= carry3 * ((uint64_t) 1L << 21);
         $carry3 = ($s3 + (1 << 20)) >> 21;
         $s4 += $carry3;
         $s3 -= $carry3 << 21;
-        //    carry5 = (s5 + (int64_t) (1L << 20)) >> 21;
-        //    s6 += carry5;
-        //    s5 -= carry5 * ((uint64_t) 1L << 21);
         $carry5 = ($s5 + (1 << 20)) >> 21;
         $s6 += $carry5;
         $s5 -= $carry5 << 21;
-        //    carry7 = (s7 + (int64_t) (1L << 20)) >> 21;
-        //    s8 += carry7;
-        //    s7 -= carry7 * ((uint64_t) 1L << 21);
         $carry7 = ($s7 + (1 << 20)) >> 21;
         $s8 += $carry7;
         $s7 -= $carry7 << 21;
-        //    carry9 = (s9 + (int64_t) (1L << 20)) >> 21;
-        //    s10 += carry9;
-        //    s9 -= carry9 * ((uint64_t) 1L << 21);
         $carry9 = ($s9 + (1 << 20)) >> 21;
         $s10 += $carry9;
         $s9 -= $carry9 << 21;
-        //    carry11 = (s11 + (int64_t) (1L << 20)) >> 21;
-        //    s12 += carry11;
-        //    s11 -= carry11 * ((uint64_t) 1L << 21);
         $carry11 = ($s11 + (1 << 20)) >> 21;
         $s12 += $carry11;
         $s11 -= $carry11 << 21;
 
-        //    s0 += s12 * 666643;
-        //    s1 += s12 * 470296;
-        //    s2 += s12 * 654183;
-        //    s3 -= s12 * 997805;
-        //    s4 += s12 * 136657;
-        //    s5 -= s12 * 683901;
-        //    s12 = 0;
         $s0 += self::mul($s12, 666643, 20);
         $s1 += self::mul($s12, 470296, 19);
         $s2 += self::mul($s12, 654183, 20);
@@ -3493,85 +2932,43 @@ abstract class ParagonIE_Sodium_Core_Curve25519 extends ParagonIE_Sodium_Core_Cu
         $s5 -= self::mul($s12, 683901, 20);
         $s12 = 0;
 
-        //    carry0 = s0 >> 21;
-        //    s1 += carry0;
-        //    s0 -= carry0 * ((uint64_t) 1L << 21);
         $carry0 = $s0 >> 21;
         $s1 += $carry0;
         $s0 -= $carry0 << 21;
-        //    carry1 = s1 >> 21;
-        //    s2 += carry1;
-        //    s1 -= carry1 * ((uint64_t) 1L << 21);
         $carry1 = $s1 >> 21;
         $s2 += $carry1;
         $s1 -= $carry1 << 21;
-        //    carry2 = s2 >> 21;
-        //    s3 += carry2;
-        //    s2 -= carry2 * ((uint64_t) 1L << 21);
         $carry2 = $s2 >> 21;
         $s3 += $carry2;
         $s2 -= $carry2 << 21;
-        //    carry3 = s3 >> 21;
-        //    s4 += carry3;
-        //    s3 -= carry3 * ((uint64_t) 1L << 21);
         $carry3 = $s3 >> 21;
         $s4 += $carry3;
         $s3 -= $carry3 << 21;
-        //    carry4 = s4 >> 21;
-        //    s5 += carry4;
-        //    s4 -= carry4 * ((uint64_t) 1L << 21);
         $carry4 = $s4 >> 21;
         $s5 += $carry4;
         $s4 -= $carry4 << 21;
-        //    carry5 = s5 >> 21;
-        //    s6 += carry5;
-        //    s5 -= carry5 * ((uint64_t) 1L << 21);
         $carry5 = $s5 >> 21;
         $s6 += $carry5;
         $s5 -= $carry5 << 21;
-        //    carry6 = s6 >> 21;
-        //    s7 += carry6;
-        //    s6 -= carry6 * ((uint64_t) 1L << 21);
         $carry6 = $s6 >> 21;
         $s7 += $carry6;
         $s6 -= $carry6 << 21;
-        //    carry7 = s7 >> 21;
-        //    s8 += carry7;
-        //    s7 -= carry7 * ((uint64_t) 1L << 21);
         $carry7 = $s7 >> 21;
         $s8 += $carry7;
         $s7 -= $carry7 << 21;
-        //    carry8 = s8 >> 21;
-        //    s9 += carry8;
-        //    s8 -= carry8 * ((uint64_t) 1L << 21);
         $carry8 = $s8 >> 21;
         $s9 += $carry8;
         $s8 -= $carry8 << 21;
-        //    carry9 = s9 >> 21;
-        //    s10 += carry9;
-        //    s9 -= carry9 * ((uint64_t) 1L << 21);
         $carry9 = $s9 >> 21;
         $s10 += $carry9;
         $s9 -= $carry9 << 21;
-        //    carry10 = s10 >> 21;
-        //    s11 += carry10;
-        //    s10 -= carry10 * ((uint64_t) 1L << 21);
         $carry10 = $s10 >> 21;
         $s11 += $carry10;
         $s10 -= $carry10 << 21;
-        //    carry11 = s11 >> 21;
-        //    s12 += carry11;
-        //    s11 -= carry11 * ((uint64_t) 1L << 21);
         $carry11 = $s11 >> 21;
         $s12 += $carry11;
         $s11 -= $carry11 << 21;
 
-        //    s0 += s12 * 666643;
-        //    s1 += s12 * 470296;
-        //    s2 += s12 * 654183;
-        //    s3 -= s12 * 997805;
-        //    s4 += s12 * 136657;
-        //    s5 -= s12 * 683901;
         $s0 += self::mul($s12, 666643, 20);
         $s1 += self::mul($s12, 470296, 19);
         $s2 += self::mul($s12, 654183, 20);
@@ -3579,137 +2976,72 @@ abstract class ParagonIE_Sodium_Core_Curve25519 extends ParagonIE_Sodium_Core_Cu
         $s4 += self::mul($s12, 136657, 18);
         $s5 -= self::mul($s12, 683901, 20);
 
-        //    carry0 = s0 >> 21;
-        //    s1 += carry0;
-        //    s0 -= carry0 * ((uint64_t) 1L << 21);
         $carry0 = $s0 >> 21;
         $s1 += $carry0;
         $s0 -= $carry0 << 21;
-        //    carry1 = s1 >> 21;
-        //    s2 += carry1;
-        //    s1 -= carry1 * ((uint64_t) 1L << 21);
         $carry1 = $s1 >> 21;
         $s2 += $carry1;
         $s1 -= $carry1 << 21;
-        //    carry2 = s2 >> 21;
-        //    s3 += carry2;
-        //    s2 -= carry2 * ((uint64_t) 1L << 21);
         $carry2 = $s2 >> 21;
         $s3 += $carry2;
         $s2 -= $carry2 << 21;
-        //    carry3 = s3 >> 21;
-        //    s4 += carry3;
-        //    s3 -= carry3 * ((uint64_t) 1L << 21);
         $carry3 = $s3 >> 21;
         $s4 += $carry3;
         $s3 -= $carry3 << 21;
-        //    carry4 = s4 >> 21;
-        //    s5 += carry4;
-        //    s4 -= carry4 * ((uint64_t) 1L << 21);
         $carry4 = $s4 >> 21;
         $s5 += $carry4;
         $s4 -= $carry4 << 21;
-        //    carry5 = s5 >> 21;
-        //    s6 += carry5;
-        //    s5 -= carry5 * ((uint64_t) 1L << 21);
         $carry5 = $s5 >> 21;
         $s6 += $carry5;
         $s5 -= $carry5 << 21;
-        //    carry6 = s6 >> 21;
-        //    s7 += carry6;
-        //    s6 -= carry6 * ((uint64_t) 1L << 21);
         $carry6 = $s6 >> 21;
         $s7 += $carry6;
         $s6 -= $carry6 << 21;
-        //    carry7 = s7 >> 21;
-        //    s8 += carry7;
-        //    s7 -= carry7 * ((uint64_t) 1L << 21);
         $carry7 = $s7 >> 21;
         $s8 += $carry7;
         $s7 -= $carry7 << 21;
-        //    carry8 = s8 >> 21;
-        //    s9 += carry8;
-        //    s8 -= carry8 * ((uint64_t) 1L << 21);
         $carry8 = $s8 >> 21;
         $s9 += $carry8;
         $s8 -= $carry8 << 21;
-        //    carry9 = s9 >> 21;
-        //    s10 += carry9;
-        //    s9 -= carry9 * ((uint64_t) 1L << 21);
         $carry9 = $s9 >> 21;
         $s10 += $carry9;
         $s9 -= $carry9 << 21;
-        //    carry10 = s10 >> 21;
-        //    s11 += carry10;
-        //    s10 -= carry10 * ((uint64_t) 1L << 21);
         $carry10 = $s10 >> 21;
         $s11 += $carry10;
         $s10 -= $carry10 << 21;
 
         $s = array_fill(0, 32, 0);
-        // s[0]  = s0 >> 0;
         $s[0]  = $s0 >> 0;
-        // s[1]  = s0 >> 8;
         $s[1]  = $s0 >> 8;
-        // s[2]  = (s0 >> 16) | (s1 * ((uint64_t) 1 << 5));
         $s[2]  = ($s0 >> 16) | ($s1 << 5);
-        // s[3]  = s1 >> 3;
         $s[3]  = $s1 >> 3;
-        // s[4]  = s1 >> 11;
         $s[4]  = $s1 >> 11;
-        // s[5]  = (s1 >> 19) | (s2 * ((uint64_t) 1 << 2));
         $s[5]  = ($s1 >> 19) | ($s2 << 2);
-        // s[6]  = s2 >> 6;
         $s[6]  = $s2 >> 6;
-        // s[7]  = (s2 >> 14) | (s3 * ((uint64_t) 1 << 7));
         $s[7]  = ($s2 >> 14) | ($s3 << 7);
-        // s[8]  = s3 >> 1;
         $s[8]  = $s3 >> 1;
-        // s[9]  = s3 >> 9;
         $s[9]  = $s3 >> 9;
-        // s[10] = (s3 >> 17) | (s4 * ((uint64_t) 1 << 4));
         $s[10] = ($s3 >> 17) | ($s4 << 4);
-        // s[11] = s4 >> 4;
         $s[11] = $s4 >> 4;
-        // s[12] = s4 >> 12;
         $s[12] = $s4 >> 12;
-        // s[13] = (s4 >> 20) | (s5 * ((uint64_t) 1 << 1));
         $s[13] = ($s4 >> 20) | ($s5 << 1);
-        // s[14] = s5 >> 7;
         $s[14] = $s5 >> 7;
-        // s[15] = (s5 >> 15) | (s6 * ((uint64_t) 1 << 6));
         $s[15] = ($s5 >> 15) | ($s6 << 6);
-        // s[16] = s6 >> 2;
         $s[16] = $s6 >> 2;
-        // s[17] = s6 >> 10;
         $s[17] = $s6 >> 10;
-        // s[18] = (s6 >> 18) | (s7 * ((uint64_t) 1 << 3));
         $s[18] = ($s6 >> 18) | ($s7 << 3);
-        // s[19] = s7 >> 5;
         $s[19] = $s7 >> 5;
-        // s[20] = s7 >> 13;
         $s[20] = $s7 >> 13;
-        // s[21] = s8 >> 0;
         $s[21] = $s8 >> 0;
-        // s[22] = s8 >> 8;
         $s[22] = $s8 >> 8;
-        // s[23] = (s8 >> 16) | (s9 * ((uint64_t) 1 << 5));
         $s[23] = ($s8 >> 16) | ($s9 << 5);
-        // s[24] = s9 >> 3;
         $s[24] = $s9 >> 3;
-        // s[25] = s9 >> 11;
         $s[25] = $s9 >> 11;
-        // s[26] = (s9 >> 19) | (s10 * ((uint64_t) 1 << 2));
         $s[26] = ($s9 >> 19) | ($s10 << 2);
-        // s[27] = s10 >> 6;
         $s[27] = $s10 >> 6;
-        // s[28] = (s10 >> 14) | (s11 * ((uint64_t) 1 << 7));
         $s[28] = ($s10 >> 14) | ($s11 << 7);
-        // s[29] = s11 >> 1;
         $s[29] = $s11 >> 1;
-        // s[30] = s11 >> 9;
         $s[30] = $s11 >> 9;
-        // s[31] = s11 >> 17;
         $s[31] = $s11 >> 17;
         return self::intArrayToString($s);
     }
@@ -3718,8 +3050,10 @@ abstract class ParagonIE_Sodium_Core_Curve25519 extends ParagonIE_Sodium_Core_Cu
      * @param string $s
      * @return string
      */
-    public static function sc25519_sq($s)
-    {
+    public static function sc25519_sq(
+        #[SensitiveParameter]
+        string $s
+    ): string {
         return self::sc25519_mul($s, $s);
     }
 
@@ -3729,8 +3063,13 @@ abstract class ParagonIE_Sodium_Core_Curve25519 extends ParagonIE_Sodium_Core_Cu
      * @param string $a
      * @return string
      */
-    public static function sc25519_sqmul($s, $n, $a)
-    {
+    public static function sc25519_sqmul(
+        #[SensitiveParameter]
+        string $s,
+        int $n,
+        #[SensitiveParameter]
+        string $a
+    ): string {
         for ($i = 0; $i < $n; ++$i) {
             $s = self::sc25519_sq($s);
         }
@@ -3741,8 +3080,10 @@ abstract class ParagonIE_Sodium_Core_Curve25519 extends ParagonIE_Sodium_Core_Cu
      * @param string $s
      * @return string
      */
-    public static function sc25519_invert($s)
-    {
+    public static function sc25519_invert(
+        #[SensitiveParameter]
+        string $s
+    ): string {
         $_10 = self::sc25519_sq($s);
         $_11 = self::sc25519_mul($s, $_10);
         $_100 = self::sc25519_mul($s, $_11);
@@ -3785,19 +3126,6 @@ abstract class ParagonIE_Sodium_Core_Curve25519 extends ParagonIE_Sodium_Core_Cu
         return self::sc25519_sqmul($recip, 8, $_11101011);
     }
 
-    /**
-     * @param string $s
-     * @return string
-     */
-    public static function clamp($s)
-    {
-        $s_ = self::stringToIntArray($s);
-        $s_[0] &= 248;
-        $s_[31] |= 64;
-        $s_[31] &= 128;
-        return self::intArrayToString($s_);
-    }
-
     /**
      * Ensure limbs are less than 28 bits long to prevent float promotion.
      *
@@ -3806,11 +3134,12 @@ abstract class ParagonIE_Sodium_Core_Curve25519 extends ParagonIE_Sodium_Core_Cu
      * @param ParagonIE_Sodium_Core_Curve25519_Fe $f
      * @return ParagonIE_Sodium_Core_Curve25519_Fe
      */
-    public static function fe_normalize(ParagonIE_Sodium_Core_Curve25519_Fe $f)
-    {
+    public static function fe_normalize(
+        ParagonIE_Sodium_Core_Curve25519_Fe $f
+    ): ParagonIE_Sodium_Core_Curve25519_Fe {
         $x = (PHP_INT_SIZE << 3) - 1; // 31 or 63
 
-        $g = self::fe_copy($f);
+        $g = $f;
         for ($i = 0; $i < 10; ++$i) {
             $mask = -(($g[$i] >> $x) & 1);
 

diff --git a/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core/Curve25519/Fe.php b/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core/Curve25519/Fe.php
index 527096565a3ad3d86fa629bca7915b1af9bf09e5..4569ce23419e34a972200cf5f3d699f1aeeb07eb 100644 (file)
--- a/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core/Curve25519/Fe.php
+++ b/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core/Curve25519/Fe.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 if (class_exists('ParagonIE_Sodium_Core_Curve25519_Fe', false)) {
     return;
@@ -8,18 +9,20 @@ if (class_exists('ParagonIE_Sodium_Core_Curve25519_Fe', false)) {
  * Class ParagonIE_Sodium_Core_Curve25519_Fe
  *
  * This represents a Field Element
+ *
+ * @psalm-suppress MissingTemplateParam
  */
 class ParagonIE_Sodium_Core_Curve25519_Fe implements ArrayAccess
 {
     /**
      * @var array<int, int>
      */
-    protected $container = array();
+    protected array $container = [];
 
     /**
      * @var int
      */
-    protected $size = 10;
+    protected int $size = 10;
 
     /**
      * @internal You should not use this directly from another application
@@ -28,7 +31,7 @@ class ParagonIE_Sodium_Core_Curve25519_Fe implements ArrayAccess
      * @param bool $save_indexes
      * @return self
      */
-    public static function fromArray($array, $save_indexes = null)
+    public static function fromArray(array $array, bool $save_indexes = false): self
     {
         $count = count($array);
         if ($save_indexes) {
@@ -58,14 +61,10 @@ class ParagonIE_Sodium_Core_Curve25519_Fe implements ArrayAccess
      * @param int|null $offset
      * @param int $value
      * @return void
-     * @psalm-suppress MixedArrayOffset
      */
     #[ReturnTypeWillChange]
-    public function offsetSet($offset, $value)
+    public function offsetSet($offset, $value): void
     {
-        if (!is_int($value)) {
-            throw new InvalidArgumentException('Expected an integer');
-        }
         if (is_null($offset)) {
             $this->container[] = $value;
         } else {
@@ -78,10 +77,9 @@ class ParagonIE_Sodium_Core_Curve25519_Fe implements ArrayAccess
      *
      * @param int $offset
      * @return bool
-     * @psalm-suppress MixedArrayOffset
      */
     #[ReturnTypeWillChange]
-    public function offsetExists($offset)
+    public function offsetExists($offset): bool
     {
         return isset($this->container[$offset]);
     }
@@ -91,10 +89,9 @@ class ParagonIE_Sodium_Core_Curve25519_Fe implements ArrayAccess
      *
      * @param int $offset
      * @return void
-     * @psalm-suppress MixedArrayOffset
      */
     #[ReturnTypeWillChange]
-    public function offsetUnset($offset)
+    public function offsetUnset($offset): void
     {
         unset($this->container[$offset]);
     }
@@ -104,15 +101,15 @@ class ParagonIE_Sodium_Core_Curve25519_Fe implements ArrayAccess
      *
      * @param int $offset
      * @return int
-     * @psalm-suppress MixedArrayOffset
+     * @psalm-suppress ImplementedReturnTypeMismatch
      */
     #[ReturnTypeWillChange]
-    public function offsetGet($offset)
+    public function offsetGet($offset): int
     {
         if (!isset($this->container[$offset])) {
             $this->container[$offset] = 0;
         }
-        return (int) ($this->container[$offset]);
+        return $this->container[$offset];
     }
 
     /**

diff --git a/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core/Curve25519/Ge/Cached.php b/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core/Curve25519/Ge/Cached.php
index 06774ba4fd13d6b92975a0edfba7e8edb82cfda4..a18884885c1f3252d3bafe238b790716ebc4a08c 100644 (file)
--- a/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core/Curve25519/Ge/Cached.php
+++ b/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core/Curve25519/Ge/Cached.php
@@ -1,5 +1,5 @@
 <?php
-
+declare(strict_types=1);
 
 if (class_exists('ParagonIE_Sodium_Core_Curve25519_Ge_Cached', false)) {
     return;
@@ -9,69 +9,42 @@ if (class_exists('ParagonIE_Sodium_Core_Curve25519_Ge_Cached', false)) {
  */
 class ParagonIE_Sodium_Core_Curve25519_Ge_Cached
 {
-    /**
-     * @var ParagonIE_Sodium_Core_Curve25519_Fe
-     */
-    public $YplusX;
-
-    /**
-     * @var ParagonIE_Sodium_Core_Curve25519_Fe
-     */
-    public $YminusX;
-
-    /**
-     * @var ParagonIE_Sodium_Core_Curve25519_Fe
-     */
-    public $Z;
-
-    /**
-     * @var ParagonIE_Sodium_Core_Curve25519_Fe
-     */
-    public $T2d;
+    public ParagonIE_Sodium_Core_Curve25519_Fe $YplusX;
+    public ParagonIE_Sodium_Core_Curve25519_Fe $YminusX;
+    public ParagonIE_Sodium_Core_Curve25519_Fe $Z;
+    public ParagonIE_Sodium_Core_Curve25519_Fe $T2d;
 
     /**
      * ParagonIE_Sodium_Core_Curve25519_Ge_Cached constructor.
      *
      * @internal You should not use this directly from another application
      *
-     * @param ParagonIE_Sodium_Core_Curve25519_Fe|null $YplusX
-     * @param ParagonIE_Sodium_Core_Curve25519_Fe|null $YminusX
-     * @param ParagonIE_Sodium_Core_Curve25519_Fe|null $Z
-     * @param ParagonIE_Sodium_Core_Curve25519_Fe|null $T2d
+     * @param ?ParagonIE_Sodium_Core_Curve25519_Fe $YplusX
+     * @param ?ParagonIE_Sodium_Core_Curve25519_Fe $YminusX
+     * @param ?ParagonIE_Sodium_Core_Curve25519_Fe $Z
+     * @param ?ParagonIE_Sodium_Core_Curve25519_Fe $T2d
      */
     public function __construct(
-        $YplusX = null,
-        $YminusX = null,
-        $Z = null,
-        $T2d = null
+        ?ParagonIE_Sodium_Core_Curve25519_Fe $YplusX = null,
+        ?ParagonIE_Sodium_Core_Curve25519_Fe $YminusX = null,
+        ?ParagonIE_Sodium_Core_Curve25519_Fe $Z = null,
+        ?ParagonIE_Sodium_Core_Curve25519_Fe $T2d = null
     ) {
         if ($YplusX === null) {
             $YplusX = new ParagonIE_Sodium_Core_Curve25519_Fe();
         }
-        if (!($YplusX instanceof ParagonIE_Sodium_Core_Curve25519_Fe)) {
-            throw new TypeError('Argument 1 must be an instance of ParagonIE_Sodium_Core_Curve25519_Fe');
-        }
         $this->YplusX = $YplusX;
         if ($YminusX === null) {
             $YminusX = new ParagonIE_Sodium_Core_Curve25519_Fe();
         }
-        if (!($YminusX instanceof ParagonIE_Sodium_Core_Curve25519_Fe)) {
-            throw new TypeError('Argument 2 must be an instance of ParagonIE_Sodium_Core_Curve25519_Fe');
-        }
         $this->YminusX = $YminusX;
         if ($Z === null) {
             $Z = new ParagonIE_Sodium_Core_Curve25519_Fe();
         }
-        if (!($Z instanceof ParagonIE_Sodium_Core_Curve25519_Fe)) {
-            throw new TypeError('Argument 3 must be an instance of ParagonIE_Sodium_Core_Curve25519_Fe');
-        }
         $this->Z = $Z;
         if ($T2d === null) {
             $T2d = new ParagonIE_Sodium_Core_Curve25519_Fe();
         }
-        if (!($T2d instanceof ParagonIE_Sodium_Core_Curve25519_Fe)) {
-            throw new TypeError('Argument 4 must be an instance of ParagonIE_Sodium_Core_Curve25519_Fe');
-        }
         $this->T2d = $T2d;
     }
 }

diff --git a/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core/Curve25519/Ge/P1p1.php b/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core/Curve25519/Ge/P1p1.php
index 62d36eb05cb1528aa4e9924221db1403e4c156eb..02c25538368ef4b7cc0e625e89116fe473b45538 100644 (file)
--- a/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core/Curve25519/Ge/P1p1.php
+++ b/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core/Curve25519/Ge/P1p1.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 if (class_exists('ParagonIE_Sodium_Core_Curve25519_Ge_P1p1', false)) {
     return;
@@ -8,69 +9,42 @@ if (class_exists('ParagonIE_Sodium_Core_Curve25519_Ge_P1p1', false)) {
  */
 class ParagonIE_Sodium_Core_Curve25519_Ge_P1p1
 {
-    /**
-     * @var ParagonIE_Sodium_Core_Curve25519_Fe
-     */
-    public $X;
-
-    /**
-     * @var ParagonIE_Sodium_Core_Curve25519_Fe
-     */
-    public $Y;
-
-    /**
-     * @var ParagonIE_Sodium_Core_Curve25519_Fe
-     */
-    public $Z;
-
-    /**
-     * @var ParagonIE_Sodium_Core_Curve25519_Fe
-     */
-    public $T;
+    public ParagonIE_Sodium_Core_Curve25519_Fe $X;
+    public ParagonIE_Sodium_Core_Curve25519_Fe $Y;
+    public ParagonIE_Sodium_Core_Curve25519_Fe $Z;
+    public ParagonIE_Sodium_Core_Curve25519_Fe $T;
 
     /**
      * ParagonIE_Sodium_Core_Curve25519_Ge_P1p1 constructor.
      *
      * @internal You should not use this directly from another application
      *
-     * @param ParagonIE_Sodium_Core_Curve25519_Fe|null $x
-     * @param ParagonIE_Sodium_Core_Curve25519_Fe|null $y
-     * @param ParagonIE_Sodium_Core_Curve25519_Fe|null $z
-     * @param ParagonIE_Sodium_Core_Curve25519_Fe|null $t
+     * @param ?ParagonIE_Sodium_Core_Curve25519_Fe $x
+     * @param ?ParagonIE_Sodium_Core_Curve25519_Fe $y
+     * @param ?ParagonIE_Sodium_Core_Curve25519_Fe $z
+     * @param ?ParagonIE_Sodium_Core_Curve25519_Fe $t
      */
     public function __construct(
-        $x = null,
-        $y = null,
-        $z = null,
-        $t = null
+        ?ParagonIE_Sodium_Core_Curve25519_Fe $x = null,
+        ?ParagonIE_Sodium_Core_Curve25519_Fe $y = null,
+        ?ParagonIE_Sodium_Core_Curve25519_Fe $z = null,
+        ?ParagonIE_Sodium_Core_Curve25519_Fe $t = null
     ) {
         if ($x === null) {
             $x = new ParagonIE_Sodium_Core_Curve25519_Fe();
         }
-        if (!($x instanceof ParagonIE_Sodium_Core_Curve25519_Fe)) {
-            throw new TypeError('Argument 1 must be an instance of ParagonIE_Sodium_Core_Curve25519_Fe');
-        }
         $this->X = $x;
         if ($y === null) {
             $y = new ParagonIE_Sodium_Core_Curve25519_Fe();
         }
-        if (!($y instanceof ParagonIE_Sodium_Core_Curve25519_Fe)) {
-            throw new TypeError('Argument 2 must be an instance of ParagonIE_Sodium_Core_Curve25519_Fe');
-        }
         $this->Y = $y;
         if ($z === null) {
             $z = new ParagonIE_Sodium_Core_Curve25519_Fe();
         }
-        if (!($z instanceof ParagonIE_Sodium_Core_Curve25519_Fe)) {
-            throw new TypeError('Argument 3 must be an instance of ParagonIE_Sodium_Core_Curve25519_Fe');
-        }
         $this->Z = $z;
         if ($t === null) {
             $t = new ParagonIE_Sodium_Core_Curve25519_Fe();
         }
-        if (!($t instanceof ParagonIE_Sodium_Core_Curve25519_Fe)) {
-            throw new TypeError('Argument 4 must be an instance of ParagonIE_Sodium_Core_Curve25519_Fe');
-        }
         $this->T = $t;
     }
 }

diff --git a/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core/Curve25519/Ge/P2.php b/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core/Curve25519/Ge/P2.php
index 029be720c10681e488139d564d0ccf031202d7c7..aa2a1c4f8958018f8b110de8db8c1d3f4b692f7d 100644 (file)
--- a/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core/Curve25519/Ge/P2.php
+++ b/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core/Curve25519/Ge/P2.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 if (class_exists('ParagonIE_Sodium_Core_Curve25519_Ge_P2', false)) {
     return;
@@ -9,55 +10,35 @@ if (class_exists('ParagonIE_Sodium_Core_Curve25519_Ge_P2', false)) {
  */
 class ParagonIE_Sodium_Core_Curve25519_Ge_P2
 {
-    /**
-     * @var ParagonIE_Sodium_Core_Curve25519_Fe
-     */
-    public $X;
-
-    /**
-     * @var ParagonIE_Sodium_Core_Curve25519_Fe
-     */
-    public $Y;
-
-    /**
-     * @var ParagonIE_Sodium_Core_Curve25519_Fe
-     */
-    public $Z;
+    public ParagonIE_Sodium_Core_Curve25519_Fe $X;
+    public ParagonIE_Sodium_Core_Curve25519_Fe $Y;
+    public ParagonIE_Sodium_Core_Curve25519_Fe $Z;
 
     /**
      * ParagonIE_Sodium_Core_Curve25519_Ge_P2 constructor.
      *
      * @internal You should not use this directly from another application
      *
-     * @param ParagonIE_Sodium_Core_Curve25519_Fe|null $x
-     * @param ParagonIE_Sodium_Core_Curve25519_Fe|null $y
-     * @param ParagonIE_Sodium_Core_Curve25519_Fe|null $z
+     * @param ?ParagonIE_Sodium_Core_Curve25519_Fe $x
+     * @param ?ParagonIE_Sodium_Core_Curve25519_Fe $y
+     * @param ?ParagonIE_Sodium_Core_Curve25519_Fe $z
      */
     public function __construct(
-        $x = null,
-        $y = null,
-        $z = null
+        ?ParagonIE_Sodium_Core_Curve25519_Fe $x = null,
+        ?ParagonIE_Sodium_Core_Curve25519_Fe $y = null,
+        ?ParagonIE_Sodium_Core_Curve25519_Fe $z = null
     ) {
         if ($x === null) {
             $x = new ParagonIE_Sodium_Core_Curve25519_Fe();
         }
-        if (!($x instanceof ParagonIE_Sodium_Core_Curve25519_Fe)) {
-            throw new TypeError('Argument 1 must be an instance of ParagonIE_Sodium_Core_Curve25519_Fe');
-        }
         $this->X = $x;
         if ($y === null) {
             $y = new ParagonIE_Sodium_Core_Curve25519_Fe();
         }
-        if (!($y instanceof ParagonIE_Sodium_Core_Curve25519_Fe)) {
-            throw new TypeError('Argument 2 must be an instance of ParagonIE_Sodium_Core_Curve25519_Fe');
-        }
         $this->Y = $y;
         if ($z === null) {
             $z = new ParagonIE_Sodium_Core_Curve25519_Fe();
         }
-        if (!($z instanceof ParagonIE_Sodium_Core_Curve25519_Fe)) {
-            throw new TypeError('Argument 3 must be an instance of ParagonIE_Sodium_Core_Curve25519_Fe');
-        }
         $this->Z = $z;
     }
 }

diff --git a/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core/Curve25519/Ge/P3.php b/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core/Curve25519/Ge/P3.php
index e5b2fe45992fdec3e6a5adfdcd7879849072fa75..2474bf31ac4e24ef0c2299eb87de23383707892e 100644 (file)
--- a/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core/Curve25519/Ge/P3.php
+++ b/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core/Curve25519/Ge/P3.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 if (class_exists('ParagonIE_Sodium_Core_Curve25519_Ge_P3', false)) {
     return;
@@ -9,69 +10,42 @@ if (class_exists('ParagonIE_Sodium_Core_Curve25519_Ge_P3', false)) {
  */
 class ParagonIE_Sodium_Core_Curve25519_Ge_P3
 {
-    /**
-     * @var ParagonIE_Sodium_Core_Curve25519_Fe
-     */
-    public $X;
-
-    /**
-     * @var ParagonIE_Sodium_Core_Curve25519_Fe
-     */
-    public $Y;
-
-    /**
-     * @var ParagonIE_Sodium_Core_Curve25519_Fe
-     */
-    public $Z;
-
-    /**
-     * @var ParagonIE_Sodium_Core_Curve25519_Fe
-     */
-    public $T;
+    public ParagonIE_Sodium_Core_Curve25519_Fe $X;
+    public ParagonIE_Sodium_Core_Curve25519_Fe $Y;
+    public ParagonIE_Sodium_Core_Curve25519_Fe $Z;
+    public ParagonIE_Sodium_Core_Curve25519_Fe $T;
 
     /**
      * ParagonIE_Sodium_Core_Curve25519_Ge_P3 constructor.
      *
      * @internal You should not use this directly from another application
      *
-     * @param ParagonIE_Sodium_Core_Curve25519_Fe|null $x
-     * @param ParagonIE_Sodium_Core_Curve25519_Fe|null $y
-     * @param ParagonIE_Sodium_Core_Curve25519_Fe|null $z
-     * @param ParagonIE_Sodium_Core_Curve25519_Fe|null $t
+     * @param ?ParagonIE_Sodium_Core_Curve25519_Fe $x
+     * @param ?ParagonIE_Sodium_Core_Curve25519_Fe $y
+     * @param ?ParagonIE_Sodium_Core_Curve25519_Fe $z
+     * @param ?ParagonIE_Sodium_Core_Curve25519_Fe $t
      */
     public function __construct(
-        $x = null,
-        $y = null,
-        $z = null,
-        $t = null
+        ?ParagonIE_Sodium_Core_Curve25519_Fe $x = null,
+        ?ParagonIE_Sodium_Core_Curve25519_Fe $y = null,
+        ?ParagonIE_Sodium_Core_Curve25519_Fe $z = null,
+        ?ParagonIE_Sodium_Core_Curve25519_Fe $t = null
     ) {
         if ($x === null) {
             $x = new ParagonIE_Sodium_Core_Curve25519_Fe();
         }
-        if (!($x instanceof ParagonIE_Sodium_Core_Curve25519_Fe)) {
-            throw new TypeError('Argument 1 must be an instance of ParagonIE_Sodium_Core_Curve25519_Fe');
-        }
         $this->X = $x;
         if ($y === null) {
             $y = new ParagonIE_Sodium_Core_Curve25519_Fe();
         }
-        if (!($y instanceof ParagonIE_Sodium_Core_Curve25519_Fe)) {
-            throw new TypeError('Argument 2 must be an instance of ParagonIE_Sodium_Core_Curve25519_Fe');
-        }
         $this->Y = $y;
         if ($z === null) {
             $z = new ParagonIE_Sodium_Core_Curve25519_Fe();
         }
-        if (!($z instanceof ParagonIE_Sodium_Core_Curve25519_Fe)) {
-            throw new TypeError('Argument 3 must be an instance of ParagonIE_Sodium_Core_Curve25519_Fe');
-        }
         $this->Z = $z;
         if ($t === null) {
             $t = new ParagonIE_Sodium_Core_Curve25519_Fe();
         }
-        if (!($t instanceof ParagonIE_Sodium_Core_Curve25519_Fe)) {
-            throw new TypeError('Argument 4 must be an instance of ParagonIE_Sodium_Core_Curve25519_Fe');
-        }
         $this->T = $t;
     }
 }

diff --git a/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core/Curve25519/Ge/Precomp.php b/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core/Curve25519/Ge/Precomp.php
index 2503d7a6a86f9949a7769a505a2c1cb92301ffbb..1e9a5eb3de4e6d23104e2e65177356da3eb9162c 100644 (file)
--- a/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core/Curve25519/Ge/Precomp.php
+++ b/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core/Curve25519/Ge/Precomp.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 if (class_exists('ParagonIE_Sodium_Core_Curve25519_Ge_Precomp', false)) {
     return;
@@ -9,55 +10,35 @@ if (class_exists('ParagonIE_Sodium_Core_Curve25519_Ge_Precomp', false)) {
  */
 class ParagonIE_Sodium_Core_Curve25519_Ge_Precomp
 {
-    /**
-     * @var ParagonIE_Sodium_Core_Curve25519_Fe
-     */
-    public $yplusx;
-
-    /**
-     * @var ParagonIE_Sodium_Core_Curve25519_Fe
-     */
-    public $yminusx;
-
-    /**
-     * @var ParagonIE_Sodium_Core_Curve25519_Fe
-     */
-    public $xy2d;
+    public ParagonIE_Sodium_Core_Curve25519_Fe $yplusx;
+    public ParagonIE_Sodium_Core_Curve25519_Fe $yminusx;
+    public ParagonIE_Sodium_Core_Curve25519_Fe $xy2d;
 
     /**
      * ParagonIE_Sodium_Core_Curve25519_Ge_Precomp constructor.
      *
      * @internal You should not use this directly from another application
      *
-     * @param ParagonIE_Sodium_Core_Curve25519_Fe $yplusx
-     * @param ParagonIE_Sodium_Core_Curve25519_Fe $yminusx
-     * @param ParagonIE_Sodium_Core_Curve25519_Fe $xy2d
+     * @param ?ParagonIE_Sodium_Core_Curve25519_Fe $yplusx
+     * @param ?ParagonIE_Sodium_Core_Curve25519_Fe $yminusx
+     * @param ?ParagonIE_Sodium_Core_Curve25519_Fe $xy2d
      */
     public function __construct(
-        $yplusx = null,
-        $yminusx = null,
-        $xy2d = null
+        ?ParagonIE_Sodium_Core_Curve25519_Fe $yplusx = null,
+        ?ParagonIE_Sodium_Core_Curve25519_Fe $yminusx = null,
+        ?ParagonIE_Sodium_Core_Curve25519_Fe $xy2d = null
     ) {
         if ($yplusx === null) {
             $yplusx = new ParagonIE_Sodium_Core_Curve25519_Fe();
         }
-        if (!($yplusx instanceof ParagonIE_Sodium_Core_Curve25519_Fe)) {
-            throw new TypeError('Argument 1 must be an instance of ParagonIE_Sodium_Core_Curve25519_Fe');
-        }
         $this->yplusx = $yplusx;
         if ($yminusx === null) {
             $yminusx = new ParagonIE_Sodium_Core_Curve25519_Fe();
         }
-        if (!($yminusx instanceof ParagonIE_Sodium_Core_Curve25519_Fe)) {
-            throw new TypeError('Argument 2 must be an instance of ParagonIE_Sodium_Core_Curve25519_Fe');
-        }
         $this->yminusx = $yminusx;
         if ($xy2d === null) {
             $xy2d = new ParagonIE_Sodium_Core_Curve25519_Fe();
         }
-        if (!($xy2d instanceof ParagonIE_Sodium_Core_Curve25519_Fe)) {
-            throw new TypeError('Argument 3 must be an instance of ParagonIE_Sodium_Core_Curve25519_Fe');
-        }
         $this->xy2d = $xy2d;
     }
 }

diff --git a/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core/Curve25519/H.php b/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core/Curve25519/H.php
index a2fbbf9f69b97a705017a4b3c9337e24d4709b98..19def1dd8b4b6e39038a491adb8b279a5de2be53 100644 (file)
--- a/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core/Curve25519/H.php
+++ b/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core/Curve25519/H.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 if (class_exists('ParagonIE_Sodium_Core_Curve25519_H', false)) {
     return;
@@ -16,7 +17,7 @@ class ParagonIE_Sodium_Core_Curve25519_H extends ParagonIE_Sodium_Core_Util
      *
      * @var array<int, array<int, array<int, array<int, int>>>> Basically, int[32][8][3][10]
      */
-    protected static $base = array(
+    protected const BASE = array(
         array(
             array(
                 array(25967493, -14356035, 29566456, 3660896, -12694345, 4014787, 27544626, -11754271, -6079156, 2047605),
@@ -1368,7 +1369,7 @@ class ParagonIE_Sodium_Core_Curve25519_H extends ParagonIE_Sodium_Core_Util
      *
      * @var array basically int[8][3]
      */
-    protected static $base2 = array(
+    protected const BASE2 = array(
         array(
             array(25967493, -14356035, 29566456, 3660896, -12694345, 4014787, 27544626, -11754271, -6079156, 2047605),
             array(-12545711, 934262, -2722910, 3049990, -727428, 9406986, 12720692, 5043384, 19500929, -15469378),
@@ -1413,10 +1414,8 @@ class ParagonIE_Sodium_Core_Curve25519_H extends ParagonIE_Sodium_Core_Util
 
     /**
      * 37095705934669439343138083508754565189542113879843219016388785533085940283555
-     *
-     * @var array<int, int>
      */
-    protected static $d = array(
+    protected const D = array(
         -10913610,
         13857413,
         -15372611,
@@ -1431,10 +1430,8 @@ class ParagonIE_Sodium_Core_Curve25519_H extends ParagonIE_Sodium_Core_Util
 
     /**
      * 2 * d = 16295367250680780974490674513165176452449235426866156013048779062215315747161
-     *
-     * @var array<int, int>
      */
-    protected static $d2 = array(
+    protected const D2 = array(
         -21827239,
         -5839606,
         -30745221,
@@ -1449,10 +1446,8 @@ class ParagonIE_Sodium_Core_Curve25519_H extends ParagonIE_Sodium_Core_Util
 
     /**
      * sqrt(-1)
-     *
-     * @var array<int, int>
      */
-    protected static $sqrtm1 = array(
+    protected const SQRTM1 = array(
         -32595792,
         -7943725,
         9377950,
@@ -1470,7 +1465,7 @@ class ParagonIE_Sodium_Core_Curve25519_H extends ParagonIE_Sodium_Core_Util
      *
      * @var array<int, int>
      */
-    protected static $invsqrtamd = array(
+    protected const INVSQRTAMD = array(
         6111485,
         4156064,
         -27798727,
@@ -1488,7 +1483,7 @@ class ParagonIE_Sodium_Core_Curve25519_H extends ParagonIE_Sodium_Core_Util
      *
      * @var array<int, int>
      */
-    protected static $sqrtadm1 = array(
+    protected const SQRTADM1 = array(
         24849947,
         -153582,
         -23613485,
@@ -1506,7 +1501,7 @@ class ParagonIE_Sodium_Core_Curve25519_H extends ParagonIE_Sodium_Core_Util
      *
      * @var array<int, int>
      */
-    protected static $onemsqd = array(
+    protected const ONEMSQD = array(
         6275446,
         -16617371,
         -22938544,
@@ -1523,7 +1518,7 @@ class ParagonIE_Sodium_Core_Curve25519_H extends ParagonIE_Sodium_Core_Util
      * (d - 1) ^ 2
      * @var array<int, int>
      */
-    protected static $sqdmone = array(
+    protected const SQDMONE = array(
         15551795,
         -11097455,
         -13425098,

diff --git a/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core/Ed25519.php b/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core/Ed25519.php
index 3f18c7d49b82d45f1ff136593bc80fce1a160e44..ffae0c335a6f815f134cd1f7dcab9927de322a45 100644 (file)
--- a/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core/Ed25519.php
+++ b/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core/Ed25519.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 if (class_exists('ParagonIE_Sodium_Core_Ed25519', false)) {
     return;
@@ -24,7 +25,7 @@ abstract class ParagonIE_Sodium_Core_Ed25519 extends ParagonIE_Sodium_Core_Curve
      * @throws SodiumException
      * @throws TypeError
      */
-    public static function keypair()
+    public static function keypair(): string
     {
         $seed = random_bytes(self::SEED_BYTES);
         $pk = '';
@@ -43,13 +44,15 @@ abstract class ParagonIE_Sodium_Core_Ed25519 extends ParagonIE_Sodium_Core_Curve
      * @throws SodiumException
      * @throws TypeError
      */
-    public static function seed_keypair(&$pk, &$sk, $seed)
-    {
+    public static function seed_keypair(
+        string &$pk,
+        string &$sk,
+        #[SensitiveParameter]
+        string $seed
+    ): string {
         if (self::strlen($seed) !== self::SEED_BYTES) {
             throw new RangeException('crypto_sign keypair seed must be 32 bytes long');
         }
-
-        /** @var string $pk */
         $pk = self::publickey_from_secretkey($seed);
         $sk = $seed . $pk;
         return $sk;
@@ -62,8 +65,10 @@ abstract class ParagonIE_Sodium_Core_Ed25519 extends ParagonIE_Sodium_Core_Curve
      * @return string
      * @throws TypeError
      */
-    public static function secretkey($keypair)
-    {
+    public static function secretkey(
+        #[SensitiveParameter]
+        string $keypair
+    ): string {
         if (self::strlen($keypair) !== self::KEYPAIR_BYTES) {
             throw new RangeException('crypto_sign keypair must be 96 bytes long');
         }
@@ -77,8 +82,10 @@ abstract class ParagonIE_Sodium_Core_Ed25519 extends ParagonIE_Sodium_Core_Curve
      * @return string
      * @throws TypeError
      */
-    public static function publickey($keypair)
-    {
+    public static function publickey(
+        #[SensitiveParameter]
+        string $keypair
+    ): string {
         if (self::strlen($keypair) !== self::KEYPAIR_BYTES) {
             throw new RangeException('crypto_sign keypair must be 96 bytes long');
         }
@@ -93,8 +100,10 @@ abstract class ParagonIE_Sodium_Core_Ed25519 extends ParagonIE_Sodium_Core_Curve
      * @throws SodiumException
      * @throws TypeError
      */
-    public static function publickey_from_secretkey($sk)
-    {
+    public static function publickey_from_secretkey(
+        #[SensitiveParameter]
+        string $sk
+    ): string {
         /** @var string $sk */
         $sk = hash('sha512', self::substr($sk, 0, 32), true);
         $sk[0] = self::intToChr(
@@ -112,8 +121,9 @@ abstract class ParagonIE_Sodium_Core_Ed25519 extends ParagonIE_Sodium_Core_Curve
      * @throws SodiumException
      * @throws TypeError
      */
-    public static function pk_to_curve25519($pk)
-    {
+    public static function pk_to_curve25519(
+        string $pk
+    ): string {
         if (self::small_order($pk)) {
             throw new SodiumException('Public key is on a small order');
         }
@@ -122,26 +132,16 @@ abstract class ParagonIE_Sodium_Core_Ed25519 extends ParagonIE_Sodium_Core_Curve
         if (!self::fe_isnonzero($p1->X)) {
             throw new SodiumException('Unexpected zero result');
         }
-
-        # fe_1(one_minus_y);
-        # fe_sub(one_minus_y, one_minus_y, A.Y);
-        # fe_invert(one_minus_y, one_minus_y);
         $one_minux_y = self::fe_invert(
             self::fe_sub(
                 self::fe_1(),
                 $A->Y
             )
         );
-
-        # fe_1(x);
-        # fe_add(x, x, A.Y);
-        # fe_mul(x, x, one_minus_y);
         $x = self::fe_mul(
             self::fe_add(self::fe_1(), $A->Y),
             $one_minux_y
         );
-
-        # fe_tobytes(curve25519_pk, x);
         return self::fe_tobytes($x);
     }
 
@@ -153,8 +153,10 @@ abstract class ParagonIE_Sodium_Core_Ed25519 extends ParagonIE_Sodium_Core_Curve
      * @throws SodiumException
      * @throws TypeError
      */
-    public static function sk_to_pk($sk)
-    {
+    public static function sk_to_pk(
+        #[SensitiveParameter]
+        string $sk
+    ): string {
         return self::ge_p3_tobytes(
             self::ge_scalarmult_base(
                 self::substr($sk, 0, 32)
@@ -171,9 +173,11 @@ abstract class ParagonIE_Sodium_Core_Ed25519 extends ParagonIE_Sodium_Core_Curve
      * @throws SodiumException
      * @throws TypeError
      */
-    public static function sign($message, $sk)
-    {
-        /** @var string $signature */
+    public static function sign(
+        string $message,
+        #[SensitiveParameter]
+        string $sk
+    ): string {
         $signature = self::sign_detached($message, $sk);
         return $signature . $message;
     }
@@ -187,9 +191,10 @@ abstract class ParagonIE_Sodium_Core_Ed25519 extends ParagonIE_Sodium_Core_Curve
      * @throws SodiumException
      * @throws TypeError
      */
-    public static function sign_open($message, $pk)
-    {
-        /** @var string $signature */
+    public static function sign_open(
+        string $message,
+        string $pk
+    ): string {
         $signature = self::substr($message, 0, 64);
 
         /** @var string $message */
@@ -210,56 +215,41 @@ abstract class ParagonIE_Sodium_Core_Ed25519 extends ParagonIE_Sodium_Core_Curve
      * @throws SodiumException
      * @throws TypeError
      */
-    public static function sign_detached($message, $sk)
-    {
-        # crypto_hash_sha512(az, sk, 32);
+    public static function sign_detached(
+        string $message,
+        #[SensitiveParameter]
+        string $sk
+    ): string {
         $az =  hash('sha512', self::substr($sk, 0, 32), true);
 
-        # az[0] &= 248;
-        # az[31] &= 63;
-        # az[31] |= 64;
         $az[0] = self::intToChr(self::chrToInt($az[0]) & 248);
         $az[31] = self::intToChr((self::chrToInt($az[31]) & 63) | 64);
 
-        # crypto_hash_sha512_init(&hs);
-        # crypto_hash_sha512_update(&hs, az + 32, 32);
-        # crypto_hash_sha512_update(&hs, m, mlen);
-        # crypto_hash_sha512_final(&hs, nonce);
         $hs = hash_init('sha512');
         hash_update($hs, self::substr($az, 32, 32));
         hash_update($hs, $message);
         $nonceHash = hash_final($hs, true);
 
-        # memmove(sig + 32, sk + 32, 32);
         $pk = self::substr($sk, 32, 32);
 
-        # sc_reduce(nonce);
-        # ge_scalarmult_base(&R, nonce);
-        # ge_p3_tobytes(sig, &R);
         $nonce = self::sc_reduce($nonceHash) . self::substr($nonceHash, 32);
         $sig = self::ge_p3_tobytes(
             self::ge_scalarmult_base($nonce)
         );
 
-        # crypto_hash_sha512_init(&hs);
-        # crypto_hash_sha512_update(&hs, sig, 64);
-        # crypto_hash_sha512_update(&hs, m, mlen);
-        # crypto_hash_sha512_final(&hs, hram);
         $hs = hash_init('sha512');
         hash_update($hs, self::substr($sig, 0, 32));
         hash_update($hs, self::substr($pk, 0, 32));
         hash_update($hs, $message);
         $hramHash = hash_final($hs, true);
 
-        # sc_reduce(hram);
-        # sc_muladd(sig + 32, hram, az, nonce);
         $hram = self::sc_reduce($hramHash);
         $sigAfter = self::sc_muladd($hram, $az, $nonce);
         $sig = self::substr($sig, 0, 32) . self::substr($sigAfter, 0, 32);
 
         try {
             ParagonIE_Sodium_Compat::memzero($az);
-        } catch (SodiumException $ex) {
+        } catch (SodiumException) {
             $az = null;
         }
         return $sig;
@@ -275,8 +265,11 @@ abstract class ParagonIE_Sodium_Core_Ed25519 extends ParagonIE_Sodium_Core_Curve
      * @throws SodiumException
      * @throws TypeError
      */
-    public static function verify_detached($sig, $message, $pk)
-    {
+    public static function verify_detached(
+        string $sig,
+        string $message,
+        string $pk
+    ): bool {
         if (self::strlen($sig) < 64) {
             throw new SodiumException('Signature is too short');
         }
@@ -297,16 +290,14 @@ abstract class ParagonIE_Sodium_Core_Ed25519 extends ParagonIE_Sodium_Core_Curve
             throw new SodiumException('All zero public key');
         }
 
-        /** @var bool The original value of ParagonIE_Sodium_Compat::$fastMult */
+        /* The original value of ParagonIE_Sodium_Compat::$fastMult */
         $orig = ParagonIE_Sodium_Compat::$fastMult;
 
         // Set ParagonIE_Sodium_Compat::$fastMult to true to speed up verification.
         ParagonIE_Sodium_Compat::$fastMult = true;
 
-        /** @var ParagonIE_Sodium_Core_Curve25519_Ge_P3 $A */
         $A = self::ge_frombytes_negate_vartime($pk);
 
-        /** @var string $hDigest */
         $hDigest = hash(
             'sha512',
             self::substr($sig, 0, 32) .
@@ -314,18 +305,12 @@ abstract class ParagonIE_Sodium_Core_Ed25519 extends ParagonIE_Sodium_Core_Curve
                 $message,
             true
         );
-
-        /** @var string $h */
         $h = self::sc_reduce($hDigest) . self::substr($hDigest, 32);
-
-        /** @var ParagonIE_Sodium_Core_Curve25519_Ge_P2 $R */
         $R = self::ge_double_scalarmult_vartime(
             $h,
             $A,
             self::substr($sig, 32)
         );
-
-        /** @var string $rcheck */
         $rcheck = self::ge_tobytes($R);
 
         // Reset ParagonIE_Sodium_Compat::$fastMult to what it was before.
@@ -342,7 +327,7 @@ abstract class ParagonIE_Sodium_Core_Ed25519 extends ParagonIE_Sodium_Core_Curve
      * @throws SodiumException
      * @throws TypeError
      */
-    public static function check_S_lt_L($S)
+    public static function check_S_lt_L(string $S): bool
     {
         if (self::strlen($S) < 32) {
             throw new SodiumException('Signature must be 32 bytes');
@@ -368,7 +353,6 @@ abstract class ParagonIE_Sodium_Core_Ed25519 extends ParagonIE_Sodium_Core_Curve
                 (($x ^ $L[$i]) - 1) >> 8
             );
         } while ($i !== 0);
-
         return $c === 0;
     }
 
@@ -378,7 +362,7 @@ abstract class ParagonIE_Sodium_Core_Ed25519 extends ParagonIE_Sodium_Core_Curve
      * @throws SodiumException
      * @throws TypeError
      */
-    public static function small_order($R)
+    public static function small_order(string $R): bool
     {
         /** @var array<int, array<int, int>> $blocklist */
         $blocklist = array(
@@ -467,13 +451,11 @@ abstract class ParagonIE_Sodium_Core_Ed25519 extends ParagonIE_Sodium_Core_Curve
                 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
             )
         );
-        /** @var int $countBlocklist */
         $countBlocklist = count($blocklist);
-
         for ($i = 0; $i < $countBlocklist; ++$i) {
             $c = 0;
             for ($j = 0; $j < 32; ++$j) {
-                $c |= self::chrToInt($R[$j]) ^ (int) $blocklist[$i][$j];
+                $c |= self::chrToInt($R[$j]) ^ $blocklist[$i][$j];
             }
             if ($c === 0) {
                 return true;
@@ -487,8 +469,10 @@ abstract class ParagonIE_Sodium_Core_Ed25519 extends ParagonIE_Sodium_Core_Curve
      * @return string
      * @throws SodiumException
      */
-    public static function scalar_complement($s)
-    {
+    public static function scalar_complement(
+        #[SensitiveParameter]
+        string $s
+    ): string {
         $t_ = self::L . str_repeat("\x00", 32);
         sodium_increment($t_);
         $s_ = $s . str_repeat("\x00", 32);
@@ -500,7 +484,7 @@ abstract class ParagonIE_Sodium_Core_Ed25519 extends ParagonIE_Sodium_Core_Curve
      * @return string
      * @throws SodiumException
      */
-    public static function scalar_random()
+    public static function scalar_random(): string
     {
         do {
             $r = ParagonIE_Sodium_Compat::randombytes_buf(self::SCALAR_BYTES);
@@ -518,8 +502,10 @@ abstract class ParagonIE_Sodium_Core_Ed25519 extends ParagonIE_Sodium_Core_Curve
      * @return string
      * @throws SodiumException
      */
-    public static function scalar_negate($s)
-    {
+    public static function scalar_negate(
+        #[SensitiveParameter]
+        string $s
+    ): string {
         $t_ = self::L . str_repeat("\x00", 32) ;
         $s_ = $s . str_repeat("\x00", 32) ;
         ParagonIE_Sodium_Compat::sub($t_, $s_);
@@ -532,8 +518,12 @@ abstract class ParagonIE_Sodium_Core_Ed25519 extends ParagonIE_Sodium_Core_Curve
      * @return string
      * @throws SodiumException
      */
-    public static function scalar_add($a, $b)
-    {
+    public static function scalar_add(
+        #[SensitiveParameter]
+        string $a,
+        #[SensitiveParameter]
+        string $b
+    ): string {
         $a_ = $a . str_repeat("\x00", 32);
         $b_ = $b . str_repeat("\x00", 32);
         ParagonIE_Sodium_Compat::add($a_, $b_);
@@ -546,9 +536,12 @@ abstract class ParagonIE_Sodium_Core_Ed25519 extends ParagonIE_Sodium_Core_Curve
      * @return string
      * @throws SodiumException
      */
-    public static function scalar_sub($x, $y)
-    {
-        $yn = self::scalar_negate($y);
-        return self::scalar_add($x, $yn);
+    public static function scalar_sub(
+        #[SensitiveParameter]
+        string $x,
+        #[SensitiveParameter]
+        string $y
+    ): string {
+        return self::scalar_add($x, self::scalar_negate($y));
     }
 }

diff --git a/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core/HChaCha20.php b/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core/HChaCha20.php
index 947df10fbff2bb3cb76635c447d4844cbdaa731b..54eb6b2ca14780da3066e7fe05b00d2c5701a2c7 100644 (file)
--- a/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core/HChaCha20.php
+++ b/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core/HChaCha20.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 if (class_exists('ParagonIE_Sodium_Core_HChaCha20', false)) {
     return;
@@ -16,8 +17,12 @@ class ParagonIE_Sodium_Core_HChaCha20 extends ParagonIE_Sodium_Core_ChaCha20
      * @return string
      * @throws TypeError
      */
-    public static function hChaCha20($in = '', $key = '', $c = null)
-    {
+    public static function hChaCha20(
+        string $in = '',
+        #[SensitiveParameter]
+        string $key = '',
+        ?string $c = null
+    ): string {
         $ctx = array();
 
         if ($c === null) {
@@ -51,7 +56,7 @@ class ParagonIE_Sodium_Core_HChaCha20 extends ParagonIE_Sodium_Core_ChaCha20
      * @return string
      * @throws TypeError
      */
-    protected static function hChaCha20Bytes(array $ctx)
+    protected static function hChaCha20Bytes(array $ctx): string
     {
         $x0  = (int) $ctx[0];
         $x1  = (int) $ctx[1];
@@ -71,38 +76,24 @@ class ParagonIE_Sodium_Core_HChaCha20 extends ParagonIE_Sodium_Core_ChaCha20
         $x15 = (int) $ctx[15];
 
         for ($i = 0; $i < 10; ++$i) {
-            # QUARTERROUND( x0,  x4,  x8,  x12)
-            list($x0, $x4, $x8, $x12) = self::quarterRound($x0, $x4, $x8, $x12);
-
-            # QUARTERROUND( x1,  x5,  x9,  x13)
-            list($x1, $x5, $x9, $x13) = self::quarterRound($x1, $x5, $x9, $x13);
-
-            # QUARTERROUND( x2,  x6,  x10,  x14)
-            list($x2, $x6, $x10, $x14) = self::quarterRound($x2, $x6, $x10, $x14);
-
-            # QUARTERROUND( x3,  x7,  x11,  x15)
-            list($x3, $x7, $x11, $x15) = self::quarterRound($x3, $x7, $x11, $x15);
-
-            # QUARTERROUND( x0,  x5,  x10,  x15)
-            list($x0, $x5, $x10, $x15) = self::quarterRound($x0, $x5, $x10, $x15);
-
-            # QUARTERROUND( x1,  x6,  x11,  x12)
-            list($x1, $x6, $x11, $x12) = self::quarterRound($x1, $x6, $x11, $x12);
-
-            # QUARTERROUND( x2,  x7,  x8,  x13)
-            list($x2, $x7, $x8, $x13) = self::quarterRound($x2, $x7, $x8, $x13);
+            [$x0, $x4, $x8, $x12] = self::quarterRound($x0, $x4, $x8, $x12);
+            [$x1, $x5, $x9, $x13] = self::quarterRound($x1, $x5, $x9, $x13);
+            [$x2, $x6, $x10, $x14] = self::quarterRound($x2, $x6, $x10, $x14);
+            [$x3, $x7, $x11, $x15] = self::quarterRound($x3, $x7, $x11, $x15);
 
-            # QUARTERROUND( x3,  x4,  x9,  x14)
-            list($x3, $x4, $x9, $x14) = self::quarterRound($x3, $x4, $x9, $x14);
+            [$x0, $x5, $x10, $x15] = self::quarterRound($x0, $x5, $x10, $x15);
+            [$x1, $x6, $x11, $x12] = self::quarterRound($x1, $x6, $x11, $x12);
+            [$x2, $x7, $x8, $x13] = self::quarterRound($x2, $x7, $x8, $x13);
+            [$x3, $x4, $x9, $x14] = self::quarterRound($x3, $x4, $x9, $x14);
         }
 
-        return self::store32_le((int) ($x0  & 0xffffffff)) .
-            self::store32_le((int) ($x1  & 0xffffffff)) .
-            self::store32_le((int) ($x2  & 0xffffffff)) .
-            self::store32_le((int) ($x3  & 0xffffffff)) .
-            self::store32_le((int) ($x12 & 0xffffffff)) .
-            self::store32_le((int) ($x13 & 0xffffffff)) .
-            self::store32_le((int) ($x14 & 0xffffffff)) .
-            self::store32_le((int) ($x15 & 0xffffffff));
+        return self::store32_le(($x0  & 0xffffffff)) .
+            self::store32_le(($x1  & 0xffffffff)) .
+            self::store32_le(($x2  & 0xffffffff)) .
+            self::store32_le(($x3  & 0xffffffff)) .
+            self::store32_le(($x12 & 0xffffffff)) .
+            self::store32_le(($x13 & 0xffffffff)) .
+            self::store32_le(($x14 & 0xffffffff)) .
+            self::store32_le(($x15 & 0xffffffff));
     }
 }

diff --git a/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core/HSalsa20.php b/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core/HSalsa20.php
index 35ee79edb839d3d1e4ff5fd931ec1218f1d885d9..85e703084481b65dce869c7fe97fa38a405586e4 100644 (file)
--- a/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core/HSalsa20.php
+++ b/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core/HSalsa20.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 if (class_exists('ParagonIE_Sodium_Core_HSalsa20', false)) {
     return;
@@ -23,8 +24,12 @@ abstract class ParagonIE_Sodium_Core_HSalsa20 extends ParagonIE_Sodium_Core_Sals
      * @return string
      * @throws TypeError
      */
-    public static function hsalsa20($in, $k, $c = null)
-    {
+    public static function hsalsa20(
+        string $in,
+        #[SensitiveParameter]
+        string $k,
+        ?string $c = null
+    ): string {
         if ($c === null) {
             $x0  = 0x61707865;
             $x5  = 0x3320646e;

diff --git a/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core/Poly1305.php b/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core/Poly1305.php
index 330182177e32e00a5f89a065742cfe5c1aa4e2da..5f0767ef6a416ffcbf993da5ef74119b4e310559 100644 (file)
--- a/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core/Poly1305.php
+++ b/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core/Poly1305.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 if (class_exists('ParagonIE_Sodium_Core_Poly1305', false)) {
     return;
@@ -20,8 +21,11 @@ abstract class ParagonIE_Sodium_Core_Poly1305 extends ParagonIE_Sodium_Core_Util
      * @throws SodiumException
      * @throws TypeError
      */
-    public static function onetimeauth($m, $key)
-    {
+    public static function onetimeauth(
+        string $m,
+        #[SensitiveParameter]
+        string $key
+    ): string {
         if (self::strlen($key) < 32) {
             throw new InvalidArgumentException(
                 'Key must be 32 bytes long.'
@@ -45,8 +49,12 @@ abstract class ParagonIE_Sodium_Core_Poly1305 extends ParagonIE_Sodium_Core_Util
      * @throws SodiumException
      * @throws TypeError
      */
-    public static function onetimeauth_verify($mac, $m, $key)
-    {
+    public static function onetimeauth_verify(
+        string $mac,
+        string $m,
+        #[SensitiveParameter]
+        string $key
+    ): bool {
         if (self::strlen($key) < 32) {
             throw new InvalidArgumentException(
                 'Key must be 32 bytes long.'

diff --git a/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core/Poly1305/State.php b/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core/Poly1305/State.php
index cfaeb0b1ed5f3058cf8c9b296ea51a6abed0bba2..f6f153a2aa06ff12e0a3a8069382ff4f98b1370f 100644 (file)
--- a/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core/Poly1305/State.php
+++ b/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core/Poly1305/State.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 if (class_exists('ParagonIE_Sodium_Core_Poly1305_State', false)) {
     return;
@@ -12,32 +13,23 @@ class ParagonIE_Sodium_Core_Poly1305_State extends ParagonIE_Sodium_Core_Util
     /**
      * @var array<int, int>
      */
-    protected $buffer = array();
-
-    /**
-     * @var bool
-     */
-    protected $final = false;
-
+    protected array $buffer = array();
+    protected bool $final = false;
     /**
      * @var array<int, int>
      */
-    public $h;
-
-    /**
-     * @var int
-     */
-    protected $leftover = 0;
+    public array $h;
+    protected int $leftover = 0;
 
     /**
      * @var int[]
      */
-    public $r;
+    public array $r;
 
     /**
      * @var int[]
      */
-    public $pad;
+    public array $pad;
 
     /**
      * ParagonIE_Sodium_Core_Poly1305_State constructor.
@@ -48,7 +40,7 @@ class ParagonIE_Sodium_Core_Poly1305_State extends ParagonIE_Sodium_Core_Util
      * @throws InvalidArgumentException
      * @throws TypeError
      */
-    public function __construct($key = '')
+    public function __construct(string $key = '')
     {
         if (self::strlen($key) < 32) {
             throw new InvalidArgumentException(
@@ -57,11 +49,11 @@ class ParagonIE_Sodium_Core_Poly1305_State extends ParagonIE_Sodium_Core_Util
         }
         /* r &= 0xffffffc0ffffffc0ffffffc0fffffff */
         $this->r = array(
-            (int) ((self::load_4(self::substr($key, 0, 4))) & 0x3ffffff),
-            (int) ((self::load_4(self::substr($key, 3, 4)) >> 2) & 0x3ffff03),
-            (int) ((self::load_4(self::substr($key, 6, 4)) >> 4) & 0x3ffc0ff),
-            (int) ((self::load_4(self::substr($key, 9, 4)) >> 6) & 0x3f03fff),
-            (int) ((self::load_4(self::substr($key, 12, 4)) >> 8) & 0x00fffff)
+            ((self::load_4(self::substr($key, 0, 4))) & 0x3ffffff),
+            ((self::load_4(self::substr($key, 3, 4)) >> 2) & 0x3ffff03),
+            ((self::load_4(self::substr($key, 6, 4)) >> 4) & 0x3ffc0ff),
+            ((self::load_4(self::substr($key, 9, 4)) >> 6) & 0x3f03fff),
+            ((self::load_4(self::substr($key, 12, 4)) >> 8) & 0x00fffff)
         );
 
         /* h = 0 */
@@ -110,7 +102,7 @@ class ParagonIE_Sodium_Core_Poly1305_State extends ParagonIE_Sodium_Core_Util
      * @throws SodiumException
      * @throws TypeError
      */
-    public function update($message = '')
+    public function update(string $message = ''): self
     {
         $bytes = self::strlen($message);
         if ($bytes < 1) {
@@ -163,7 +155,7 @@ class ParagonIE_Sodium_Core_Poly1305_State extends ParagonIE_Sodium_Core_Util
                 $mi = self::chrToInt($message[$i]);
                 $this->buffer[$this->leftover + $i] = $mi;
             }
-            $this->leftover = (int) $this->leftover + $bytes;
+            $this->leftover = $this->leftover + $bytes;
         }
         return $this;
     }
@@ -173,21 +165,20 @@ class ParagonIE_Sodium_Core_Poly1305_State extends ParagonIE_Sodium_Core_Util
      *
      * @param string $message
      * @param int $bytes
-     * @return self
+     * @return static
      * @throws TypeError
      */
-    public function blocks($message, $bytes)
+    public function blocks(string $message, int $bytes): static
     {
         if (self::strlen($message) < 16) {
-            $message = str_pad($message, 16, "\x00", STR_PAD_RIGHT);
+            $message = str_pad($message, 16, "\x00");
         }
-        /** @var int $hibit */
         $hibit = $this->final ? 0 : 1 << 24; /* 1 << 128 */
-        $r0 = (int) $this->r[0];
-        $r1 = (int) $this->r[1];
-        $r2 = (int) $this->r[2];
-        $r3 = (int) $this->r[3];
-        $r4 = (int) $this->r[4];
+        $r0 = $this->r[0];
+        $r1 = $this->r[1];
+        $r2 = $this->r[2];
+        $r3 = $this->r[3];
+        $r4 = $this->r[4];
 
         $s1 = self::mul($r1, 5, 3);
         $s2 = self::mul($r2, 5, 3);
@@ -250,39 +241,27 @@ class ParagonIE_Sodium_Core_Poly1305_State extends ParagonIE_Sodium_Core_Util
             );
 
             /* (partial) h %= p */
-            /** @var int $c */
             $c = $d0 >> 26;
-            /** @var int $h0 */
             $h0 = $d0 & 0x3ffffff;
             $d1 += $c;
 
-            /** @var int $c */
             $c = $d1 >> 26;
-            /** @var int $h1 */
             $h1 = $d1 & 0x3ffffff;
             $d2 += $c;
 
-            /** @var int $c */
             $c = $d2 >> 26;
-            /** @var int $h2  */
             $h2 = $d2 & 0x3ffffff;
             $d3 += $c;
 
-            /** @var int $c */
             $c = $d3 >> 26;
-            /** @var int $h3 */
             $h3 = $d3 & 0x3ffffff;
             $d4 += $c;
 
-            /** @var int $c */
             $c = $d4 >> 26;
-            /** @var int $h4 */
             $h4 = $d4 & 0x3ffffff;
-            $h0 += (int) self::mul($c, 5, 3);
+            $h0 += self::mul($c, 5, 3);
 
-            /** @var int $c */
             $c = $h0 >> 26;
-            /** @var int $h0 */
             $h0 &= 0x3ffffff;
             $h1 += $c;
 
@@ -295,11 +274,11 @@ class ParagonIE_Sodium_Core_Poly1305_State extends ParagonIE_Sodium_Core_Util
         }
 
         $this->h = array(
-            (int) ($h0 & 0xffffffff),
-            (int) ($h1 & 0xffffffff),
-            (int) ($h2 & 0xffffffff),
-            (int) ($h3 & 0xffffffff),
-            (int) ($h4 & 0xffffffff)
+            ($h0 & 0xffffffff),
+            ($h1 & 0xffffffff),
+            ($h2 & 0xffffffff),
+            ($h3 & 0xffffffff),
+            ($h4 & 0xffffffff)
         );
         return $this;
     }
@@ -310,7 +289,7 @@ class ParagonIE_Sodium_Core_Poly1305_State extends ParagonIE_Sodium_Core_Util
      * @return string
      * @throws TypeError
      */
-    public function finish()
+    public function finish(): string
     {
         /* process the remaining block */
         if ($this->leftover) {
@@ -330,11 +309,11 @@ class ParagonIE_Sodium_Core_Poly1305_State extends ParagonIE_Sodium_Core_Util
             );
         }
 
-        $h0 = (int) $this->h[0];
-        $h1 = (int) $this->h[1];
-        $h2 = (int) $this->h[2];
-        $h3 = (int) $this->h[3];
-        $h4 = (int) $this->h[4];
+        $h0 = $this->h[0];
+        $h1 = $this->h[1];
+        $h2 = $this->h[2];
+        $h3 = $this->h[3];
+        $h4 = $this->h[4];
 
         /** @var int $c */
         $c = $h1 >> 26;
@@ -428,14 +407,14 @@ class ParagonIE_Sodium_Core_Poly1305_State extends ParagonIE_Sodium_Core_Util
         $h3 = (($h3 >> 18) | ($h4 <<  8)) & 0xffffffff;
 
         /* mac = (h + pad) % (2^128) */
-        $f = (int) ($h0 + $this->pad[0]);
-        $h0 = (int) $f;
-        $f = (int) ($h1 + $this->pad[1] + ($f >> 32));
-        $h1 = (int) $f;
-        $f = (int) ($h2 + $this->pad[2] + ($f >> 32));
-        $h2 = (int) $f;
-        $f = (int) ($h3 + $this->pad[3] + ($f >> 32));
-        $h3 = (int) $f;
+        $f = ($h0 + $this->pad[0]);
+        $h0 = $f;
+        $f = ($h1 + $this->pad[1] + ($f >> 32));
+        $h1 = $f;
+        $f = ($h2 + $this->pad[2] + ($f >> 32));
+        $h2 = $f;
+        $f = ($h3 + $this->pad[3] + ($f >> 32));
+        $h3 = $f;
 
         return self::store32_le($h0 & 0xffffffff) .
             self::store32_le($h1 & 0xffffffff) .

diff --git a/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core/Ristretto255.php b/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core/Ristretto255.php
index 2727260d2163af817fdc4f15fd6ec35397122e9f..364cfea45bd62c712a556ebf3e034baf0a2c36df 100644 (file)
--- a/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core/Ristretto255.php
+++ b/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core/Ristretto255.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 /**
  * Class ParagonIE_Sodium_Core_Ristretto255
@@ -15,8 +16,10 @@ class ParagonIE_Sodium_Core_Ristretto255 extends ParagonIE_Sodium_Core_Ed25519
      * @param int $b
      * @return ParagonIE_Sodium_Core_Curve25519_Fe
      */
-    public static function fe_cneg(ParagonIE_Sodium_Core_Curve25519_Fe $f, $b)
-    {
+    public static function fe_cneg(
+        ParagonIE_Sodium_Core_Curve25519_Fe $f,
+        int $b
+    ): ParagonIE_Sodium_Core_Curve25519_Fe {
         $negf = self::fe_neg($f);
         return self::fe_cmov($f, $negf, $b);
     }
@@ -26,8 +29,9 @@ class ParagonIE_Sodium_Core_Ristretto255 extends ParagonIE_Sodium_Core_Ed25519
      * @return ParagonIE_Sodium_Core_Curve25519_Fe
      * @throws SodiumException
      */
-    public static function fe_abs(ParagonIE_Sodium_Core_Curve25519_Fe $f)
-    {
+    public static function fe_abs(
+        ParagonIE_Sodium_Core_Curve25519_Fe $f
+    ): ParagonIE_Sodium_Core_Curve25519_Fe {
         return self::fe_cneg($f, self::fe_isnegative($f));
     }
 
@@ -40,7 +44,7 @@ class ParagonIE_Sodium_Core_Ristretto255 extends ParagonIE_Sodium_Core_Ed25519
      * @return int
      * @throws SodiumException
      */
-    public static function fe_iszero(ParagonIE_Sodium_Core_Curve25519_Fe $f)
+    public static function fe_iszero(ParagonIE_Sodium_Core_Curve25519_Fe $f): int
     {
         static $zero;
         if ($zero === null) {
@@ -67,8 +71,8 @@ class ParagonIE_Sodium_Core_Ristretto255 extends ParagonIE_Sodium_Core_Ed25519
     public static function ristretto255_sqrt_ratio_m1(
         ParagonIE_Sodium_Core_Curve25519_Fe $u,
         ParagonIE_Sodium_Core_Curve25519_Fe $v
-    ) {
-        $sqrtm1 = ParagonIE_Sodium_Core_Curve25519_Fe::fromArray(self::$sqrtm1);
+    ): array {
+        $sqrtm1 = ParagonIE_Sodium_Core_Curve25519_Fe::fromArray(self::SQRTM1);
 
         $v3 = self::fe_mul(
             self::fe_sq($v),
@@ -120,8 +124,10 @@ class ParagonIE_Sodium_Core_Ristretto255 extends ParagonIE_Sodium_Core_Ed25519
      * @return int
      * @throws SodiumException
      */
-    public static function ristretto255_point_is_canonical($s)
-    {
+    public static function ristretto255_point_is_canonical(
+        #[SensitiveParameter]
+        string $s
+    ): int {
         $c = (self::chrToInt($s[31]) & 0x7f) ^ 0x7f;
         for ($i = 30; $i > 0; --$i) {
             $c |= self::chrToInt($s[$i]) ^ 0xff;
@@ -139,8 +145,11 @@ class ParagonIE_Sodium_Core_Ristretto255 extends ParagonIE_Sodium_Core_Ed25519
      * @return array{h: ParagonIE_Sodium_Core_Curve25519_Ge_P3, res: int}
      * @throws SodiumException
      */
-    public static function ristretto255_frombytes($s, $skipCanonicalCheck = false)
-    {
+    public static function ristretto255_frombytes(
+        #[SensitiveParameter]
+        string $s,
+        bool $skipCanonicalCheck = false
+    ): array {
         if (!$skipCanonicalCheck) {
             if (!self::ristretto255_point_is_canonical($s)) {
                 throw new SodiumException('S is not canonical');
@@ -157,15 +166,13 @@ class ParagonIE_Sodium_Core_Ristretto255 extends ParagonIE_Sodium_Core_Ed25519
         $u2u2 = self::fe_sq($u2); /* u2u2 = u2^2 */
 
         $v = self::fe_mul(
-            ParagonIE_Sodium_Core_Curve25519_Fe::fromArray(self::$d),
+            ParagonIE_Sodium_Core_Curve25519_Fe::fromArray(self::D),
             $u1u1
         ); /* v = d*u1^2 */
         $v = self::fe_neg($v); /* v = -d*u1^2 */
         $v = self::fe_sub($v, $u2u2); /* v = -(d*u1^2)-u2^2 */
         $v_u2u2 = self::fe_mul($v, $u2u2); /* v_u2u2 = v*u2^2 */
 
-        // fe25519_1(one);
-        // notsquare = ristretto255_sqrt_ratio_m1(inv_sqrt, one, v_u2u2);
         $one = self::fe_1();
         $result = self::ristretto255_sqrt_ratio_m1($one, $v_u2u2);
         $inv_sqrt = $result['x'];
@@ -193,10 +200,11 @@ class ParagonIE_Sodium_Core_Ristretto255 extends ParagonIE_Sodium_Core_Ed25519
      * @return string
      * @throws SodiumException
      */
-    public static function ristretto255_p3_tobytes(ParagonIE_Sodium_Core_Curve25519_Ge_P3 $h)
-    {
-        $sqrtm1 = ParagonIE_Sodium_Core_Curve25519_Fe::fromArray(self::$sqrtm1);
-        $invsqrtamd = ParagonIE_Sodium_Core_Curve25519_Fe::fromArray(self::$invsqrtamd);
+    public static function ristretto255_p3_tobytes(
+        ParagonIE_Sodium_Core_Curve25519_Ge_P3 $h
+    ): string {
+        $sqrtm1 = ParagonIE_Sodium_Core_Curve25519_Fe::fromArray(self::SQRTM1);
+        $invsqrtamd = ParagonIE_Sodium_Core_Curve25519_Fe::fromArray(self::INVSQRTAMD);
 
         $u1 = self::fe_add($h->Z, $h->Y); /* u1 = Z+Y */
         $zmy = self::fe_sub($h->Z, $h->Y); /* zmy = Z-Y */
@@ -206,8 +214,6 @@ class ParagonIE_Sodium_Core_Ristretto255 extends ParagonIE_Sodium_Core_Ed25519
         $u1_u2u2 = self::fe_mul(self::fe_sq($u2), $u1); /* u1_u2u2 = u1*u2^2 */
         $one = self::fe_1();
 
-        // fe25519_1(one);
-        // (void) ristretto255_sqrt_ratio_m1(inv_sqrt, one, u1_u2u2);
         $result = self::ristretto255_sqrt_ratio_m1($one, $u1_u2u2);
         $inv_sqrt = $result['x'];
 
@@ -222,9 +228,9 @@ class ParagonIE_Sodium_Core_Ristretto255 extends ParagonIE_Sodium_Core_Ed25519
         $t_z_inv =  self::fe_mul($h->T, $z_inv); /* t_z_inv = T*z_inv */
         $rotate = self::fe_isnegative($t_z_inv);
 
-        $x_ = self::fe_copy($h->X);
-        $y_ = self::fe_copy($h->Y);
-        $den_inv = self::fe_copy($den2);
+        $x_ = clone $h->X;
+        $y_ = clone $h->Y;
+        $den_inv = clone $den2;
 
         $x_ = self::fe_cmov($x_, $iy, $rotate);
         $y_ = self::fe_cmov($y_, $ix, $rotate);
@@ -234,10 +240,6 @@ class ParagonIE_Sodium_Core_Ristretto255 extends ParagonIE_Sodium_Core_Ed25519
         $y_ = self::fe_cneg($y_, self::fe_isnegative($x_z_inv));
 
 
-        // fe25519_sub(s_, h->Z, y_);
-        // fe25519_mul(s_, den_inv, s_);
-        // fe25519_abs(s_, s_);
-        // fe25519_tobytes(s, s_);
         return self::fe_tobytes(
             self::fe_abs(
                 self::fe_mul(
@@ -254,13 +256,14 @@ class ParagonIE_Sodium_Core_Ristretto255 extends ParagonIE_Sodium_Core_Ed25519
      *
      * @throws SodiumException
      */
-    public static function ristretto255_elligator(ParagonIE_Sodium_Core_Curve25519_Fe $t)
-    {
-        $sqrtm1   = ParagonIE_Sodium_Core_Curve25519_Fe::fromArray(self::$sqrtm1);
-        $onemsqd  = ParagonIE_Sodium_Core_Curve25519_Fe::fromArray(self::$onemsqd);
-        $d        = ParagonIE_Sodium_Core_Curve25519_Fe::fromArray(self::$d);
-        $sqdmone  = ParagonIE_Sodium_Core_Curve25519_Fe::fromArray(self::$sqdmone);
-        $sqrtadm1 = ParagonIE_Sodium_Core_Curve25519_Fe::fromArray(self::$sqrtadm1);
+    public static function ristretto255_elligator(
+        ParagonIE_Sodium_Core_Curve25519_Fe $t
+    ): ParagonIE_Sodium_Core_Curve25519_Ge_P3 {
+        $sqrtm1   = ParagonIE_Sodium_Core_Curve25519_Fe::fromArray(self::SQRTM1);
+        $onemsqd  = ParagonIE_Sodium_Core_Curve25519_Fe::fromArray(self::ONEMSQD);
+        $d        = ParagonIE_Sodium_Core_Curve25519_Fe::fromArray(self::D);
+        $sqdmone  = ParagonIE_Sodium_Core_Curve25519_Fe::fromArray(self::SQDMONE);
+        $sqrtadm1 = ParagonIE_Sodium_Core_Curve25519_Fe::fromArray(self::SQRTADM1);
 
         $one = self::fe_1();
         $r   = self::fe_mul($sqrtm1, self::fe_sq($t));         /* r = sqrt(-1)*t^2 */
@@ -288,10 +291,6 @@ class ParagonIE_Sodium_Core_Ristretto255 extends ParagonIE_Sodium_Core_Ed25519
         $s = self::fe_cmov($s, $s_prime, $wasnt_square);
         $c = self::fe_cmov($c, $r, $wasnt_square);
 
-        // fe25519_sub(n, r, one);            /* n = r-1 */
-        // fe25519_mul(n, n, c);              /* n = c*(r-1) */
-        // fe25519_mul(n, n, ed25519_sqdmone); /* n = c*(r-1)*(d-1)^2 */
-        // fe25519_sub(n, n, v);              /* n =  c*(r-1)*(d-1)^2-v */
         $n = self::fe_sub(
             self::fe_mul(
                 self::fe_mul(
@@ -326,30 +325,23 @@ class ParagonIE_Sodium_Core_Ristretto255 extends ParagonIE_Sodium_Core_Ed25519
      * @return string
      * @throws SodiumException
      */
-    public static function ristretto255_from_hash($h)
-    {
+    public static function ristretto255_from_hash(
+        #[SensitiveParameter]
+        string $h
+    ): string {
         if (self::strlen($h) !== 64) {
             throw new SodiumException('Hash must be 64 bytes');
         }
-        //fe25519_frombytes(r0, h);
-        //fe25519_frombytes(r1, h + 32);
         $r0 = self::fe_frombytes(self::substr($h, 0, 32));
         $r1 = self::fe_frombytes(self::substr($h, 32, 32));
 
-        //ristretto255_elligator(&p0, r0);
-        //ristretto255_elligator(&p1, r1);
         $p0 = self::ristretto255_elligator($r0);
         $p1 = self::ristretto255_elligator($r1);
 
-        //ge25519_p3_to_cached(&p1_cached, &p1);
-        //ge25519_add_cached(&p_p1p1, &p0, &p1_cached);
         $p_p1p1 = self::ge_add(
             $p0,
             self::ge_p3_to_cached($p1)
         );
-
-        //ge25519_p1p1_to_p3(&p, &p_p1p1);
-        //ristretto255_p3_tobytes(s, &p);
         return self::ristretto255_p3_tobytes(
             self::ge_p1p1_to_p3($p_p1p1)
         );
@@ -360,8 +352,10 @@ class ParagonIE_Sodium_Core_Ristretto255 extends ParagonIE_Sodium_Core_Ed25519
      * @return int
      * @throws SodiumException
      */
-    public static function is_valid_point($p)
-    {
+    public static function is_valid_point(
+        #[SensitiveParameter]
+        string $p
+    ): int {
         $result = self::ristretto255_frombytes($p);
         if ($result['res'] !== 0) {
             return 0;
@@ -375,8 +369,10 @@ class ParagonIE_Sodium_Core_Ristretto255 extends ParagonIE_Sodium_Core_Ed25519
      * @return string
      * @throws SodiumException
      */
-    public static function ristretto255_add($p, $q)
-    {
+    public static function ristretto255_add(
+        string $p,
+        string $q
+    ): string {
         $p_res = self::ristretto255_frombytes($p);
         $q_res = self::ristretto255_frombytes($q);
         if ($p_res['res'] !== 0 || $q_res['res'] !== 0) {
@@ -396,8 +392,12 @@ class ParagonIE_Sodium_Core_Ristretto255 extends ParagonIE_Sodium_Core_Ed25519
      * @return string
      * @throws SodiumException
      */
-    public static function ristretto255_sub($p, $q)
-    {
+    public static function ristretto255_sub(
+        #[SensitiveParameter]
+        string $p,
+        #[SensitiveParameter]
+        string $q
+    ): string {
         $p_res = self::ristretto255_frombytes($p);
         $q_res = self::ristretto255_frombytes($q);
         if ($p_res['res'] !== 0 || $q_res['res'] !== 0) {
@@ -418,41 +418,48 @@ class ParagonIE_Sodium_Core_Ristretto255 extends ParagonIE_Sodium_Core_Ed25519
      * @param string $msg
      * @return string
      * @throws SodiumException
-     * @psalm-suppress PossiblyInvalidArgument hash API
      */
-    protected static function h2c_string_to_hash_sha256($hLen, $ctx, $msg)
-    {
+    protected static function h2c_string_to_hash_sha256(
+        int $hLen,
+        #[SensitiveParameter]
+        ?string $ctx,
+        #[SensitiveParameter]
+        string $msg
+    ): string {
         $h = array_fill(0, $hLen, 0);
-        $ctx_len = !is_null($ctx) ? self::strlen($ctx) : 0;
+        if (is_null($ctx)) {
+            $ctx = '';
+        }
+        $ctx_len = self::strlen($ctx);
         if ($hLen > 0xff) {
             throw new SodiumException('Hash must be less than 256 bytes');
         }
 
         if ($ctx_len > 0xff) {
             $st = hash_init('sha256');
-            self::hash_update($st, "H2C-OVERSIZE-DST-");
-            self::hash_update($st, $ctx);
+            hash_update($st, "H2C-OVERSIZE-DST-");
+            hash_update($st, $ctx);
             $ctx = hash_final($st, true);
             $ctx_len = 32;
         }
         $t = array(0, $hLen, 0);
         $ux = str_repeat("\0", 64);
         $st = hash_init('sha256');
-        self::hash_update($st, $ux);
-        self::hash_update($st, $msg);
-        self::hash_update($st, self::intArrayToString($t));
-        self::hash_update($st, $ctx);
-        self::hash_update($st, self::intToChr($ctx_len));
+        hash_update($st, $ux);
+        hash_update($st, $msg);
+        hash_update($st, self::intArrayToString($t));
+        hash_update($st, $ctx);
+        hash_update($st, self::intToChr($ctx_len));
         $u0 = hash_final($st, true);
 
         for ($i = 0; $i < $hLen; $i += 64) {
             $ux = self::xorStrings($ux, $u0);
             ++$t[2];
             $st = hash_init('sha256');
-            self::hash_update($st, $ux);
-            self::hash_update($st, self::intToChr($t[2]));
-            self::hash_update($st, $ctx);
-            self::hash_update($st, self::intToChr($ctx_len));
+            hash_update($st, $ux);
+            hash_update($st, self::intToChr($t[2]));
+            hash_update($st, $ctx);
+            hash_update($st, self::intToChr($ctx_len));
             $ux = hash_final($st, true);
             $amount = min($hLen - $i, 64);
             for ($j = 0; $j < $amount; ++$j) {
@@ -468,41 +475,48 @@ class ParagonIE_Sodium_Core_Ristretto255 extends ParagonIE_Sodium_Core_Ed25519
      * @param string $msg
      * @return string
      * @throws SodiumException
-     * @psalm-suppress PossiblyInvalidArgument hash API
      */
-    protected static function h2c_string_to_hash_sha512($hLen, $ctx, $msg)
-    {
+    protected static function h2c_string_to_hash_sha512(
+        int $hLen,
+        #[SensitiveParameter]
+        ?string $ctx,
+        #[SensitiveParameter]
+        string $msg
+    ): string {
         $h = array_fill(0, $hLen, 0);
-        $ctx_len = !is_null($ctx) ? self::strlen($ctx) : 0;
+        if (is_null($ctx)) {
+            $ctx = '';
+        }
+        $ctx_len = self::strlen($ctx);
         if ($hLen > 0xff) {
             throw new SodiumException('Hash must be less than 256 bytes');
         }
 
         if ($ctx_len > 0xff) {
             $st = hash_init('sha256');
-            self::hash_update($st, "H2C-OVERSIZE-DST-");
-            self::hash_update($st, $ctx);
+            hash_update($st, "H2C-OVERSIZE-DST-");
+            hash_update($st, $ctx);
             $ctx = hash_final($st, true);
             $ctx_len = 32;
         }
         $t = array(0, $hLen, 0);
         $ux = str_repeat("\0", 128);
         $st = hash_init('sha512');
-        self::hash_update($st, $ux);
-        self::hash_update($st, $msg);
-        self::hash_update($st, self::intArrayToString($t));
-        self::hash_update($st, $ctx);
-        self::hash_update($st, self::intToChr($ctx_len));
+        hash_update($st, $ux);
+        hash_update($st, $msg);
+        hash_update($st, self::intArrayToString($t));
+        hash_update($st, $ctx);
+        hash_update($st, self::intToChr($ctx_len));
         $u0 = hash_final($st, true);
 
         for ($i = 0; $i < $hLen; $i += 128) {
             $ux = self::xorStrings($ux, $u0);
             ++$t[2];
             $st = hash_init('sha512');
-            self::hash_update($st, $ux);
-            self::hash_update($st, self::intToChr($t[2]));
-            self::hash_update($st, $ctx);
-            self::hash_update($st, self::intToChr($ctx_len));
+            hash_update($st, $ux);
+            hash_update($st, self::intToChr($t[2]));
+            hash_update($st, $ctx);
+            hash_update($st, self::intToChr($ctx_len));
             $ux = hash_final($st, true);
             $amount = min($hLen - $i, 128);
             for ($j = 0; $j < $amount; ++$j) {
@@ -520,16 +534,19 @@ class ParagonIE_Sodium_Core_Ristretto255 extends ParagonIE_Sodium_Core_Ed25519
      * @return string
      * @throws SodiumException
      */
-    public static function h2c_string_to_hash($hLen, $ctx, $msg, $hash_alg)
-    {
-        switch ($hash_alg) {
-            case self::CORE_H2C_SHA256:
-                return self::h2c_string_to_hash_sha256($hLen, $ctx, $msg);
-            case self::CORE_H2C_SHA512:
-                return self::h2c_string_to_hash_sha512($hLen, $ctx, $msg);
-            default:
-                throw new SodiumException('Invalid H2C hash algorithm');
-        }
+    public static function h2c_string_to_hash(
+        int $hLen,
+        #[SensitiveParameter]
+        ?string $ctx,
+        #[SensitiveParameter]
+        string $msg,
+        int $hash_alg
+    ): string {
+        return match ($hash_alg) {
+            self::CORE_H2C_SHA256 => self::h2c_string_to_hash_sha256($hLen, $ctx, $msg),
+            self::CORE_H2C_SHA512 => self::h2c_string_to_hash_sha512($hLen, $ctx, $msg),
+            default => throw new SodiumException('Invalid H2C hash algorithm'),
+        };
     }
 
     /**
@@ -539,8 +556,13 @@ class ParagonIE_Sodium_Core_Ristretto255 extends ParagonIE_Sodium_Core_Ed25519
      * @return string
      * @throws SodiumException
      */
-    protected static function _string_to_element($ctx, $msg, $hash_alg)
-    {
+    protected static function _string_to_element(
+        #[SensitiveParameter]
+        ?string $ctx,
+        #[SensitiveParameter]
+        string $msg,
+        int $hash_alg
+    ): string {
         return self::ristretto255_from_hash(
             self::h2c_string_to_hash(self::crypto_core_ristretto255_HASHBYTES, $ctx, $msg, $hash_alg)
         );
@@ -551,7 +573,7 @@ class ParagonIE_Sodium_Core_Ristretto255 extends ParagonIE_Sodium_Core_Ed25519
      * @throws SodiumException
      * @throws Exception
      */
-    public static function ristretto255_random()
+    public static function ristretto255_random(): string
     {
         return self::ristretto255_from_hash(
             ParagonIE_Sodium_Compat::randombytes_buf(self::crypto_core_ristretto255_HASHBYTES)
@@ -562,7 +584,7 @@ class ParagonIE_Sodium_Core_Ristretto255 extends ParagonIE_Sodium_Core_Ed25519
      * @return string
      * @throws SodiumException
      */
-    public static function ristretto255_scalar_random()
+    public static function ristretto255_scalar_random(): string
     {
         return self::scalar_random();
     }
@@ -572,8 +594,10 @@ class ParagonIE_Sodium_Core_Ristretto255 extends ParagonIE_Sodium_Core_Ed25519
      * @return string
      * @throws SodiumException
      */
-    public static function ristretto255_scalar_complement($s)
-    {
+    public static function ristretto255_scalar_complement(
+        #[SensitiveParameter]
+        string $s
+    ): string {
         return self::scalar_complement($s);
     }
 
@@ -582,8 +606,10 @@ class ParagonIE_Sodium_Core_Ristretto255 extends ParagonIE_Sodium_Core_Ed25519
      * @param string $s
      * @return string
      */
-    public static function ristretto255_scalar_invert($s)
-    {
+    public static function ristretto255_scalar_invert(
+        #[SensitiveParameter]
+        string $s
+    ): string {
         return self::sc25519_invert($s);
     }
 
@@ -592,8 +618,10 @@ class ParagonIE_Sodium_Core_Ristretto255 extends ParagonIE_Sodium_Core_Ed25519
      * @return string
      * @throws SodiumException
      */
-    public static function ristretto255_scalar_negate($s)
-    {
+    public static function ristretto255_scalar_negate(
+        #[SensitiveParameter]
+        string $s
+    ): string {
         return self::scalar_negate($s);
     }
 
@@ -601,9 +629,15 @@ class ParagonIE_Sodium_Core_Ristretto255 extends ParagonIE_Sodium_Core_Ed25519
      * @param string $x
      * @param string $y
      * @return string
+     *
+     * @throws SodiumException
      */
-    public static function ristretto255_scalar_add($x, $y)
-    {
+    public static function ristretto255_scalar_add(
+        #[SensitiveParameter]
+        string $x,
+        #[SensitiveParameter]
+        string $y
+    ): string {
         return self::scalar_add($x, $y);
     }
 
@@ -611,9 +645,15 @@ class ParagonIE_Sodium_Core_Ristretto255 extends ParagonIE_Sodium_Core_Ed25519
      * @param string $x
      * @param string $y
      * @return string
+     *
+     * @throws SodiumException
      */
-    public static function ristretto255_scalar_sub($x, $y)
-    {
+    public static function ristretto255_scalar_sub(
+        #[SensitiveParameter]
+        string $x,
+        #[SensitiveParameter]
+        string $y
+    ): string {
         return self::scalar_sub($x, $y);
     }
 
@@ -622,8 +662,12 @@ class ParagonIE_Sodium_Core_Ristretto255 extends ParagonIE_Sodium_Core_Ed25519
      * @param string $y
      * @return string
      */
-    public static function ristretto255_scalar_mul($x, $y)
-    {
+    public static function ristretto255_scalar_mul(
+        #[SensitiveParameter]
+        string $x,
+        #[SensitiveParameter]
+        string $y
+    ): string {
         return self::sc25519_mul($x, $y);
     }
 
@@ -634,8 +678,13 @@ class ParagonIE_Sodium_Core_Ristretto255 extends ParagonIE_Sodium_Core_Ed25519
      * @return string
      * @throws SodiumException
      */
-    public static function ristretto255_scalar_from_string($ctx, $msg, $hash_alg)
-    {
+    public static function ristretto255_scalar_from_string(
+        #[SensitiveParameter]
+        string $ctx,
+        #[SensitiveParameter]
+        string $msg,
+        int $hash_alg
+    ): string {
         $h = array_fill(0, 64, 0);
         $h_be = self::stringToIntArray(
             self::h2c_string_to_hash(
@@ -653,8 +702,10 @@ class ParagonIE_Sodium_Core_Ristretto255 extends ParagonIE_Sodium_Core_Ed25519
      * @param string $s
      * @return string
      */
-    public static function ristretto255_scalar_reduce($s)
-    {
+    public static function ristretto255_scalar_reduce(
+        #[SensitiveParameter]
+        string $s
+    ): string {
         return self::sc_reduce($s);
     }
 
@@ -664,8 +715,12 @@ class ParagonIE_Sodium_Core_Ristretto255 extends ParagonIE_Sodium_Core_Ed25519
      * @return string
      * @throws SodiumException
      */
-    public static function scalarmult_ristretto255($n, $p)
-    {
+    public static function scalarmult_ristretto255(
+        #[SensitiveParameter]
+        string $n,
+        #[SensitiveParameter]
+        string $p
+    ): string {
         if (self::strlen($n) !== 32) {
             throw new SodiumException('Scalar must be 32 bytes, ' . self::strlen($p) . ' given.');
         }
@@ -693,8 +748,10 @@ class ParagonIE_Sodium_Core_Ristretto255 extends ParagonIE_Sodium_Core_Ed25519
      * @return string
      * @throws SodiumException
      */
-    public static function scalarmult_ristretto255_base($n)
-    {
+    public static function scalarmult_ristretto255_base(
+        #[SensitiveParameter]
+        string $n
+    ): string {
         $t = self::stringToIntArray($n);
         $t[31] &= 0x7f;
         $Q = self::ge_scalarmult_base(self::intArrayToString($t));

diff --git a/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core/Salsa20.php b/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core/Salsa20.php
index 515ccad605cceef5cb285aa094154df75830dd16..1bd47eca53cbcdfce73b7f4f08bf59057e542ecf 100644 (file)
--- a/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core/Salsa20.php
+++ b/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core/Salsa20.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 if (class_exists('ParagonIE_Sodium_Core_Salsa20', false)) {
     return;
@@ -22,8 +23,12 @@ abstract class ParagonIE_Sodium_Core_Salsa20 extends ParagonIE_Sodium_Core_Util
      * @return string
      * @throws TypeError
      */
-    public static function core_salsa20($in, $k, $c = null)
-    {
+    public static function core_salsa20(
+        string $in,
+        #[SensitiveParameter]
+        string $k,
+        ?string $c = null
+    ): string {
         if (self::strlen($k) < 32) {
             throw new RangeException('Key must be 32 bytes long');
         }
@@ -138,16 +143,20 @@ abstract class ParagonIE_Sodium_Core_Salsa20 extends ParagonIE_Sodium_Core_Util
      * @throws SodiumException
      * @throws TypeError
      */
-    public static function salsa20($len, $nonce, $key)
-    {
+    public static function salsa20(
+        int $len,
+        string $nonce,
+        #[SensitiveParameter]
+        string $key
+    ): string {
         if (self::strlen($key) !== 32) {
             throw new RangeException('Key must be 32 bytes long');
         }
-        $kcopy = '' . $key;
+        $kcopy = $key;
         $in = self::substr($nonce, 0, 8) . str_repeat("\0", 8);
         $c = '';
         while ($len >= 64) {
-            $c .= self::core_salsa20($in, $kcopy, null);
+            $c .= self::core_salsa20($in, $kcopy);
             $u = 1;
             // Internal counter.
             for ($i = 8; $i < 16; ++$i) {
@@ -159,14 +168,14 @@ abstract class ParagonIE_Sodium_Core_Salsa20 extends ParagonIE_Sodium_Core_Util
         }
         if ($len > 0) {
             $c .= self::substr(
-                self::core_salsa20($in, $kcopy, null),
+                self::core_salsa20($in, $kcopy),
                 0,
                 $len
             );
         }
         try {
             ParagonIE_Sodium_Compat::memzero($kcopy);
-        } catch (SodiumException $ex) {
+        } catch (SodiumException) {
             $kcopy = null;
         }
         return $c;
@@ -183,8 +192,14 @@ abstract class ParagonIE_Sodium_Core_Salsa20 extends ParagonIE_Sodium_Core_Util
      * @throws SodiumException
      * @throws TypeError
      */
-    public static function salsa20_xor_ic($m, $n, $ic, $k)
-    {
+    public static function salsa20_xor_ic(
+        #[SensitiveParameter]
+        string $m,
+        string $n,
+        int $ic,
+        #[SensitiveParameter]
+        string $k
+    ): string {
         $mlen = self::strlen($m);
         if ($mlen < 1) {
             return '';
@@ -196,7 +211,7 @@ abstract class ParagonIE_Sodium_Core_Salsa20 extends ParagonIE_Sodium_Core_Util
 
         $c = '';
         while ($mlen >= 64) {
-            $block = self::core_salsa20($in, $kcopy, null);
+            $block = self::core_salsa20($in, $kcopy);
             $c .= self::xorStrings(
                 self::substr($m, 0, 64),
                 self::substr($block, 0, 64)
@@ -213,7 +228,7 @@ abstract class ParagonIE_Sodium_Core_Salsa20 extends ParagonIE_Sodium_Core_Util
         }
 
         if ($mlen) {
-            $block = self::core_salsa20($in, $kcopy, null);
+            $block = self::core_salsa20($in, $kcopy);
             $c .= self::xorStrings(
                 self::substr($m, 0, $mlen),
                 self::substr($block, 0, $mlen)
@@ -222,7 +237,7 @@ abstract class ParagonIE_Sodium_Core_Salsa20 extends ParagonIE_Sodium_Core_Util
         try {
             ParagonIE_Sodium_Compat::memzero($block);
             ParagonIE_Sodium_Compat::memzero($kcopy);
-        } catch (SodiumException $ex) {
+        } catch (SodiumException) {
             $block = null;
             $kcopy = null;
         }
@@ -240,8 +255,13 @@ abstract class ParagonIE_Sodium_Core_Salsa20 extends ParagonIE_Sodium_Core_Util
      * @throws SodiumException
      * @throws TypeError
      */
-    public static function salsa20_xor($message, $nonce, $key)
-    {
+    public static function salsa20_xor(
+        #[SensitiveParameter]
+        string $message,
+        string $nonce,
+        #[SensitiveParameter]
+        string $key
+    ): string {
         return self::xorStrings(
             $message,
             self::salsa20(
@@ -259,11 +279,11 @@ abstract class ParagonIE_Sodium_Core_Salsa20 extends ParagonIE_Sodium_Core_Util
      * @param int $c
      * @return int
      */
-    public static function rotate($u, $c)
+    public static function rotate(int $u, int $c): int
     {
         $u &= 0xffffffff;
         $c %= 32;
-        return (int) (0xffffffff & (
+        return (0xffffffff & (
                 ($u << $c)
                     |
                 ($u >> (32 - $c))

diff --git a/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core/SecretStream/State.php b/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core/SecretStream/State.php
index 2412f6549e811041ef54003f785c653bc093cd66..5aa84e314f10b5985ec063f3cb5fcf70523a8d5b 100644 (file)
--- a/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core/SecretStream/State.php
+++ b/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core/SecretStream/State.php
@@ -1,42 +1,39 @@
 <?php
+declare(strict_types=1);
 
 /**
  * Class ParagonIE_Sodium_Core_SecretStream_State
  */
 class ParagonIE_Sodium_Core_SecretStream_State
 {
-    /** @var string $key */
-    protected $key;
-
-    /** @var int $counter */
-    protected $counter;
-
-    /** @var string $nonce */
-    protected $nonce;
-
-    /** @var string $_pad */
-    protected $_pad;
+    protected string $key;
+    protected int $counter;
+    protected string $nonce;
+    protected string $_pad;
 
     /**
      * ParagonIE_Sodium_Core_SecretStream_State constructor.
      * @param string $key
      * @param string|null $nonce
      */
-    public function __construct($key, $nonce = null)
-    {
+    public function __construct(
+        #[SensitiveParameter]
+        string $key,
+        ?string $nonce = null
+    ) {
         $this->key = $key;
         $this->counter = 1;
         if (is_null($nonce)) {
             $nonce = str_repeat("\0", 12);
         }
-        $this->nonce = str_pad($nonce, 12, "\0", STR_PAD_RIGHT);;
+        $this->nonce = str_pad($nonce, 12, "\0");
         $this->_pad = str_repeat("\0", 4);
     }
 
     /**
      * @return self
      */
-    public function counterReset()
+    public function counterReset(): self
     {
         $this->counter = 1;
         $this->_pad = str_repeat("\0", 4);
@@ -46,7 +43,7 @@ class ParagonIE_Sodium_Core_SecretStream_State
     /**
      * @return string
      */
-    public function getKey()
+    public function getKey(): string
     {
         return $this->key;
     }
@@ -54,7 +51,7 @@ class ParagonIE_Sodium_Core_SecretStream_State
     /**
      * @return string
      */
-    public function getCounter()
+    public function getCounter(): string
     {
         return ParagonIE_Sodium_Core_Util::store32_le($this->counter);
     }
@@ -62,13 +59,10 @@ class ParagonIE_Sodium_Core_SecretStream_State
     /**
      * @return string
      */
-    public function getNonce()
+    public function getNonce(): string
     {
-        if (!is_string($this->nonce)) {
-            $this->nonce = str_repeat("\0", 12);
-        }
         if (ParagonIE_Sodium_Core_Util::strlen($this->nonce) !== 12) {
-            $this->nonce = str_pad($this->nonce, 12, "\0", STR_PAD_RIGHT);
+            $this->nonce = str_pad($this->nonce, 12, "\0");
         }
         return $this->nonce;
     }
@@ -76,7 +70,7 @@ class ParagonIE_Sodium_Core_SecretStream_State
     /**
      * @return string
      */
-    public function getCombinedNonce()
+    public function getCombinedNonce(): string
     {
         return $this->getCounter() .
             ParagonIE_Sodium_Core_Util::substr($this->getNonce(), 0, 8);
@@ -85,7 +79,7 @@ class ParagonIE_Sodium_Core_SecretStream_State
     /**
      * @return self
      */
-    public function incrementCounter()
+    public function incrementCounter(): self
     {
         ++$this->counter;
         return $this;
@@ -94,7 +88,7 @@ class ParagonIE_Sodium_Core_SecretStream_State
     /**
      * @return bool
      */
-    public function needsRekey()
+    public function needsRekey(): bool
     {
         return ($this->counter & 0xffff) === 0;
     }
@@ -103,14 +97,15 @@ class ParagonIE_Sodium_Core_SecretStream_State
      * @param string $newKeyAndNonce
      * @return self
      */
-    public function rekey($newKeyAndNonce)
-    {
+    public function rekey(
+        #[SensitiveParameter]
+        string $newKeyAndNonce
+    ): self {
         $this->key = ParagonIE_Sodium_Core_Util::substr($newKeyAndNonce, 0, 32);
         $this->nonce = str_pad(
             ParagonIE_Sodium_Core_Util::substr($newKeyAndNonce, 32),
             12,
-            "\0",
-            STR_PAD_RIGHT
+            "\0"
         );
         return $this;
     }
@@ -119,15 +114,16 @@ class ParagonIE_Sodium_Core_SecretStream_State
      * @param string $str
      * @return self
      */
-    public function xorNonce($str)
-    {
+    public function xorNonce(
+        #[SensitiveParameter]
+        string $str
+    ): self {
         $this->nonce = ParagonIE_Sodium_Core_Util::xorStrings(
             $this->getNonce(),
             str_pad(
                 ParagonIE_Sodium_Core_Util::substr($str, 0, 8),
                 12,
-                "\0",
-                STR_PAD_RIGHT
+                "\0"
             )
         );
         return $this;
@@ -137,8 +133,10 @@ class ParagonIE_Sodium_Core_SecretStream_State
      * @param string $string
      * @return self
      */
-    public static function fromString($string)
-    {
+    public static function fromString(
+        #[SensitiveParameter]
+        string $string
+    ): self {
         $state = new ParagonIE_Sodium_Core_SecretStream_State(
             ParagonIE_Sodium_Core_Util::substr($string, 0, 32)
         );
@@ -153,7 +151,7 @@ class ParagonIE_Sodium_Core_SecretStream_State
     /**
      * @return string
      */
-    public function toString()
+    public function toString(): string
     {
         return $this->key .
             $this->getCounter() .

diff --git a/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core/SipHash.php b/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core/SipHash.php
index 90c3b696122df5e9ad1e40e21930ca3453a86ab8..f52ee5e2929650294137a80f061511156601ed69 100644 (file)
--- a/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core/SipHash.php
+++ b/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core/SipHash.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 if (class_exists('ParagonIE_Sodium_Core_SipHash', false)) {
     return;
@@ -18,7 +19,7 @@ class ParagonIE_Sodium_Core_SipHash extends ParagonIE_Sodium_Core_Util
      * @return int[]
      *
      */
-    public static function sipRound(array $v)
+    public static function sipRound(array $v): array
     {
         # v0 += v1;
         list($v[0], $v[1]) = self::add(
@@ -27,56 +28,56 @@ class ParagonIE_Sodium_Core_SipHash extends ParagonIE_Sodium_Core_Util
         );
 
         #  v1=ROTL(v1,13);
-        list($v[2], $v[3]) = self::rotl_64((int) $v[2], (int) $v[3], 13);
+        list($v[2], $v[3]) = self::rotl_64($v[2], $v[3], 13);
 
         #  v1 ^= v0;
-        $v[2] = (int) $v[2] ^ (int) $v[0];
-        $v[3] = (int) $v[3] ^ (int) $v[1];
+        $v[2] = $v[2] ^ $v[0];
+        $v[3] = $v[3] ^ $v[1];
 
         #  v0=ROTL(v0,32);
-        list($v[0], $v[1]) = self::rotl_64((int) $v[0], (int) $v[1], 32);
+        list($v[0], $v[1]) = self::rotl_64($v[0], $v[1], 32);
 
         # v2 += v3;
         list($v[4], $v[5]) = self::add(
-            array((int) $v[4], (int) $v[5]),
-            array((int) $v[6], (int) $v[7])
+            array($v[4], $v[5]),
+            array($v[6], $v[7])
         );
 
         # v3=ROTL(v3,16);
-        list($v[6], $v[7]) = self::rotl_64((int) $v[6], (int) $v[7], 16);
+        list($v[6], $v[7]) = self::rotl_64($v[6], $v[7], 16);
 
         #  v3 ^= v2;
-        $v[6] = (int) $v[6] ^ (int) $v[4];
-        $v[7] = (int) $v[7] ^ (int) $v[5];
+        $v[6] = $v[6] ^ $v[4];
+        $v[7] = $v[7] ^ $v[5];
 
         # v0 += v3;
         list($v[0], $v[1]) = self::add(
-            array((int) $v[0], (int) $v[1]),
-            array((int) $v[6], (int) $v[7])
+            array($v[0], $v[1]),
+            array($v[6], $v[7])
         );
 
         # v3=ROTL(v3,21);
-        list($v[6], $v[7]) = self::rotl_64((int) $v[6], (int) $v[7], 21);
+        list($v[6], $v[7]) = self::rotl_64($v[6], $v[7], 21);
 
         # v3 ^= v0;
-        $v[6] = (int) $v[6] ^ (int) $v[0];
-        $v[7] = (int) $v[7] ^ (int) $v[1];
+        $v[6] = $v[6] ^ $v[0];
+        $v[7] = $v[7] ^ $v[1];
 
         # v2 += v1;
         list($v[4], $v[5]) = self::add(
-            array((int) $v[4], (int) $v[5]),
-            array((int) $v[2], (int) $v[3])
+            array($v[4], $v[5]),
+            array($v[2], $v[3])
         );
 
         # v1=ROTL(v1,17);
-        list($v[2], $v[3]) = self::rotl_64((int) $v[2], (int) $v[3], 17);
+        list($v[2], $v[3]) = self::rotl_64($v[2], $v[3], 17);
 
         #  v1 ^= v2;;
-        $v[2] = (int) $v[2] ^ (int) $v[4];
-        $v[3] = (int) $v[3] ^ (int) $v[5];
+        $v[2] = $v[2] ^ $v[4];
+        $v[3] = $v[3] ^ $v[5];
 
         # v2=ROTL(v2,32)
-        list($v[4], $v[5]) = self::rotl_64((int) $v[4], (int) $v[5], 32);
+        list($v[4], $v[5]) = self::rotl_64($v[4], $v[5], 32);
 
         return $v;
     }
@@ -90,7 +91,7 @@ class ParagonIE_Sodium_Core_SipHash extends ParagonIE_Sodium_Core_Util
      * @param int[] $b
      * @return array<int, mixed>
      */
-    public static function add(array $a, array $b)
+    public static function add(array $a, array $b): array
     {
         /** @var int $x1 */
         $x1 = $a[1] + $b[1];
@@ -112,7 +113,7 @@ class ParagonIE_Sodium_Core_SipHash extends ParagonIE_Sodium_Core_Util
      * @param int $c
      * @return array<int, mixed>
      */
-    public static function rotl_64($int0, $int1, $c)
+    public static function rotl_64(int $int0, int $int1, int $c): array
     {
         $int0 &= 0xffffffff;
         $int1 &= 0xffffffff;
@@ -159,9 +160,15 @@ class ParagonIE_Sodium_Core_SipHash extends ParagonIE_Sodium_Core_Util
      * @return string
      * @throws SodiumException
      * @throws TypeError
+     *
+     * @psalm-suppress PossiblyUndefinedArrayOffset
      */
-    public static function sipHash24($in, $key)
-    {
+    public static function sipHash24(
+        #[SensitiveParameter]
+        string $in,
+        #[SensitiveParameter]
+        string $key
+    ): string {
         $inlen = self::strlen($in);
 
         # /* "somepseudorandomlygeneratedbytes" */
@@ -293,10 +300,7 @@ class ParagonIE_Sodium_Core_SipHash extends ParagonIE_Sodium_Core_Util
         # SIPROUND;
         # SIPROUND;
         # SIPROUND;
-        $v = self::sipRound($v);
-        $v = self::sipRound($v);
-        $v = self::sipRound($v);
-        $v = self::sipRound($v);
+        $v = self::sipRound(self::sipRound(self::sipRound(self::sipRound($v))));
 
         # b = v0 ^ v1 ^ v2 ^ v3;
         # STORE64_LE( out, b );

diff --git a/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core/Util.php b/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core/Util.php
index e5d96dcdceda8395a67f3495c25335f8aad3e52a..2681171340a5fe0fa921bbe1188caed0b5ee5b66 100644 (file)
--- a/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core/Util.php
+++ b/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core/Util.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 if (class_exists('ParagonIE_Sodium_Core_Util', false)) {
     return;
@@ -16,19 +17,20 @@ abstract class ParagonIE_Sodium_Core_Util
      * @param int $size (16, 32, 64)
      * @return int
      */
-    public static function abs($integer, $size = 0)
-    {
-        /** @var int $realSize */
+    public static function abs(
+        #[SensitiveParameter]
+        int $integer,
+        int $size = 0
+    ): int {
         $realSize = (PHP_INT_SIZE << 3) - 1;
         if ($size) {
             --$size;
         } else {
-            /** @var int $size */
             $size = $realSize;
         }
 
         $negative = -(($integer >> $size) & 1);
-        return (int) (
+        return (
             ($integer ^ $negative)
                 +
             (($negative >> $realSize) & 1)
@@ -41,15 +43,12 @@ abstract class ParagonIE_Sodium_Core_Util
      * @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');
-        }
+    public static function andStrings(
+        #[SensitiveParameter]
+        string $a,
+        #[SensitiveParameter]
+        string $b
+    ): 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');
@@ -67,13 +66,10 @@ abstract class ParagonIE_Sodium_Core_Util
      * @return string
      * @throws TypeError
      */
-    public static function bin2hex($binaryString)
-    {
-        /* Type checks: */
-        if (!is_string($binaryString)) {
-            throw new TypeError('Argument 1 must be a string, ' . gettype($binaryString) . ' given.');
-        }
-
+    public static function bin2hex(
+        #[SensitiveParameter]
+        string $binaryString
+    ): string {
         $hex = '';
         $len = self::strlen($binaryString);
         for ($i = 0; $i < $len; ++$i) {
@@ -92,51 +88,6 @@ abstract class ParagonIE_Sodium_Core_Util
         return $hex;
     }
 
-    /**
-     * Convert a binary string into a hexadecimal string without cache-timing
-     * leaks, returning uppercase letters (as per RFC 4648)
-     *
-     * @internal You should not use this directly from another application
-     *
-     * @param string $bin_string (raw binary)
-     * @return string
-     * @throws TypeError
-     */
-    public static function bin2hexUpper($bin_string)
-    {
-        $hex = '';
-        $len = self::strlen($bin_string);
-        for ($i = 0; $i < $len; ++$i) {
-            /** @var array<int, int> $chunk */
-            $chunk = unpack('C', $bin_string[$i]);
-            /**
-             * Lower 16 bits
-             *
-             * @var int $c
-             */
-            $c = $chunk[1] & 0xf;
-
-            /**
-             * Upper 16 bits
-             * @var int $b
-             */
-            $b = $chunk[1] >> 4;
-
-            /**
-             * Use pack() and binary operators to turn the two integers
-             * into hexadecimal characters. We don't use chr() here, because
-             * it uses a lookup table internally and we want to avoid
-             * cache-timing side-channels.
-             */
-            $hex .= pack(
-                'CC',
-                (55 + $b + ((($b - 10) >> 8) & ~6)),
-                (55 + $c + ((($c - 10) >> 8) & ~6))
-            );
-        }
-        return $hex;
-    }
-
     /**
      * Cache-timing-safe variant of ord()
      *
@@ -147,18 +98,16 @@ abstract class ParagonIE_Sodium_Core_Util
      * @throws SodiumException
      * @throws TypeError
      */
-    public static function chrToInt($chr)
-    {
-        /* Type checks: */
-        if (!is_string($chr)) {
-            throw new TypeError('Argument 1 must be a string, ' . gettype($chr) . ' given.');
-        }
+    public static function chrToInt(
+        #[SensitiveParameter]
+        string $chr
+    ): int {
         if (self::strlen($chr) !== 1) {
             throw new SodiumException('chrToInt() expects a string that is exactly 1 character long');
         }
         /** @var array<int, int> $chunk */
         $chunk = unpack('C', $chr);
-        return (int) ($chunk[1]);
+        return $chunk[1];
     }
 
     /**
@@ -168,19 +117,24 @@ abstract class ParagonIE_Sodium_Core_Util
      *
      * @param string $left
      * @param string $right
-     * @param int $len
+     * @param ?int $len
      * @return int
      * @throws SodiumException
      * @throws TypeError
      */
-    public static function compare($left, $right, $len = null)
-    {
+    public static function compare(
+        #[SensitiveParameter]
+        string $left,
+        #[SensitiveParameter]
+        string $right,
+        ?int $len = null
+    ): int {
         $leftLen = self::strlen($left);
         $rightLen = self::strlen($right);
         if ($len === null) {
             $len = max($leftLen, $rightLen);
-            $left = str_pad($left, $len, "\x00", STR_PAD_RIGHT);
-            $right = str_pad($right, $len, "\x00", STR_PAD_RIGHT);
+            $left = str_pad($left, $len, "\x00");
+            $right = str_pad($right, $len, "\x00");
         }
 
         $gt = 0;
@@ -194,136 +148,22 @@ abstract class ParagonIE_Sodium_Core_Util
         return ($gt + $gt + $eq) - 1;
     }
 
-    /**
-     * If a variable does not match a given type, throw a TypeError.
-     *
-     * @param mixed $mixedVar
-     * @param string $type
-     * @param int $argumentIndex
-     * @throws TypeError
-     * @throws SodiumException
-     * @return void
-     */
-    public static function declareScalarType(&$mixedVar = null, $type = 'void', $argumentIndex = 0)
-    {
-        if (func_num_args() === 0) {
-            /* Tautology, by default */
-            return;
-        }
-        if (func_num_args() === 1) {
-            throw new TypeError('Declared void, but passed a variable');
-        }
-        $realType = strtolower(gettype($mixedVar));
-        $type = strtolower($type);
-        switch ($type) {
-            case 'null':
-                if ($mixedVar !== null) {
-                    throw new TypeError('Argument ' . $argumentIndex . ' must be null, ' . $realType . ' given.');
-                }
-                break;
-            case 'integer':
-            case 'int':
-                $allow = array('int', 'integer');
-                if (!in_array($type, $allow)) {
-                    throw new TypeError('Argument ' . $argumentIndex . ' must be an integer, ' . $realType . ' given.');
-                }
-                $mixedVar = (int) $mixedVar;
-                break;
-            case 'boolean':
-            case 'bool':
-                $allow = array('bool', 'boolean');
-                if (!in_array($type, $allow)) {
-                    throw new TypeError('Argument ' . $argumentIndex . ' must be a boolean, ' . $realType . ' given.');
-                }
-                $mixedVar = (bool) $mixedVar;
-                break;
-            case 'string':
-                if (!is_string($mixedVar)) {
-                    throw new TypeError('Argument ' . $argumentIndex . ' must be a string, ' . $realType . ' given.');
-                }
-                $mixedVar = (string) $mixedVar;
-                break;
-            case 'decimal':
-            case 'double':
-            case 'float':
-                $allow = array('decimal', 'double', 'float');
-                if (!in_array($type, $allow)) {
-                    throw new TypeError('Argument ' . $argumentIndex . ' must be a float, ' . $realType . ' given.');
-                }
-                $mixedVar = (float) $mixedVar;
-                break;
-            case 'object':
-                if (!is_object($mixedVar)) {
-                    throw new TypeError('Argument ' . $argumentIndex . ' must be an object, ' . $realType . ' given.');
-                }
-                break;
-            case 'array':
-                if (!is_array($mixedVar)) {
-                    if (is_object($mixedVar)) {
-                        if ($mixedVar instanceof ArrayAccess) {
-                            return;
-                        }
-                    }
-                    throw new TypeError('Argument ' . $argumentIndex . ' must be an array, ' . $realType . ' given.');
-                }
-                break;
-            default:
-                throw new SodiumException('Unknown type (' . $realType .') does not match expect type (' . $type . ')');
-        }
-    }
-
     /**
      * Evaluate whether or not two strings are equal (in constant-time)
      *
      * @param string $left
      * @param string $right
      * @return bool
-     * @throws SodiumException
-     * @throws TypeError
-     */
-    public static function hashEquals($left, $right)
-    {
-        /* Type checks: */
-        if (!is_string($left)) {
-            throw new TypeError('Argument 1 must be a string, ' . gettype($left) . ' given.');
-        }
-        if (!is_string($right)) {
-            throw new TypeError('Argument 2 must be a string, ' . gettype($right) . ' given.');
-        }
-
-        if (is_callable('hash_equals')) {
-            return hash_equals($left, $right);
-        }
-        $d = 0;
-        /** @var int $len */
-        $len = self::strlen($left);
-        if ($len !== self::strlen($right)) {
-            return false;
-        }
-        for ($i = 0; $i < $len; ++$i) {
-            $d |= self::chrToInt($left[$i]) ^ self::chrToInt($right[$i]);
-        }
-
-        if ($d !== 0) {
-            return false;
-        }
-        return $left === $right;
-    }
-
-    /**
-     * Catch hash_update() failures and throw instead of silently proceeding
      *
-     * @param HashContext|resource &$hs
-     * @param string $data
-     * @return void
-     * @throws SodiumException
-     * @psalm-suppress PossiblyInvalidArgument
+     * @throws TypeError
      */
-    protected static function hash_update(&$hs, $data)
-    {
-        if (!hash_update($hs, $data)) {
-            throw new SodiumException('hash_update() failed');
-        }
+    public static function hashEquals(
+        #[SensitiveParameter]
+        string $left,
+        #[SensitiveParameter]
+        string $right
+    ): bool {
+        return hash_equals($left, $right);
     }
 
     /**
@@ -339,16 +179,12 @@ abstract class ParagonIE_Sodium_Core_Util
      * @throws RangeException
      * @throws TypeError
      */
-    public static function hex2bin($hexString, $ignore = '', $strictPadding = false)
-    {
-        /* Type checks: */
-        if (!is_string($hexString)) {
-            throw new TypeError('Argument 1 must be a string, ' . gettype($hexString) . ' given.');
-        }
-        if (!is_string($ignore)) {
-            throw new TypeError('Argument 2 must be a string, ' . gettype($hexString) . ' given.');
-        }
-
+    public static function hex2bin(
+        #[SensitiveParameter]
+        string $hexString,
+        string $ignore = '',
+        bool $strictPadding = false
+    ): string {
         $hex_pos = 0;
         $bin = '';
         $c_acc = 0;
@@ -375,7 +211,7 @@ abstract class ParagonIE_Sodium_Core_Util
             $c_alpha = ($c & ~32) - 55;
             $c_alpha0 = (($c_alpha - 10) ^ ($c_alpha - 16)) >> 8;
             if (($c_num0 | $c_alpha0) === 0) {
-                if ($ignore && $state === 0 && strpos($ignore, self::intToChr($c)) !== false) {
+                if ($ignore && $state === 0 && str_contains($ignore, self::intToChr($c))) {
                     continue;
                 }
                 throw new RangeException(
@@ -401,11 +237,11 @@ abstract class ParagonIE_Sodium_Core_Util
      * @param array<int, int> $ints
      * @return string
      */
-    public static function intArrayToString(array $ints)
+    public static function intArrayToString(array $ints): string
     {
         $args = $ints;
         foreach ($args as $i => $v) {
-            $args[$i] = (int) ($v & 0xff);
+            $args[$i] = ($v & 0xff);
         }
         array_unshift($args, str_repeat('C', count($ints)));
         return (string) (call_user_func_array('pack', $args));
@@ -420,8 +256,10 @@ abstract class ParagonIE_Sodium_Core_Util
      * @return string
      * @throws TypeError
      */
-    public static function intToChr($int)
-    {
+    public static function intToChr(
+        #[SensitiveParameter]
+        int $int
+    ): string {
         return pack('C', $int);
     }
 
@@ -435,13 +273,10 @@ abstract class ParagonIE_Sodium_Core_Util
      * @throws RangeException
      * @throws TypeError
      */
-    public static function load_3($string)
-    {
-        /* Type checks: */
-        if (!is_string($string)) {
-            throw new TypeError('Argument 1 must be a string, ' . gettype($string) . ' given.');
-        }
-
+    public static function load_3(
+        #[SensitiveParameter]
+        string $string
+    ): int {
         /* Input validation: */
         if (self::strlen($string) < 3) {
             throw new RangeException(
@@ -450,7 +285,7 @@ abstract class ParagonIE_Sodium_Core_Util
         }
         /** @var array<int, int> $unpacked */
         $unpacked = unpack('V', $string . "\0");
-        return (int) ($unpacked[1] & 0xffffff);
+        return ($unpacked[1] & 0xffffff);
     }
 
     /**
@@ -463,13 +298,10 @@ abstract class ParagonIE_Sodium_Core_Util
      * @throws RangeException
      * @throws TypeError
      */
-    public static function load_4($string)
-    {
-        /* Type checks: */
-        if (!is_string($string)) {
-            throw new TypeError('Argument 1 must be a string, ' . gettype($string) . ' given.');
-        }
-
+    public static function load_4(
+        #[SensitiveParameter]
+        string $string
+    ): int {
         /* Input validation: */
         if (self::strlen($string) < 4) {
             throw new RangeException(
@@ -478,7 +310,7 @@ abstract class ParagonIE_Sodium_Core_Util
         }
         /** @var array<int, int> $unpacked */
         $unpacked = unpack('V', $string);
-        return (int) $unpacked[1];
+        return $unpacked[1];
     }
 
     /**
@@ -488,39 +320,23 @@ abstract class ParagonIE_Sodium_Core_Util
      *
      * @param string $string
      * @return int
+     *
      * @throws RangeException
      * @throws SodiumException
      * @throws TypeError
      */
-    public static function load64_le($string)
-    {
-        /* Type checks: */
-        if (!is_string($string)) {
-            throw new TypeError('Argument 1 must be a string, ' . gettype($string) . ' given.');
-        }
-
+    public static function load64_le(
+        #[SensitiveParameter]
+        string $string
+    ): int {
         /* Input validation: */
         if (self::strlen($string) < 4) {
             throw new RangeException(
                 'String must be 4 bytes or more; ' . self::strlen($string) . ' given.'
             );
         }
-        if (PHP_VERSION_ID >= 50603 && PHP_INT_SIZE === 8) {
-            /** @var array<int, int> $unpacked */
-            $unpacked = unpack('P', $string);
-            return (int) $unpacked[1];
-        }
-
-        /** @var int $result */
-        $result  = (self::chrToInt($string[0]) & 0xff);
-        $result |= (self::chrToInt($string[1]) & 0xff) <<  8;
-        $result |= (self::chrToInt($string[2]) & 0xff) << 16;
-        $result |= (self::chrToInt($string[3]) & 0xff) << 24;
-        $result |= (self::chrToInt($string[4]) & 0xff) << 32;
-        $result |= (self::chrToInt($string[5]) & 0xff) << 40;
-        $result |= (self::chrToInt($string[6]) & 0xff) << 48;
-        $result |= (self::chrToInt($string[7]) & 0xff) << 56;
-        return (int) $result;
+        $unpacked = unpack('P', $string);
+        return (int) $unpacked[1];
     }
 
     /**
@@ -529,11 +345,14 @@ abstract class ParagonIE_Sodium_Core_Util
      * @param string $left
      * @param string $right
      * @return int
-     * @throws SodiumException
      * @throws TypeError
      */
-    public static function memcmp($left, $right)
-    {
+    public static function memcmp(
+        #[SensitiveParameter]
+        string $left,
+        #[SensitiveParameter]
+        string $right
+    ): int {
         if (self::hashEquals($left, $right)) {
             return 0;
         }
@@ -557,20 +376,22 @@ abstract class ParagonIE_Sodium_Core_Util
      *                  constant operands)
      * @return int
      */
-    public static function mul($a, $b, $size = 0)
-    {
+    public static function mul(
+        #[SensitiveParameter]
+        int $a,
+        #[SensitiveParameter]
+        int $b,
+        int $size = 0
+    ): int {
         if (ParagonIE_Sodium_Compat::$fastMult) {
             return (int) ($a * $b);
         }
 
         static $defaultSize = null;
-        /** @var int $defaultSize */
         if (!$defaultSize) {
-            /** @var int $defaultSize */
             $defaultSize = (PHP_INT_SIZE << 3) - 1;
         }
         if ($size < 1) {
-            /** @var int $size */
             $size = $defaultSize;
         }
         /** @var int $size */
@@ -582,10 +403,8 @@ abstract class ParagonIE_Sodium_Core_Util
          *
          * -1 in binary looks like 0x1111 ... 1111
          *  0 in binary looks like 0x0000 ... 0000
-         *
-         * @var int
          */
-        $mask = -(($b >> ((int) $defaultSize)) & 1);
+        $mask = -(($b >> ($defaultSize)) & 1);
 
         /**
          * Ensure $b is a positive integer, without creating
@@ -602,7 +421,7 @@ abstract class ParagonIE_Sodium_Core_Util
          * This loop always runs 64 times when PHP_INT_SIZE is 8.
          */
         for ($i = $size; $i >= 0; --$i) {
-            $c += (int) ($a & -($b & 1));
+            $c += ($a & -($b & 1));
             $a <<= 1;
             $b >>= 1;
         }
@@ -617,7 +436,7 @@ abstract class ParagonIE_Sodium_Core_Util
          *
          * The end result is what we'd expect from integer multiplication.
          */
-        return (int) (($c & ~$mask) | ($mask & -$c));
+        return (($c & ~$mask) | ($mask & -$c));
     }
 
     /**
@@ -628,8 +447,9 @@ abstract class ParagonIE_Sodium_Core_Util
      *
      * @param int|float $num
      * @return array<int, int>
+     * @psalm-suppress RedundantCastGivenDocblockType
      */
-    public static function numericTo64BitInteger($num)
+    public static function numericTo64BitInteger(int|float $num): array
     {
         $high = 0;
         /** @var int $low */
@@ -644,37 +464,16 @@ abstract class ParagonIE_Sodium_Core_Util
                 /** @var int $high */
                 $high = min((+(floor($num/4294967296))), 4294967295);
             } else {
-                /** @var int $high */
                 $high = ~~((+(ceil(($num - (+((~~($num)))))/4294967296))));
             }
         }
+        /**
+         * @var int $high
+         * @var int $low
+         */
         return array((int) $high, (int) $low);
     }
 
-    /**
-     * Store a 24-bit integer into a string, treating it as big-endian.
-     *
-     * @internal You should not use this directly from another application
-     *
-     * @param int $int
-     * @return string
-     * @throws TypeError
-     */
-    public static function store_3($int)
-    {
-        /* Type checks: */
-        if (!is_int($int)) {
-            if (is_numeric($int)) {
-                $int = (int) $int;
-            } else {
-                throw new TypeError('Argument 1 must be an integer, ' . gettype($int) . ' given.');
-            }
-        }
-        /** @var string $packed */
-        $packed = pack('N', $int);
-        return self::substr($packed, 1, 3);
-    }
-
     /**
      * Store a 32-bit integer into a string, treating it as little-endian.
      *
@@ -684,45 +483,9 @@ abstract class ParagonIE_Sodium_Core_Util
      * @return string
      * @throws TypeError
      */
-    public static function store32_le($int)
+    public static function store32_le(int $int): string
     {
-        /* Type checks: */
-        if (!is_int($int)) {
-            if (is_numeric($int)) {
-                $int = (int) $int;
-            } else {
-                throw new TypeError('Argument 1 must be an integer, ' . gettype($int) . ' given.');
-            }
-        }
-
-        /** @var string $packed */
-        $packed = pack('V', $int);
-        return $packed;
-    }
-
-    /**
-     * Store a 32-bit integer into a string, treating it as big-endian.
-     *
-     * @internal You should not use this directly from another application
-     *
-     * @param int $int
-     * @return string
-     * @throws TypeError
-     */
-    public static function store_4($int)
-    {
-        /* Type checks: */
-        if (!is_int($int)) {
-            if (is_numeric($int)) {
-                $int = (int) $int;
-            } else {
-                throw new TypeError('Argument 1 must be an integer, ' . gettype($int) . ' given.');
-            }
-        }
-
-        /** @var string $packed */
-        $packed = pack('N', $int);
-        return $packed;
+       return pack('V', $int);
     }
 
     /**
@@ -734,46 +497,9 @@ abstract class ParagonIE_Sodium_Core_Util
      * @return string
      * @throws TypeError
      */
-    public static function store64_le($int)
+    public static function store64_le(int $int): string
     {
-        /* Type checks: */
-        if (!is_int($int)) {
-            if (is_numeric($int)) {
-                $int = (int) $int;
-            } else {
-                throw new TypeError('Argument 1 must be an integer, ' . gettype($int) . ' given.');
-            }
-        }
-
-        if (PHP_INT_SIZE === 8) {
-            if (PHP_VERSION_ID >= 50603) {
-                /** @var string $packed */
-                $packed = pack('P', $int);
-                return $packed;
-            }
-            return self::intToChr($int & 0xff) .
-                self::intToChr(($int >>  8) & 0xff) .
-                self::intToChr(($int >> 16) & 0xff) .
-                self::intToChr(($int >> 24) & 0xff) .
-                self::intToChr(($int >> 32) & 0xff) .
-                self::intToChr(($int >> 40) & 0xff) .
-                self::intToChr(($int >> 48) & 0xff) .
-                self::intToChr(($int >> 56) & 0xff);
-        }
-        if ($int > PHP_INT_MAX) {
-            list($hiB, $int) = self::numericTo64BitInteger($int);
-        } else {
-            $hiB = 0;
-        }
-        return
-            self::intToChr(($int      ) & 0xff) .
-            self::intToChr(($int >>  8) & 0xff) .
-            self::intToChr(($int >> 16) & 0xff) .
-            self::intToChr(($int >> 24) & 0xff) .
-            self::intToChr($hiB & 0xff) .
-            self::intToChr(($hiB >>  8) & 0xff) .
-            self::intToChr(($hiB >> 16) & 0xff) .
-            self::intToChr(($hiB >> 24) & 0xff);
+        return pack('P', $int);
     }
 
     /**
@@ -787,14 +513,11 @@ abstract class ParagonIE_Sodium_Core_Util
      * @return int
      * @throws TypeError
      */
-    public static function strlen($str)
-    {
-        /* Type checks: */
-        if (!is_string($str)) {
-            throw new TypeError('String expected');
-        }
-
-        return (int) (
+    public static function strlen(
+        #[SensitiveParameter]
+        string $str
+    ): int {
+        return (
         self::isMbStringOverride()
             ? mb_strlen($str, '8bit')
             : strlen($str)
@@ -810,18 +533,11 @@ abstract class ParagonIE_Sodium_Core_Util
      * @return array<int, int>
      * @throws TypeError
      */
-    public static function stringToIntArray($string)
+    public static function stringToIntArray(string $string): array
     {
-        if (!is_string($string)) {
-            throw new TypeError('String expected');
-        }
-        /**
-         * @var array<int, int>
-         */
-        $values = array_values(
+        return array_values(
             unpack('C*', $string)
         );
-        return $values;
     }
 
     /**
@@ -833,17 +549,16 @@ abstract class ParagonIE_Sodium_Core_Util
      *
      * @param string $str
      * @param int $start
-     * @param int $length
+     * @param ?int $length
      * @return string
      * @throws TypeError
      */
-    public static function substr($str, $start = 0, $length = null)
-    {
-        /* Type checks: */
-        if (!is_string($str)) {
-            throw new TypeError('String expected');
-        }
-
+    public static function substr(
+        #[SensitiveParameter]
+        string $str,
+        int $start = 0,
+        ?int $length = null
+    ): string {
         if ($length === 0) {
             return '';
         }
@@ -852,11 +567,11 @@ abstract class ParagonIE_Sodium_Core_Util
             if (PHP_VERSION_ID < 50400 && $length === null) {
                 $length = self::strlen($str);
             }
-            $sub = (string) mb_substr($str, $start, $length, '8bit');
+            $sub = mb_substr($str, $start, $length, '8bit');
         } elseif ($length === null) {
-            $sub = (string) substr($str, $start);
+            $sub = substr($str, $start);
         } else {
-            $sub = (string) substr($str, $start, $length);
+            $sub = substr($str, $start, $length);
         }
         if ($sub !== '') {
             return $sub;
@@ -872,18 +587,14 @@ abstract class ParagonIE_Sodium_Core_Util
      * @param string $a
      * @param string $b
      * @return bool
-     * @throws SodiumException
      * @throws TypeError
      */
-    public static function verify_16($a, $b)
-    {
-        /* Type checks: */
-        if (!is_string($a)) {
-            throw new TypeError('String expected');
-        }
-        if (!is_string($b)) {
-            throw new TypeError('String expected');
-        }
+    public static function verify_16(
+        #[SensitiveParameter]
+        string $a,
+        #[SensitiveParameter]
+        string $b
+    ): bool {
         return self::hashEquals(
             self::substr($a, 0, 16),
             self::substr($b, 0, 16)
@@ -898,18 +609,16 @@ abstract class ParagonIE_Sodium_Core_Util
      * @param string $a
      * @param string $b
      * @return bool
+     *
      * @throws SodiumException
      * @throws TypeError
      */
-    public static function verify_32($a, $b)
-    {
-        /* Type checks: */
-        if (!is_string($a)) {
-            throw new TypeError('String expected');
-        }
-        if (!is_string($b)) {
-            throw new TypeError('String expected');
-        }
+    public static function verify_32(
+        #[SensitiveParameter]
+        string $a,
+        #[SensitiveParameter]
+        string $b
+    ): bool {
         return self::hashEquals(
             self::substr($a, 0, 32),
             self::substr($b, 0, 32)
@@ -926,17 +635,13 @@ abstract class ParagonIE_Sodium_Core_Util
      * @return string
      * @throws TypeError
      */
-    public static function xorStrings($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');
-        }
-
-        return (string) ($a ^ $b);
+    public static function xorStrings(
+        #[SensitiveParameter]
+        string $a,
+        #[SensitiveParameter]
+        string $b
+    ): string {
+        return $a ^ $b;
     }
 
     /**
@@ -949,7 +654,7 @@ abstract class ParagonIE_Sodium_Core_Util
      *
      * @return bool
      */
-    protected static function isMbStringOverride()
+    protected static function isMbStringOverride(): bool
     {
         static $mbstring = null;
 

diff --git a/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core/X25519.php b/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core/X25519.php
index 732bb65e96824cdb34b96d519c19a89237cb7d4c..d691c9d8bb6eae5911391fec2961dfbf8379bc5b 100644 (file)
--- a/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core/X25519.php
+++ b/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core/X25519.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 if (class_exists('ParagonIE_Sodium_Core_X25519', false)) {
     return;
@@ -18,64 +19,43 @@ abstract class ParagonIE_Sodium_Core_X25519 extends ParagonIE_Sodium_Core_Curve2
      * @param ParagonIE_Sodium_Core_Curve25519_Fe $g
      * @param int $b
      * @return void
-     * @psalm-suppress MixedAssignment
      */
     public static function fe_cswap(
         ParagonIE_Sodium_Core_Curve25519_Fe $f,
         ParagonIE_Sodium_Core_Curve25519_Fe $g,
-        $b = 0
-    ) {
-        $f0 = (int) $f[0];
-        $f1 = (int) $f[1];
-        $f2 = (int) $f[2];
-        $f3 = (int) $f[3];
-        $f4 = (int) $f[4];
-        $f5 = (int) $f[5];
-        $f6 = (int) $f[6];
-        $f7 = (int) $f[7];
-        $f8 = (int) $f[8];
-        $f9 = (int) $f[9];
-        $g0 = (int) $g[0];
-        $g1 = (int) $g[1];
-        $g2 = (int) $g[2];
-        $g3 = (int) $g[3];
-        $g4 = (int) $g[4];
-        $g5 = (int) $g[5];
-        $g6 = (int) $g[6];
-        $g7 = (int) $g[7];
-        $g8 = (int) $g[8];
-        $g9 = (int) $g[9];
+        int $b = 0
+    ): void {
         $b = -$b;
-        $x0 = ($f0 ^ $g0) & $b;
-        $x1 = ($f1 ^ $g1) & $b;
-        $x2 = ($f2 ^ $g2) & $b;
-        $x3 = ($f3 ^ $g3) & $b;
-        $x4 = ($f4 ^ $g4) & $b;
-        $x5 = ($f5 ^ $g5) & $b;
-        $x6 = ($f6 ^ $g6) & $b;
-        $x7 = ($f7 ^ $g7) & $b;
-        $x8 = ($f8 ^ $g8) & $b;
-        $x9 = ($f9 ^ $g9) & $b;
-        $f[0] = $f0 ^ $x0;
-        $f[1] = $f1 ^ $x1;
-        $f[2] = $f2 ^ $x2;
-        $f[3] = $f3 ^ $x3;
-        $f[4] = $f4 ^ $x4;
-        $f[5] = $f5 ^ $x5;
-        $f[6] = $f6 ^ $x6;
-        $f[7] = $f7 ^ $x7;
-        $f[8] = $f8 ^ $x8;
-        $f[9] = $f9 ^ $x9;
-        $g[0] = $g0 ^ $x0;
-        $g[1] = $g1 ^ $x1;
-        $g[2] = $g2 ^ $x2;
-        $g[3] = $g3 ^ $x3;
-        $g[4] = $g4 ^ $x4;
-        $g[5] = $g5 ^ $x5;
-        $g[6] = $g6 ^ $x6;
-        $g[7] = $g7 ^ $x7;
-        $g[8] = $g8 ^ $x8;
-        $g[9] = $g9 ^ $x9;
+        $x0 = ($f[0] ^ $g[0]) & $b;
+        $x1 = ($f[1] ^ $g[1]) & $b;
+        $x2 = ($f[2] ^ $g[2]) & $b;
+        $x3 = ($f[3] ^ $g[3]) & $b;
+        $x4 = ($f[4] ^ $g[4]) & $b;
+        $x5 = ($f[5] ^ $g[5]) & $b;
+        $x6 = ($f[6] ^ $g[6]) & $b;
+        $x7 = ($f[7] ^ $g[7]) & $b;
+        $x8 = ($f[8] ^ $g[8]) & $b;
+        $x9 = ($f[9] ^ $g[9]) & $b;
+        $f[0] ^= $x0;
+        $f[1] ^= $x1;
+        $f[2] ^= $x2;
+        $f[3] ^= $x3;
+        $f[4] ^= $x4;
+        $f[5] ^= $x5;
+        $f[6] ^= $x6;
+        $f[7] ^= $x7;
+        $f[8] ^= $x8;
+        $f[9] ^= $x9;
+        $g[0] ^= $x0;
+        $g[1] ^= $x1;
+        $g[2] ^= $x2;
+        $g[3] ^= $x3;
+        $g[4] ^= $x4;
+        $g[5] ^= $x5;
+        $g[6] ^= $x6;
+        $g[7] ^= $x7;
+        $g[8] ^= $x8;
+        $g[9] ^= $x9;
     }
 
     /**
@@ -84,59 +64,58 @@ abstract class ParagonIE_Sodium_Core_X25519 extends ParagonIE_Sodium_Core_Curve2
      * @param ParagonIE_Sodium_Core_Curve25519_Fe $f
      * @return ParagonIE_Sodium_Core_Curve25519_Fe
      */
-    public static function fe_mul121666(ParagonIE_Sodium_Core_Curve25519_Fe $f)
+    public static function fe_mul121666(ParagonIE_Sodium_Core_Curve25519_Fe $f): ParagonIE_Sodium_Core_Curve25519_Fe
     {
         $h = array(
-            self::mul((int) $f[0], 121666, 17),
-            self::mul((int) $f[1], 121666, 17),
-            self::mul((int) $f[2], 121666, 17),
-            self::mul((int) $f[3], 121666, 17),
-            self::mul((int) $f[4], 121666, 17),
-            self::mul((int) $f[5], 121666, 17),
-            self::mul((int) $f[6], 121666, 17),
-            self::mul((int) $f[7], 121666, 17),
-            self::mul((int) $f[8], 121666, 17),
-            self::mul((int) $f[9], 121666, 17)
+            self::mul($f[0], 121666, 17),
+            self::mul($f[1], 121666, 17),
+            self::mul($f[2], 121666, 17),
+            self::mul($f[3], 121666, 17),
+            self::mul($f[4], 121666, 17),
+            self::mul($f[5], 121666, 17),
+            self::mul($f[6], 121666, 17),
+            self::mul($f[7], 121666, 17),
+            self::mul($f[8], 121666, 17),
+            self::mul($f[9], 121666, 17)
         );
 
-        /** @var int $carry9 */
         $carry9 = ($h[9] + (1 << 24)) >> 25;
         $h[0] += self::mul($carry9, 19, 5);
         $h[9] -= $carry9 << 25;
-        /** @var int $carry1 */
+
         $carry1 = ($h[1] + (1 << 24)) >> 25;
         $h[2] += $carry1;
         $h[1] -= $carry1 << 25;
-        /** @var int $carry3 */
+
         $carry3 = ($h[3] + (1 << 24)) >> 25;
         $h[4] += $carry3;
         $h[3] -= $carry3 << 25;
-        /** @var int $carry5 */
+
         $carry5 = ($h[5] + (1 << 24)) >> 25;
         $h[6] += $carry5;
         $h[5] -= $carry5 << 25;
-        /** @var int $carry7 */
+
         $carry7 = ($h[7] + (1 << 24)) >> 25;
         $h[8] += $carry7;
         $h[7] -= $carry7 << 25;
 
-        /** @var int $carry0 */
+
         $carry0 = ($h[0] + (1 << 25)) >> 26;
         $h[1] += $carry0;
         $h[0] -= $carry0 << 26;
-        /** @var int $carry2 */
+
         $carry2 = ($h[2] + (1 << 25)) >> 26;
         $h[3] += $carry2;
         $h[2] -= $carry2 << 26;
-        /** @var int $carry4 */
+
         $carry4 = ($h[4] + (1 << 25)) >> 26;
         $h[5] += $carry4;
         $h[4] -= $carry4 << 26;
-        /** @var int $carry6 */
+
         $carry6 = ($h[6] + (1 << 25)) >> 26;
         $h[7] += $carry6;
         $h[6] -= $carry6 << 26;
-        /** @var int $carry8 */
+
         $carry8 = ($h[8] + (1 << 25)) >> 26;
         $h[9] += $carry8;
         $h[8] -= $carry8 << 26;
@@ -158,117 +137,60 @@ abstract class ParagonIE_Sodium_Core_X25519 extends ParagonIE_Sodium_Core_Curve2
      * @throws SodiumException
      * @throws TypeError
      */
-    public static function crypto_scalarmult_curve25519_ref10($n, $p)
-    {
-        # for (i = 0;i < 32;++i) e[i] = n[i];
-        $e = '' . $n;
-        # e[0] &= 248;
+    public static function crypto_scalarmult_curve25519_ref10(
+        #[SensitiveParameter]
+        string $n,
+        #[SensitiveParameter]
+        string $p
+    ): string {
+        $e = $n;
         $e[0] = self::intToChr(
             self::chrToInt($e[0]) & 248
         );
-        # e[31] &= 127;
-        # e[31] |= 64;
         $e[31] = self::intToChr(
             (self::chrToInt($e[31]) & 127) | 64
         );
-        # fe_frombytes(x1,p);
         $x1 = self::fe_frombytes($p);
-        # fe_1(x2);
         $x2 = self::fe_1();
-        # fe_0(z2);
         $z2 = self::fe_0();
-        # fe_copy(x3,x1);
-        $x3 = self::fe_copy($x1);
-        # fe_1(z3);
+        $x3 = clone $x1;
         $z3 = self::fe_1();
 
-        # swap = 0;
-        /** @var int $swap */
         $swap = 0;
-
-        # for (pos = 254;pos >= 0;--pos) {
         for ($pos = 254; $pos >= 0; --$pos) {
             # b = e[pos / 8] >> (pos & 7);
-            /** @var int $b */
             $b = self::chrToInt(
-                    $e[(int) floor($pos / 8)]
+                    $e[$pos >> 3]
                 ) >> ($pos & 7);
-            # b &= 1;
             $b &= 1;
-            # swap ^= b;
             $swap ^= $b;
-            # fe_cswap(x2,x3,swap);
             self::fe_cswap($x2, $x3, $swap);
-            # fe_cswap(z2,z3,swap);
             self::fe_cswap($z2, $z3, $swap);
-            # swap = b;
             $swap = $b;
-            # fe_sub(tmp0,x3,z3);
             $tmp0 = self::fe_sub($x3, $z3);
-            # fe_sub(tmp1,x2,z2);
             $tmp1 = self::fe_sub($x2, $z2);
-
-            # fe_add(x2,x2,z2);
             $x2 = self::fe_add($x2, $z2);
-
-            # fe_add(z2,x3,z3);
             $z2 = self::fe_add($x3, $z3);
-
-            # fe_mul(z3,tmp0,x2);
             $z3 = self::fe_mul($tmp0, $x2);
-
-            # fe_mul(z2,z2,tmp1);
             $z2 = self::fe_mul($z2, $tmp1);
-
-            # fe_sq(tmp0,tmp1);
             $tmp0 = self::fe_sq($tmp1);
-
-            # fe_sq(tmp1,x2);
             $tmp1 = self::fe_sq($x2);
-
-            # fe_add(x3,z3,z2);
             $x3 = self::fe_add($z3, $z2);
-
-            # fe_sub(z2,z3,z2);
             $z2 = self::fe_sub($z3, $z2);
-
-            # fe_mul(x2,tmp1,tmp0);
             $x2 = self::fe_mul($tmp1, $tmp0);
-
-            # fe_sub(tmp1,tmp1,tmp0);
             $tmp1 = self::fe_sub($tmp1, $tmp0);
-
-            # fe_sq(z2,z2);
             $z2 = self::fe_sq($z2);
-
-            # fe_mul121666(z3,tmp1);
             $z3 = self::fe_mul121666($tmp1);
-
-            # fe_sq(x3,x3);
             $x3 = self::fe_sq($x3);
-
-            # fe_add(tmp0,tmp0,z3);
             $tmp0 = self::fe_add($tmp0, $z3);
-
-            # fe_mul(z3,x1,z2);
             $z3 = self::fe_mul($x1, $z2);
-
-            # fe_mul(z2,tmp1,tmp0);
             $z2 = self::fe_mul($tmp1, $tmp0);
         }
-
-        # fe_cswap(x2,x3,swap);
         self::fe_cswap($x2, $x3, $swap);
-
-        # fe_cswap(z2,z3,swap);
         self::fe_cswap($z2, $z3, $swap);
 
-        # fe_invert(z2,z2);
         $z2 = self::fe_invert($z2);
-
-        # fe_mul(x2,x2,z2);
         $x2 = self::fe_mul($x2, $z2);
-        # fe_tobytes(q,x2);
         return self::fe_tobytes($x2);
     }
 
@@ -282,7 +204,7 @@ abstract class ParagonIE_Sodium_Core_X25519 extends ParagonIE_Sodium_Core_Curve2
     public static function edwards_to_montgomery(
         ParagonIE_Sodium_Core_Curve25519_Fe $edwardsY,
         ParagonIE_Sodium_Core_Curve25519_Fe $edwardsZ
-    ) {
+    ): ParagonIE_Sodium_Core_Curve25519_Fe {
         $tempX = self::fe_add($edwardsZ, $edwardsY);
         $tempZ = self::fe_sub($edwardsZ, $edwardsY);
         $tempZ = self::fe_invert($tempZ);
@@ -297,30 +219,19 @@ abstract class ParagonIE_Sodium_Core_X25519 extends ParagonIE_Sodium_Core_Curve2
      * @throws SodiumException
      * @throws TypeError
      */
-    public static function crypto_scalarmult_curve25519_ref10_base($n)
-    {
-        # for (i = 0;i < 32;++i) e[i] = n[i];
-        $e = '' . $n;
-
-        # e[0] &= 248;
+    public static function crypto_scalarmult_curve25519_ref10_base(
+        #[SensitiveParameter]
+        string $n
+    ): string {
+        $e = $n;
         $e[0] = self::intToChr(
             self::chrToInt($e[0]) & 248
         );
-
-        # e[31] &= 127;
-        # e[31] |= 64;
         $e[31] = self::intToChr(
             (self::chrToInt($e[31]) & 127) | 64
         );
 
         $A = self::ge_scalarmult_base($e);
-        if (
-            !($A->Y instanceof ParagonIE_Sodium_Core_Curve25519_Fe)
-                ||
-            !($A->Z instanceof ParagonIE_Sodium_Core_Curve25519_Fe)
-        ) {
-            throw new TypeError('Null points encountered');
-        }
         $pk = self::edwards_to_montgomery($A->Y, $A->Z);
         return self::fe_tobytes($pk);
     }

diff --git a/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core/XChaCha20.php b/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core/XChaCha20.php
index 39e717b79a795ad2b6c6d1b60ca38d0b934f649b..4e91dd79f66869e7bb84013f6e0146164988d302 100644 (file)
--- a/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core/XChaCha20.php
+++ b/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core/XChaCha20.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 if (class_exists('ParagonIE_Sodium_Core_XChaCha20', false)) {
     return;
@@ -19,8 +20,12 @@ class ParagonIE_Sodium_Core_XChaCha20 extends ParagonIE_Sodium_Core_HChaCha20
      * @throws SodiumException
      * @throws TypeError
      */
-    public static function stream($len = 64, $nonce = '', $key = '')
-    {
+    public static function stream(
+        int $len = 64,
+        string $nonce = '',
+        #[SensitiveParameter]
+        string $key = ''
+    ): string {
         if (self::strlen($nonce) !== 24) {
             throw new SodiumException('Nonce must be 24 bytes long');
         }
@@ -46,8 +51,12 @@ class ParagonIE_Sodium_Core_XChaCha20 extends ParagonIE_Sodium_Core_HChaCha20
      * @throws SodiumException
      * @throws TypeError
      */
-    public static function ietfStream($len = 64, $nonce = '', $key = '')
-    {
+    public static function ietfStream(
+        int $len = 64,
+        string $nonce = '',
+        #[SensitiveParameter]
+        string $key = ''
+    ): string {
         if (self::strlen($nonce) !== 24) {
             throw new SodiumException('Nonce must be 24 bytes long');
         }
@@ -74,8 +83,14 @@ class ParagonIE_Sodium_Core_XChaCha20 extends ParagonIE_Sodium_Core_HChaCha20
      * @throws SodiumException
      * @throws TypeError
      */
-    public static function streamXorIc($message, $nonce = '', $key = '', $ic = '')
-    {
+    public static function streamXorIc(
+        #[SensitiveParameter]
+        string $message,
+        string $nonce = '',
+        #[SensitiveParameter]
+        string $key = '',
+        string $ic = ''
+    ): string {
         if (self::strlen($nonce) !== 24) {
             throw new SodiumException('Nonce must be 24 bytes long');
         }
@@ -100,8 +115,13 @@ class ParagonIE_Sodium_Core_XChaCha20 extends ParagonIE_Sodium_Core_HChaCha20
      * @throws SodiumException
      * @throws TypeError
      */
-    public static function ietfStreamXorIc($message, $nonce = '', $key = '', $ic = '')
-    {
+    public static function ietfStreamXorIc(
+        #[SensitiveParameter]
+        string $message,
+        string $nonce = '',
+        string $key = '',
+        string $ic = ''
+    ): string {
         if (self::strlen($nonce) !== 24) {
             throw new SodiumException('Nonce must be 24 bytes long');
         }

diff --git a/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core/XSalsa20.php b/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core/XSalsa20.php
index 9ef989eecadaf15083178750c1296973d5bf807d..ac183afb588fc6d92bd0b02219769f1a053260af 100644 (file)
--- a/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core/XSalsa20.php
+++ b/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core/XSalsa20.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 if (class_exists('ParagonIE_Sodium_Core_XSalsa20', false)) {
     return;
@@ -21,14 +22,17 @@ abstract class ParagonIE_Sodium_Core_XSalsa20 extends ParagonIE_Sodium_Core_HSal
      * @throws SodiumException
      * @throws TypeError
      */
-    public static function xsalsa20($len, $nonce, $key)
-    {
-        $ret = self::salsa20(
+    public static function xsalsa20(
+        int $len,
+        string $nonce,
+        #[SensitiveParameter]
+        string $key
+    ): string {
+        return self::salsa20(
             $len,
             self::substr($nonce, 16, 8),
             self::hsalsa20($nonce, $key)
         );
-        return $ret;
     }
 
     /**
@@ -43,8 +47,13 @@ abstract class ParagonIE_Sodium_Core_XSalsa20 extends ParagonIE_Sodium_Core_HSal
      * @throws SodiumException
      * @throws TypeError
      */
-    public static function xsalsa20_xor($message, $nonce, $key)
-    {
+    public static function xsalsa20_xor(
+        #[SensitiveParameter]
+        string $message,
+        string $nonce,
+        #[SensitiveParameter]
+        string $key
+    ): string {
         return self::xorStrings(
             $message,
             self::xsalsa20(

diff --git a/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core32/BLAKE2b.php b/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core32/BLAKE2b.php
deleted file mode 100644 (file)
index 0fed21a..0000000
--- a/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core32/BLAKE2b.php
+++ /dev/null
@@ -1,719 +0,0 @@
-<?php
-
-if (class_exists('ParagonIE_Sodium_Core_BLAKE2b', false)) {
-    return;
-}
-
-/**
- * Class ParagonIE_Sodium_Core_BLAKE2b
- *
- * Based on the work of Devi Mandiri in devi/salt.
- */
-abstract class ParagonIE_Sodium_Core32_BLAKE2b extends ParagonIE_Sodium_Core_Util
-{
-    /**
-     * @var SplFixedArray
-     */
-    public static $iv;
-
-    /**
-     * @var array<int, array<int, int>>
-     */
-    public static $sigma = array(
-        array(  0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14, 15),
-        array( 14, 10,  4,  8,  9, 15, 13,  6,  1, 12,  0,  2, 11,  7,  5,  3),
-        array( 11,  8, 12,  0,  5,  2, 15, 13, 10, 14,  3,  6,  7,  1,  9,  4),
-        array(  7,  9,  3,  1, 13, 12, 11, 14,  2,  6,  5, 10,  4,  0, 15,  8),
-        array(  9,  0,  5,  7,  2,  4, 10, 15, 14,  1, 11, 12,  6,  8,  3, 13),
-        array(  2, 12,  6, 10,  0, 11,  8,  3,  4, 13,  7,  5, 15, 14,  1,  9),
-        array( 12,  5,  1, 15, 14, 13,  4, 10,  0,  7,  6,  3,  9,  2,  8, 11),
-        array( 13, 11,  7, 14, 12,  1,  3,  9,  5,  0, 15,  4,  8,  6,  2, 10),
-        array(  6, 15, 14,  9, 11,  3,  0,  8, 12,  2, 13,  7,  1,  4, 10,  5),
-        array( 10,  2,  8,  4,  7,  6,  1,  5, 15, 11,  9, 14,  3, 12, 13 , 0),
-        array(  0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14, 15),
-        array( 14, 10,  4,  8,  9, 15, 13,  6,  1, 12,  0,  2, 11,  7,  5,  3)
-    );
-
-    const BLOCKBYTES = 128;
-    const OUTBYTES   = 64;
-    const KEYBYTES   = 64;
-
-    /**
-     * Turn two 32-bit integers into a fixed array representing a 64-bit integer.
-     *
-     * @internal You should not use this directly from another application
-     *
-     * @param int $high
-     * @param int $low
-     * @return ParagonIE_Sodium_Core32_Int64
-     * @throws SodiumException
-     * @throws TypeError
-     */
-    public static function new64($high, $low)
-    {
-        return ParagonIE_Sodium_Core32_Int64::fromInts($low, $high);
-    }
-
-    /**
-     * Convert an arbitrary number into an SplFixedArray of two 32-bit integers
-     * that represents a 64-bit integer.
-     *
-     * @internal You should not use this directly from another application
-     *
-     * @param int $num
-     * @return ParagonIE_Sodium_Core32_Int64
-     * @throws SodiumException
-     * @throws TypeError
-     */
-    protected static function to64($num)
-    {
-        list($hi, $lo) = self::numericTo64BitInteger($num);
-        return self::new64($hi, $lo);
-    }
-
-    /**
-     * Adds two 64-bit integers together, returning their sum as a SplFixedArray
-     * containing two 32-bit integers (representing a 64-bit integer).
-     *
-     * @internal You should not use this directly from another application
-     *
-     * @param ParagonIE_Sodium_Core32_Int64 $x
-     * @param ParagonIE_Sodium_Core32_Int64 $y
-     * @return ParagonIE_Sodium_Core32_Int64
-     */
-    protected static function add64($x, $y)
-    {
-        return $x->addInt64($y);
-    }
-
-    /**
-     * @internal You should not use this directly from another application
-     *
-     * @param ParagonIE_Sodium_Core32_Int64 $x
-     * @param ParagonIE_Sodium_Core32_Int64 $y
-     * @param ParagonIE_Sodium_Core32_Int64 $z
-     * @return ParagonIE_Sodium_Core32_Int64
-     */
-    public static function add364($x, $y, $z)
-    {
-        return $x->addInt64($y)->addInt64($z);
-    }
-
-    /**
-     * @internal You should not use this directly from another application
-     *
-     * @param ParagonIE_Sodium_Core32_Int64 $x
-     * @param ParagonIE_Sodium_Core32_Int64 $y
-     * @return ParagonIE_Sodium_Core32_Int64
-     * @throws TypeError
-     */
-    public static function xor64(ParagonIE_Sodium_Core32_Int64 $x, ParagonIE_Sodium_Core32_Int64 $y)
-    {
-        return $x->xorInt64($y);
-    }
-
-    /**
-     * @internal You should not use this directly from another application
-     *
-     * @param ParagonIE_Sodium_Core32_Int64 $x
-     * @param int $c
-     * @return ParagonIE_Sodium_Core32_Int64
-     * @throws SodiumException
-     * @throws TypeError
-     */
-    public static function rotr64(ParagonIE_Sodium_Core32_Int64 $x, $c)
-    {
-        return $x->rotateRight($c);
-    }
-
-    /**
-     * @internal You should not use this directly from another application
-     *
-     * @param SplFixedArray $x
-     * @param int $i
-     * @return ParagonIE_Sodium_Core32_Int64
-     * @throws SodiumException
-     * @throws TypeError
-     */
-    public static function load64($x, $i)
-    {
-        /** @var int $l */
-        $l = (int) ($x[$i])
-             | ((int) ($x[$i+1]) << 8)
-             | ((int) ($x[$i+2]) << 16)
-             | ((int) ($x[$i+3]) << 24);
-        /** @var int $h */
-        $h = (int) ($x[$i+4])
-             | ((int) ($x[$i+5]) << 8)
-             | ((int) ($x[$i+6]) << 16)
-             | ((int) ($x[$i+7]) << 24);
-        return self::new64($h, $l);
-    }
-
-    /**
-     * @internal You should not use this directly from another application
-     *
-     * @param SplFixedArray $x
-     * @param int $i
-     * @param ParagonIE_Sodium_Core32_Int64 $u
-     * @return void
-     * @throws TypeError
-     * @psalm-suppress MixedArgument
-     * @psalm-suppress MixedAssignment
-     * @psalm-suppress MixedArrayAccess
-     * @psalm-suppress MixedArrayAssignment
-     * @psalm-suppress MixedArrayOffset
-     */
-    public static function store64(SplFixedArray $x, $i, ParagonIE_Sodium_Core32_Int64 $u)
-    {
-        $v = clone $u;
-        $maxLength = $x->getSize() - 1;
-        for ($j = 0; $j < 8; ++$j) {
-            $k = 3 - ($j >> 1);
-            $x[$i] = $v->limbs[$k] & 0xff;
-            if (++$i > $maxLength) {
-                return;
-            }
-            $v->limbs[$k] >>= 8;
-        }
-    }
-
-    /**
-     * This just sets the $iv static variable.
-     *
-     * @internal You should not use this directly from another application
-     *
-     * @return void
-     * @throws SodiumException
-     * @throws TypeError
-     */
-    public static function pseudoConstructor()
-    {
-        static $called = false;
-        if ($called) {
-            return;
-        }
-        self::$iv = new SplFixedArray(8);
-        self::$iv[0] = self::new64(0x6a09e667, 0xf3bcc908);
-        self::$iv[1] = self::new64(0xbb67ae85, 0x84caa73b);
-        self::$iv[2] = self::new64(0x3c6ef372, 0xfe94f82b);
-        self::$iv[3] = self::new64(0xa54ff53a, 0x5f1d36f1);
-        self::$iv[4] = self::new64(0x510e527f, 0xade682d1);
-        self::$iv[5] = self::new64(0x9b05688c, 0x2b3e6c1f);
-        self::$iv[6] = self::new64(0x1f83d9ab, 0xfb41bd6b);
-        self::$iv[7] = self::new64(0x5be0cd19, 0x137e2179);
-
-        $called = true;
-    }
-
-    /**
-     * Returns a fresh BLAKE2 context.
-     *
-     * @internal You should not use this directly from another application
-     *
-     * @return SplFixedArray
-     * @throws TypeError
-     * @psalm-suppress MixedArgument
-     * @psalm-suppress MixedAssignment
-     * @psalm-suppress MixedArrayAccess
-     * @psalm-suppress MixedArrayAssignment
-     * @psalm-suppress MixedArrayOffset
-     * @throws SodiumException
-     * @throws TypeError
-     */
-    protected static function context()
-    {
-        $ctx    = new SplFixedArray(6);
-        $ctx[0] = new SplFixedArray(8);   // h
-        $ctx[1] = new SplFixedArray(2);   // t
-        $ctx[2] = new SplFixedArray(2);   // f
-        $ctx[3] = new SplFixedArray(256); // buf
-        $ctx[4] = 0;                      // buflen
-        $ctx[5] = 0;                      // last_node (uint8_t)
-
-        for ($i = 8; $i--;) {
-            $ctx[0][$i] = self::$iv[$i];
-        }
-        for ($i = 256; $i--;) {
-            $ctx[3][$i] = 0;
-        }
-
-        $zero = self::new64(0, 0);
-        $ctx[1][0] = $zero;
-        $ctx[1][1] = $zero;
-        $ctx[2][0] = $zero;
-        $ctx[2][1] = $zero;
-
-        return $ctx;
-    }
-
-    /**
-     * @internal You should not use this directly from another application
-     *
-     * @param SplFixedArray $ctx
-     * @param SplFixedArray $buf
-     * @return void
-     * @throws SodiumException
-     * @throws TypeError
-     * @psalm-suppress MixedArgument
-     * @psalm-suppress MixedArrayAccess
-     * @psalm-suppress MixedArrayAssignment
-     * @psalm-suppress MixedAssignment
-     */
-    protected static function compress(SplFixedArray $ctx, SplFixedArray $buf)
-    {
-        $m = new SplFixedArray(16);
-        $v = new SplFixedArray(16);
-
-        for ($i = 16; $i--;) {
-            $m[$i] = self::load64($buf, $i << 3);
-        }
-
-        for ($i = 8; $i--;) {
-            $v[$i] = $ctx[0][$i];
-        }
-
-        $v[ 8] = self::$iv[0];
-        $v[ 9] = self::$iv[1];
-        $v[10] = self::$iv[2];
-        $v[11] = self::$iv[3];
-
-        $v[12] = self::xor64($ctx[1][0], self::$iv[4]);
-        $v[13] = self::xor64($ctx[1][1], self::$iv[5]);
-        $v[14] = self::xor64($ctx[2][0], self::$iv[6]);
-        $v[15] = self::xor64($ctx[2][1], self::$iv[7]);
-
-        for ($r = 0; $r < 12; ++$r) {
-            $v = self::G($r, 0, 0, 4, 8, 12, $v, $m);
-            $v = self::G($r, 1, 1, 5, 9, 13, $v, $m);
-            $v = self::G($r, 2, 2, 6, 10, 14, $v, $m);
-            $v = self::G($r, 3, 3, 7, 11, 15, $v, $m);
-            $v = self::G($r, 4, 0, 5, 10, 15, $v, $m);
-            $v = self::G($r, 5, 1, 6, 11, 12, $v, $m);
-            $v = self::G($r, 6, 2, 7, 8, 13, $v, $m);
-            $v = self::G($r, 7, 3, 4, 9, 14, $v, $m);
-        }
-
-        for ($i = 8; $i--;) {
-            $ctx[0][$i] = self::xor64(
-                $ctx[0][$i], self::xor64($v[$i], $v[$i+8])
-            );
-        }
-    }
-
-    /**
-     * @internal You should not use this directly from another application
-     *
-     * @param int $r
-     * @param int $i
-     * @param int $a
-     * @param int $b
-     * @param int $c
-     * @param int $d
-     * @param SplFixedArray $v
-     * @param SplFixedArray $m
-     * @return SplFixedArray
-     * @throws SodiumException
-     * @throws TypeError
-     * @psalm-suppress MixedArgument
-     * @psalm-suppress MixedArrayOffset
-     */
-    public static function G($r, $i, $a, $b, $c, $d, SplFixedArray $v, SplFixedArray $m)
-    {
-        $v[$a] = self::add364($v[$a], $v[$b], $m[self::$sigma[$r][$i << 1]]);
-        $v[$d] = self::rotr64(self::xor64($v[$d], $v[$a]), 32);
-        $v[$c] = self::add64($v[$c], $v[$d]);
-        $v[$b] = self::rotr64(self::xor64($v[$b], $v[$c]), 24);
-        $v[$a] = self::add364($v[$a], $v[$b], $m[self::$sigma[$r][($i << 1) + 1]]);
-        $v[$d] = self::rotr64(self::xor64($v[$d], $v[$a]), 16);
-        $v[$c] = self::add64($v[$c], $v[$d]);
-        $v[$b] = self::rotr64(self::xor64($v[$b], $v[$c]), 63);
-        return $v;
-    }
-
-    /**
-     * @internal You should not use this directly from another application
-     *
-     * @param SplFixedArray $ctx
-     * @param int $inc
-     * @return void
-     * @throws SodiumException
-     * @throws TypeError
-     * @psalm-suppress MixedArgument
-     * @psalm-suppress MixedArrayAccess
-     * @psalm-suppress MixedArrayAssignment
-     */
-    public static function increment_counter($ctx, $inc)
-    {
-        if ($inc < 0) {
-            throw new SodiumException('Increasing by a negative number makes no sense.');
-        }
-        $t = self::to64($inc);
-        # S->t is $ctx[1] in our implementation
-
-        # S->t[0] = ( uint64_t )( t >> 0 );
-        $ctx[1][0] = self::add64($ctx[1][0], $t);
-
-        # S->t[1] += ( S->t[0] < inc );
-        if (!($ctx[1][0] instanceof ParagonIE_Sodium_Core32_Int64)) {
-            throw new TypeError('Not an int64');
-        }
-        /** @var ParagonIE_Sodium_Core32_Int64 $c*/
-        $c = $ctx[1][0];
-        if ($c->isLessThanInt($inc)) {
-            $ctx[1][1] = self::add64($ctx[1][1], self::to64(1));
-        }
-    }
-
-    /**
-     * @internal You should not use this directly from another application
-     *
-     * @param SplFixedArray $ctx
-     * @param SplFixedArray $p
-     * @param int $plen
-     * @return void
-     * @throws SodiumException
-     * @throws TypeError
-     * @psalm-suppress MixedArgument
-     * @psalm-suppress MixedAssignment
-     * @psalm-suppress MixedArrayAccess
-     * @psalm-suppress MixedArrayAssignment
-     * @psalm-suppress MixedArrayOffset
-     * @psalm-suppress MixedMethodCall
-     * @psalm-suppress MixedOperand
-     */
-    public static function update(SplFixedArray $ctx, SplFixedArray $p, $plen)
-    {
-        self::pseudoConstructor();
-
-        $offset = 0;
-        while ($plen > 0) {
-            $left = $ctx[4];
-            $fill = 256 - $left;
-
-            if ($plen > $fill) {
-                # memcpy( S->buf + left, in, fill ); /* Fill buffer */
-                for ($i = $fill; $i--;) {
-                    $ctx[3][$i + $left] = $p[$i + $offset];
-                }
-
-                # S->buflen += fill;
-                $ctx[4] += $fill;
-
-                # blake2b_increment_counter( S, BLAKE2B_BLOCKBYTES );
-                self::increment_counter($ctx, 128);
-
-                # blake2b_compress( S, S->buf ); /* Compress */
-                self::compress($ctx, $ctx[3]);
-
-                # memcpy( S->buf, S->buf + BLAKE2B_BLOCKBYTES, BLAKE2B_BLOCKBYTES ); /* Shift buffer left */
-                for ($i = 128; $i--;) {
-                    $ctx[3][$i] = $ctx[3][$i + 128];
-                }
-
-                # S->buflen -= BLAKE2B_BLOCKBYTES;
-                $ctx[4] -= 128;
-
-                # in += fill;
-                $offset += $fill;
-
-                # inlen -= fill;
-                $plen -= $fill;
-            } else {
-                for ($i = $plen; $i--;) {
-                    $ctx[3][$i + $left] = $p[$i + $offset];
-                }
-                $ctx[4] += $plen;
-                $offset += $plen;
-                $plen -= $plen;
-            }
-        }
-    }
-
-    /**
-     * @internal You should not use this directly from another application
-     *
-     * @param SplFixedArray $ctx
-     * @param SplFixedArray $out
-     * @return SplFixedArray
-     * @throws SodiumException
-     * @throws TypeError
-     * @psalm-suppress MixedArgument
-     * @psalm-suppress MixedAssignment
-     * @psalm-suppress MixedArrayAccess
-     * @psalm-suppress MixedArrayAssignment
-     * @psalm-suppress MixedArrayOffset
-     * @psalm-suppress MixedMethodCall
-     * @psalm-suppress MixedOperand
-     */
-    public static function finish(SplFixedArray $ctx, SplFixedArray $out)
-    {
-        self::pseudoConstructor();
-        if ($ctx[4] > 128) {
-            self::increment_counter($ctx, 128);
-            self::compress($ctx, $ctx[3]);
-            $ctx[4] -= 128;
-            if ($ctx[4] > 128) {
-                throw new SodiumException('Failed to assert that buflen <= 128 bytes');
-            }
-            for ($i = $ctx[4]; $i--;) {
-                $ctx[3][$i] = $ctx[3][$i + 128];
-            }
-        }
-
-        self::increment_counter($ctx, $ctx[4]);
-        $ctx[2][0] = self::new64(0xffffffff, 0xffffffff);
-
-        for ($i = 256 - $ctx[4]; $i--;) {
-            /** @var int $i */
-            $ctx[3][$i + $ctx[4]] = 0;
-        }
-
-        self::compress($ctx, $ctx[3]);
-
-        $i = (int) (($out->getSize() - 1) / 8);
-        for (; $i >= 0; --$i) {
-            self::store64($out, $i << 3, $ctx[0][$i]);
-        }
-        return $out;
-    }
-
-    /**
-     * @internal You should not use this directly from another application
-     *
-     * @param SplFixedArray|null $key
-     * @param int $outlen
-     * @param SplFixedArray|null $salt
-     * @param SplFixedArray|null $personal
-     * @return SplFixedArray
-     * @throws SodiumException
-     * @throws TypeError
-     * @psalm-suppress MixedArgument
-     * @psalm-suppress MixedAssignment
-     * @psalm-suppress MixedArrayAccess
-     * @psalm-suppress MixedArrayAssignment
-     * @psalm-suppress MixedMethodCall
-     */
-    public static function init(
-        $key = null,
-        $outlen = 64,
-        $salt = null,
-        $personal = null
-    ) {
-        self::pseudoConstructor();
-        $klen = 0;
-
-        if ($key !== null) {
-            if (count($key) > 64) {
-                throw new SodiumException('Invalid key size');
-            }
-            $klen = count($key);
-        }
-
-        if ($outlen > 64) {
-            throw new SodiumException('Invalid output size');
-        }
-
-        $ctx = self::context();
-
-        $p = new SplFixedArray(64);
-        // Zero our param buffer...
-        for ($i = 64; --$i;) {
-            $p[$i] = 0;
-        }
-
-        $p[0] = $outlen; // digest_length
-        $p[1] = $klen;   // key_length
-        $p[2] = 1;       // fanout
-        $p[3] = 1;       // depth
-
-        if ($salt instanceof SplFixedArray) {
-            // salt: [32] through [47]
-            for ($i = 0; $i < 16; ++$i) {
-                $p[32 + $i] = (int) $salt[$i];
-            }
-        }
-        if ($personal instanceof SplFixedArray) {
-            // personal: [48] through [63]
-            for ($i = 0; $i < 16; ++$i) {
-                $p[48 + $i] = (int) $personal[$i];
-            }
-        }
-
-        $ctx[0][0] = self::xor64(
-            $ctx[0][0],
-            self::load64($p, 0)
-        );
-
-        if ($salt instanceof SplFixedArray || $personal instanceof SplFixedArray) {
-            // We need to do what blake2b_init_param() does:
-            for ($i = 1; $i < 8; ++$i) {
-                $ctx[0][$i] = self::xor64(
-                    $ctx[0][$i],
-                    self::load64($p, $i << 3)
-                );
-            }
-        }
-
-        if ($klen > 0 && $key instanceof SplFixedArray) {
-            $block = new SplFixedArray(128);
-            for ($i = 128; $i--;) {
-                $block[$i] = 0;
-            }
-            for ($i = $klen; $i--;) {
-                $block[$i] = $key[$i];
-            }
-            self::update($ctx, $block, 128);
-            $ctx[4] = 128;
-        }
-
-        return $ctx;
-    }
-
-    /**
-     * Convert a string into an SplFixedArray of integers
-     *
-     * @internal You should not use this directly from another application
-     *
-     * @param string $str
-     * @return SplFixedArray
-     * @psalm-suppress MixedArgumentTypeCoercion
-     */
-    public static function stringToSplFixedArray($str = '')
-    {
-        $values = unpack('C*', $str);
-        return SplFixedArray::fromArray(array_values($values));
-    }
-
-    /**
-     * Convert an SplFixedArray of integers into a string
-     *
-     * @internal You should not use this directly from another application
-     *
-     * @param SplFixedArray $a
-     * @return string
-     */
-    public static function SplFixedArrayToString(SplFixedArray $a)
-    {
-        /**
-         * @var array<int, string|int>
-         */
-        $arr = $a->toArray();
-        $c = $a->count();
-        array_unshift($arr, str_repeat('C', $c));
-        return (string) (call_user_func_array('pack', $arr));
-    }
-
-    /**
-     * @internal You should not use this directly from another application
-     *
-     * @param SplFixedArray $ctx
-     * @return string
-     * @throws TypeError
-     * @psalm-suppress MixedArgument
-     * @psalm-suppress MixedArrayAccess
-     * @psalm-suppress MixedArrayAssignment
-     * @psalm-suppress MixedMethodCall
-     */
-    public static function contextToString(SplFixedArray $ctx)
-    {
-        $str = '';
-        /** @var array<int, ParagonIE_Sodium_Core32_Int64> $ctxA */
-        $ctxA = $ctx[0]->toArray();
-
-        # uint64_t h[8];
-        for ($i = 0; $i < 8; ++$i) {
-            if (!($ctxA[$i] instanceof ParagonIE_Sodium_Core32_Int64)) {
-                throw new TypeError('Not an instance of Int64');
-            }
-            /** @var ParagonIE_Sodium_Core32_Int64 $ctxAi */
-            $ctxAi = $ctxA[$i];
-            $str .= $ctxAi->toReverseString();
-        }
-
-        # uint64_t t[2];
-        # uint64_t f[2];
-        for ($i = 1; $i < 3; ++$i) {
-            /** @var array<int, ParagonIE_Sodium_Core32_Int64> $ctxA */
-            $ctxA = $ctx[$i]->toArray();
-            /** @var ParagonIE_Sodium_Core32_Int64 $ctxA1 */
-            $ctxA1 = $ctxA[0];
-            /** @var ParagonIE_Sodium_Core32_Int64 $ctxA2 */
-            $ctxA2 = $ctxA[1];
-
-            $str .= $ctxA1->toReverseString();
-            $str .= $ctxA2->toReverseString();
-        }
-
-        # uint8_t buf[2 * 128];
-        $str .= self::SplFixedArrayToString($ctx[3]);
-
-        /** @var int $ctx4 */
-        $ctx4 = $ctx[4];
-
-        # size_t buflen;
-        $str .= implode('', array(
-            self::intToChr($ctx4 & 0xff),
-            self::intToChr(($ctx4 >> 8) & 0xff),
-            self::intToChr(($ctx4 >> 16) & 0xff),
-            self::intToChr(($ctx4 >> 24) & 0xff),
-            "\x00\x00\x00\x00"
-            /*
-            self::intToChr(($ctx4 >> 32) & 0xff),
-            self::intToChr(($ctx4 >> 40) & 0xff),
-            self::intToChr(($ctx4 >> 48) & 0xff),
-            self::intToChr(($ctx4 >> 56) & 0xff)
-            */
-        ));
-        # uint8_t last_node;
-        return $str . self::intToChr($ctx[5]) . str_repeat("\x00", 23);
-    }
-
-    /**
-     * Creates an SplFixedArray containing other SplFixedArray elements, from
-     * a string (compatible with \Sodium\crypto_generichash_{init, update, final})
-     *
-     * @internal You should not use this directly from another application
-     *
-     * @param string $string
-     * @return SplFixedArray
-     * @throws SodiumException
-     * @throws TypeError
-     * @psalm-suppress MixedArrayAccess
-     * @psalm-suppress MixedArrayAssignment
-     */
-    public static function stringToContext($string)
-    {
-        $ctx = self::context();
-
-        # uint64_t h[8];
-        for ($i = 0; $i < 8; ++$i) {
-            $ctx[0][$i] = ParagonIE_Sodium_Core32_Int64::fromReverseString(
-                self::substr($string, (($i << 3) + 0), 8)
-            );
-        }
-
-        # uint64_t t[2];
-        # uint64_t f[2];
-        for ($i = 1; $i < 3; ++$i) {
-            $ctx[$i][1] = ParagonIE_Sodium_Core32_Int64::fromReverseString(
-                self::substr($string, 72 + (($i - 1) << 4), 8)
-            );
-            $ctx[$i][0] = ParagonIE_Sodium_Core32_Int64::fromReverseString(
-                self::substr($string, 64 + (($i - 1) << 4), 8)
-            );
-        }
-
-        # uint8_t buf[2 * 128];
-        $ctx[3] = self::stringToSplFixedArray(self::substr($string, 96, 256));
-
-        # uint8_t buf[2 * 128];
-        $int = 0;
-        for ($i = 0; $i < 8; ++$i) {
-            $int |= self::chrToInt($string[352 + $i]) << ($i << 3);
-        }
-        $ctx[4] = $int;
-
-        return $ctx;
-    }
-}

diff --git a/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core32/ChaCha20.php b/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core32/ChaCha20.php
deleted file mode 100644 (file)
index 6f8c0bf..0000000
--- a/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core32/ChaCha20.php
+++ /dev/null
@@ -1,400 +0,0 @@
-<?php
-
-if (class_exists('ParagonIE_Sodium_Core32_ChaCha20', false)) {
-    return;
-}
-
-/**
- * Class ParagonIE_Sodium_Core32_ChaCha20
- */
-class ParagonIE_Sodium_Core32_ChaCha20 extends ParagonIE_Sodium_Core32_Util
-{
-    /**
-     * The ChaCha20 quarter round function. Works on four 32-bit integers.
-     *
-     * @internal You should not use this directly from another application
-     *
-     * @param ParagonIE_Sodium_Core32_Int32 $a
-     * @param ParagonIE_Sodium_Core32_Int32 $b
-     * @param ParagonIE_Sodium_Core32_Int32 $c
-     * @param ParagonIE_Sodium_Core32_Int32 $d
-     * @return array<int, ParagonIE_Sodium_Core32_Int32>
-     * @throws SodiumException
-     * @throws TypeError
-     */
-    protected static function quarterRound(
-        ParagonIE_Sodium_Core32_Int32 $a,
-        ParagonIE_Sodium_Core32_Int32 $b,
-        ParagonIE_Sodium_Core32_Int32 $c,
-        ParagonIE_Sodium_Core32_Int32 $d
-    ) {
-        /** @var ParagonIE_Sodium_Core32_Int32 $a */
-        /** @var ParagonIE_Sodium_Core32_Int32 $b */
-        /** @var ParagonIE_Sodium_Core32_Int32 $c */
-        /** @var ParagonIE_Sodium_Core32_Int32 $d */
-
-        # a = PLUS(a,b); d = ROTATE(XOR(d,a),16);
-        $a = $a->addInt32($b);
-        $d = $d->xorInt32($a)->rotateLeft(16);
-
-        # c = PLUS(c,d); b = ROTATE(XOR(b,c),12);
-        $c = $c->addInt32($d);
-        $b = $b->xorInt32($c)->rotateLeft(12);
-
-        # a = PLUS(a,b); d = ROTATE(XOR(d,a), 8);
-        $a = $a->addInt32($b);
-        $d = $d->xorInt32($a)->rotateLeft(8);
-
-        # c = PLUS(c,d); b = ROTATE(XOR(b,c), 7);
-        $c = $c->addInt32($d);
-        $b = $b->xorInt32($c)->rotateLeft(7);
-
-        return array($a, $b, $c, $d);
-    }
-
-    /**
-     * @internal You should not use this directly from another application
-     *
-     * @param ParagonIE_Sodium_Core32_ChaCha20_Ctx $ctx
-     * @param string $message
-     *
-     * @return string
-     * @throws SodiumException
-     * @throws TypeError
-     */
-    public static function encryptBytes(
-        ParagonIE_Sodium_Core32_ChaCha20_Ctx $ctx,
-        $message = ''
-    ) {
-        $bytes = self::strlen($message);
-
-        /** @var ParagonIE_Sodium_Core32_Int32 $x0 */
-        /** @var ParagonIE_Sodium_Core32_Int32 $x1 */
-        /** @var ParagonIE_Sodium_Core32_Int32 $x2 */
-        /** @var ParagonIE_Sodium_Core32_Int32 $x3 */
-        /** @var ParagonIE_Sodium_Core32_Int32 $x4 */
-        /** @var ParagonIE_Sodium_Core32_Int32 $x5 */
-        /** @var ParagonIE_Sodium_Core32_Int32 $x6 */
-        /** @var ParagonIE_Sodium_Core32_Int32 $x7 */
-        /** @var ParagonIE_Sodium_Core32_Int32 $x8 */
-        /** @var ParagonIE_Sodium_Core32_Int32 $x9 */
-        /** @var ParagonIE_Sodium_Core32_Int32 $x10 */
-        /** @var ParagonIE_Sodium_Core32_Int32 $x11 */
-        /** @var ParagonIE_Sodium_Core32_Int32 $x12 */
-        /** @var ParagonIE_Sodium_Core32_Int32 $x13 */
-        /** @var ParagonIE_Sodium_Core32_Int32 $x14 */
-        /** @var ParagonIE_Sodium_Core32_Int32 $x15 */
-
-        /*
-        j0 = ctx->input[0];
-        j1 = ctx->input[1];
-        j2 = ctx->input[2];
-        j3 = ctx->input[3];
-        j4 = ctx->input[4];
-        j5 = ctx->input[5];
-        j6 = ctx->input[6];
-        j7 = ctx->input[7];
-        j8 = ctx->input[8];
-        j9 = ctx->input[9];
-        j10 = ctx->input[10];
-        j11 = ctx->input[11];
-        j12 = ctx->input[12];
-        j13 = ctx->input[13];
-        j14 = ctx->input[14];
-        j15 = ctx->input[15];
-        */
-        /** @var ParagonIE_Sodium_Core32_Int32 $j0 */
-        $j0  = $ctx[0];
-        /** @var ParagonIE_Sodium_Core32_Int32 $j1 */
-        $j1  = $ctx[1];
-        /** @var ParagonIE_Sodium_Core32_Int32 $j2 */
-        $j2  = $ctx[2];
-        /** @var ParagonIE_Sodium_Core32_Int32 $j3 */
-        $j3  = $ctx[3];
-        /** @var ParagonIE_Sodium_Core32_Int32 $j4 */
-        $j4  = $ctx[4];
-        /** @var ParagonIE_Sodium_Core32_Int32 $j5 */
-        $j5  = $ctx[5];
-        /** @var ParagonIE_Sodium_Core32_Int32 $j6 */
-        $j6  = $ctx[6];
-        /** @var ParagonIE_Sodium_Core32_Int32 $j7 */
-        $j7  = $ctx[7];
-        /** @var ParagonIE_Sodium_Core32_Int32 $j8 */
-        $j8  = $ctx[8];
-        /** @var ParagonIE_Sodium_Core32_Int32 $j9 */
-        $j9  = $ctx[9];
-        /** @var ParagonIE_Sodium_Core32_Int32 $j10 */
-        $j10 = $ctx[10];
-        /** @var ParagonIE_Sodium_Core32_Int32 $j11 */
-        $j11 = $ctx[11];
-        /** @var ParagonIE_Sodium_Core32_Int32 $j12 */
-        $j12 = $ctx[12];
-        /** @var ParagonIE_Sodium_Core32_Int32 $j13 */
-        $j13 = $ctx[13];
-        /** @var ParagonIE_Sodium_Core32_Int32 $j14 */
-        $j14 = $ctx[14];
-        /** @var ParagonIE_Sodium_Core32_Int32 $j15 */
-        $j15 = $ctx[15];
-
-        $c = '';
-        for (;;) {
-            if ($bytes < 64) {
-                $message .= str_repeat("\x00", 64 - $bytes);
-            }
-
-            $x0 =  clone $j0;
-            $x1 =  clone $j1;
-            $x2 =  clone $j2;
-            $x3 =  clone $j3;
-            $x4 =  clone $j4;
-            $x5 =  clone $j5;
-            $x6 =  clone $j6;
-            $x7 =  clone $j7;
-            $x8 =  clone $j8;
-            $x9 =  clone $j9;
-            $x10 = clone $j10;
-            $x11 = clone $j11;
-            $x12 = clone $j12;
-            $x13 = clone $j13;
-            $x14 = clone $j14;
-            $x15 = clone $j15;
-
-            # for (i = 20; i > 0; i -= 2) {
-            for ($i = 20; $i > 0; $i -= 2) {
-                # QUARTERROUND( x0,  x4,  x8,  x12)
-                list($x0, $x4, $x8, $x12) = self::quarterRound($x0, $x4, $x8, $x12);
-
-                # QUARTERROUND( x1,  x5,  x9,  x13)
-                list($x1, $x5, $x9, $x13) = self::quarterRound($x1, $x5, $x9, $x13);
-
-                # QUARTERROUND( x2,  x6,  x10,  x14)
-                list($x2, $x6, $x10, $x14) = self::quarterRound($x2, $x6, $x10, $x14);
-
-                # QUARTERROUND( x3,  x7,  x11,  x15)
-                list($x3, $x7, $x11, $x15) = self::quarterRound($x3, $x7, $x11, $x15);
-
-                # QUARTERROUND( x0,  x5,  x10,  x15)
-                list($x0, $x5, $x10, $x15) = self::quarterRound($x0, $x5, $x10, $x15);
-
-                # QUARTERROUND( x1,  x6,  x11,  x12)
-                list($x1, $x6, $x11, $x12) = self::quarterRound($x1, $x6, $x11, $x12);
-
-                # QUARTERROUND( x2,  x7,  x8,  x13)
-                list($x2, $x7, $x8, $x13) = self::quarterRound($x2, $x7, $x8, $x13);
-
-                # QUARTERROUND( x3,  x4,  x9,  x14)
-                list($x3, $x4, $x9, $x14) = self::quarterRound($x3, $x4, $x9, $x14);
-            }
-            /*
-            x0 = PLUS(x0, j0);
-            x1 = PLUS(x1, j1);
-            x2 = PLUS(x2, j2);
-            x3 = PLUS(x3, j3);
-            x4 = PLUS(x4, j4);
-            x5 = PLUS(x5, j5);
-            x6 = PLUS(x6, j6);
-            x7 = PLUS(x7, j7);
-            x8 = PLUS(x8, j8);
-            x9 = PLUS(x9, j9);
-            x10 = PLUS(x10, j10);
-            x11 = PLUS(x11, j11);
-            x12 = PLUS(x12, j12);
-            x13 = PLUS(x13, j13);
-            x14 = PLUS(x14, j14);
-            x15 = PLUS(x15, j15);
-            */
-            $x0 = $x0->addInt32($j0);
-            $x1 = $x1->addInt32($j1);
-            $x2 = $x2->addInt32($j2);
-            $x3 = $x3->addInt32($j3);
-            $x4 = $x4->addInt32($j4);
-            $x5 = $x5->addInt32($j5);
-            $x6 = $x6->addInt32($j6);
-            $x7 = $x7->addInt32($j7);
-            $x8 = $x8->addInt32($j8);
-            $x9 = $x9->addInt32($j9);
-            $x10 = $x10->addInt32($j10);
-            $x11 = $x11->addInt32($j11);
-            $x12 = $x12->addInt32($j12);
-            $x13 = $x13->addInt32($j13);
-            $x14 = $x14->addInt32($j14);
-            $x15 = $x15->addInt32($j15);
-
-            /*
-            x0 = XOR(x0, LOAD32_LE(m + 0));
-            x1 = XOR(x1, LOAD32_LE(m + 4));
-            x2 = XOR(x2, LOAD32_LE(m + 8));
-            x3 = XOR(x3, LOAD32_LE(m + 12));
-            x4 = XOR(x4, LOAD32_LE(m + 16));
-            x5 = XOR(x5, LOAD32_LE(m + 20));
-            x6 = XOR(x6, LOAD32_LE(m + 24));
-            x7 = XOR(x7, LOAD32_LE(m + 28));
-            x8 = XOR(x8, LOAD32_LE(m + 32));
-            x9 = XOR(x9, LOAD32_LE(m + 36));
-            x10 = XOR(x10, LOAD32_LE(m + 40));
-            x11 = XOR(x11, LOAD32_LE(m + 44));
-            x12 = XOR(x12, LOAD32_LE(m + 48));
-            x13 = XOR(x13, LOAD32_LE(m + 52));
-            x14 = XOR(x14, LOAD32_LE(m + 56));
-            x15 = XOR(x15, LOAD32_LE(m + 60));
-            */
-            $x0  =  $x0->xorInt32(ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($message,  0, 4)));
-            $x1  =  $x1->xorInt32(ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($message,  4, 4)));
-            $x2  =  $x2->xorInt32(ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($message,  8, 4)));
-            $x3  =  $x3->xorInt32(ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($message, 12, 4)));
-            $x4  =  $x4->xorInt32(ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($message, 16, 4)));
-            $x5  =  $x5->xorInt32(ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($message, 20, 4)));
-            $x6  =  $x6->xorInt32(ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($message, 24, 4)));
-            $x7  =  $x7->xorInt32(ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($message, 28, 4)));
-            $x8  =  $x8->xorInt32(ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($message, 32, 4)));
-            $x9  =  $x9->xorInt32(ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($message, 36, 4)));
-            $x10 = $x10->xorInt32(ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($message, 40, 4)));
-            $x11 = $x11->xorInt32(ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($message, 44, 4)));
-            $x12 = $x12->xorInt32(ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($message, 48, 4)));
-            $x13 = $x13->xorInt32(ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($message, 52, 4)));
-            $x14 = $x14->xorInt32(ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($message, 56, 4)));
-            $x15 = $x15->xorInt32(ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($message, 60, 4)));
-
-            /*
-                j12 = PLUSONE(j12);
-                if (!j12) {
-                    j13 = PLUSONE(j13);
-                }
-             */
-            /** @var ParagonIE_Sodium_Core32_Int32 $j12 */
-            $j12 = $j12->addInt(1);
-            if ($j12->limbs[0] === 0 && $j12->limbs[1] === 0) {
-                $j13 = $j13->addInt(1);
-            }
-
-            /*
-            STORE32_LE(c + 0, x0);
-            STORE32_LE(c + 4, x1);
-            STORE32_LE(c + 8, x2);
-            STORE32_LE(c + 12, x3);
-            STORE32_LE(c + 16, x4);
-            STORE32_LE(c + 20, x5);
-            STORE32_LE(c + 24, x6);
-            STORE32_LE(c + 28, x7);
-            STORE32_LE(c + 32, x8);
-            STORE32_LE(c + 36, x9);
-            STORE32_LE(c + 40, x10);
-            STORE32_LE(c + 44, x11);
-            STORE32_LE(c + 48, x12);
-            STORE32_LE(c + 52, x13);
-            STORE32_LE(c + 56, x14);
-            STORE32_LE(c + 60, x15);
-            */
-
-            $block = $x0->toReverseString() .
-                $x1->toReverseString() .
-                $x2->toReverseString() .
-                $x3->toReverseString() .
-                $x4->toReverseString() .
-                $x5->toReverseString() .
-                $x6->toReverseString() .
-                $x7->toReverseString() .
-                $x8->toReverseString() .
-                $x9->toReverseString() .
-                $x10->toReverseString() .
-                $x11->toReverseString() .
-                $x12->toReverseString() .
-                $x13->toReverseString() .
-                $x14->toReverseString() .
-                $x15->toReverseString();
-
-            /* Partial block */
-            if ($bytes < 64) {
-                $c .= self::substr($block, 0, $bytes);
-                break;
-            }
-
-            /* Full block */
-            $c .= $block;
-            $bytes -= 64;
-            if ($bytes <= 0) {
-                break;
-            }
-            $message = self::substr($message, 64);
-        }
-        /* end for(;;) loop */
-
-        $ctx[12] = $j12;
-        $ctx[13] = $j13;
-        return $c;
-    }
-
-    /**
-     * @internal You should not use this directly from another application
-     *
-     * @param int $len
-     * @param string $nonce
-     * @param string $key
-     * @return string
-     * @throws SodiumException
-     * @throws TypeError
-     */
-    public static function stream($len = 64, $nonce = '', $key = '')
-    {
-        return self::encryptBytes(
-            new ParagonIE_Sodium_Core32_ChaCha20_Ctx($key, $nonce),
-            str_repeat("\x00", $len)
-        );
-    }
-
-    /**
-     * @internal You should not use this directly from another application
-     *
-     * @param int $len
-     * @param string $nonce
-     * @param string $key
-     * @return string
-     * @throws SodiumException
-     * @throws TypeError
-     */
-    public static function ietfStream($len, $nonce = '', $key = '')
-    {
-        return self::encryptBytes(
-            new ParagonIE_Sodium_Core32_ChaCha20_IetfCtx($key, $nonce),
-            str_repeat("\x00", $len)
-        );
-    }
-
-    /**
-     * @internal You should not use this directly from another application
-     *
-     * @param string $message
-     * @param string $nonce
-     * @param string $key
-     * @param string $ic
-     * @return string
-     * @throws SodiumException
-     * @throws TypeError
-     */
-    public static function ietfStreamXorIc($message, $nonce = '', $key = '', $ic = '')
-    {
-        return self::encryptBytes(
-            new ParagonIE_Sodium_Core32_ChaCha20_IetfCtx($key, $nonce, $ic),
-            $message
-        );
-    }
-
-    /**
-     * @internal You should not use this directly from another application
-     *
-     * @param string $message
-     * @param string $nonce
-     * @param string $key
-     * @param string $ic
-     * @return string
-     * @throws SodiumException
-     * @throws TypeError
-     */
-    public static function streamXorIc($message, $nonce = '', $key = '', $ic = '')
-    {
-        return self::encryptBytes(
-            new ParagonIE_Sodium_Core32_ChaCha20_Ctx($key, $nonce, $ic),
-            $message
-        );
-    }
-}

diff --git a/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core32/ChaCha20/Ctx.php b/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core32/ChaCha20/Ctx.php
deleted file mode 100644 (file)
index 37b058f..0000000
--- a/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core32/ChaCha20/Ctx.php
+++ /dev/null
@@ -1,130 +0,0 @@
-<?php
-
-if (class_exists('ParagonIE_Sodium_Core_ChaCha20_Ctx', false)) {
-    return;
-}
-
-/**
- * Class ParagonIE_Sodium_Core32_ChaCha20_Ctx
- */
-class ParagonIE_Sodium_Core32_ChaCha20_Ctx extends ParagonIE_Sodium_Core32_Util implements ArrayAccess
-{
-    /**
-     * @var SplFixedArray internally, <int, ParagonIE_Sodium_Core32_Int32>
-     */
-    protected $container;
-
-    /**
-     * ParagonIE_Sodium_Core_ChaCha20_Ctx constructor.
-     *
-     * @internal You should not use this directly from another application
-     *
-     * @param string $key     ChaCha20 key.
-     * @param string $iv      Initialization Vector (a.k.a. nonce).
-     * @param string $counter The initial counter value.
-     *                        Defaults to 8 0x00 bytes.
-     * @throws InvalidArgumentException
-     * @throws SodiumException
-     * @throws TypeError
-     */
-    public function __construct($key = '', $iv = '', $counter = '')
-    {
-        if (self::strlen($key) !== 32) {
-            throw new InvalidArgumentException('ChaCha20 expects a 256-bit key.');
-        }
-        if (self::strlen($iv) !== 8) {
-            throw new InvalidArgumentException('ChaCha20 expects a 64-bit nonce.');
-        }
-        $this->container = new SplFixedArray(16);
-
-        /* "expand 32-byte k" as per ChaCha20 spec */
-        $this->container[0]  = new ParagonIE_Sodium_Core32_Int32(array(0x6170, 0x7865));
-        $this->container[1]  = new ParagonIE_Sodium_Core32_Int32(array(0x3320, 0x646e));
-        $this->container[2]  = new ParagonIE_Sodium_Core32_Int32(array(0x7962, 0x2d32));
-        $this->container[3]  = new ParagonIE_Sodium_Core32_Int32(array(0x6b20, 0x6574));
-
-        $this->container[4]  = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($key, 0, 4));
-        $this->container[5]  = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($key, 4, 4));
-        $this->container[6]  = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($key, 8, 4));
-        $this->container[7]  = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($key, 12, 4));
-        $this->container[8]  = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($key, 16, 4));
-        $this->container[9]  = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($key, 20, 4));
-        $this->container[10] = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($key, 24, 4));
-        $this->container[11] = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($key, 28, 4));
-
-        if (empty($counter)) {
-            $this->container[12] = new ParagonIE_Sodium_Core32_Int32();
-            $this->container[13] = new ParagonIE_Sodium_Core32_Int32();
-        } else {
-            $this->container[12] = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($counter, 0, 4));
-            $this->container[13] = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($counter, 4, 4));
-        }
-        $this->container[14] = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($iv, 0, 4));
-        $this->container[15] = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($iv, 4, 4));
-    }
-
-    /**
-     * @internal You should not use this directly from another application
-     *
-     * @param int $offset
-     * @param int|ParagonIE_Sodium_Core32_Int32 $value
-     * @return void
-     */
-    #[ReturnTypeWillChange]
-    public function offsetSet($offset, $value)
-    {
-        if (!is_int($offset)) {
-            throw new InvalidArgumentException('Expected an integer');
-        }
-        if ($value instanceof ParagonIE_Sodium_Core32_Int32) {
-            /*
-        } elseif (is_int($value)) {
-            $value = ParagonIE_Sodium_Core32_Int32::fromInt($value);
-            */
-        } else {
-            throw new InvalidArgumentException('Expected an integer');
-        }
-        $this->container[$offset] = $value;
-    }
-
-    /**
-     * @internal You should not use this directly from another application
-     *
-     * @param int $offset
-     * @return bool
-     * @psalm-suppress MixedArrayOffset
-     */
-    #[ReturnTypeWillChange]
-    public function offsetExists($offset)
-    {
-        return isset($this->container[$offset]);
-    }
-
-    /**
-     * @internal You should not use this directly from another application
-     *
-     * @param int $offset
-     * @return void
-     * @psalm-suppress MixedArrayOffset
-     */
-    #[ReturnTypeWillChange]
-    public function offsetUnset($offset)
-    {
-        unset($this->container[$offset]);
-    }
-
-    /**
-     * @internal You should not use this directly from another application
-     *
-     * @param int $offset
-     * @return mixed|null
-     * @psalm-suppress MixedArrayOffset
-     */
-    #[ReturnTypeWillChange]
-    public function offsetGet($offset)
-    {
-        return isset($this->container[$offset])
-            ? $this->container[$offset]
-            : null;
-    }
-}

diff --git a/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core32/ChaCha20/IetfCtx.php b/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core32/ChaCha20/IetfCtx.php
deleted file mode 100644 (file)
index eea08de..0000000
--- a/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core32/ChaCha20/IetfCtx.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-
-if (class_exists('ParagonIE_Sodium_Core_ChaCha20_IetfCtx', false)) {
-    return;
-}
-
-/**
- * Class ParagonIE_Sodium_Core32_ChaCha20_IetfCtx
- */
-class ParagonIE_Sodium_Core32_ChaCha20_IetfCtx extends ParagonIE_Sodium_Core32_ChaCha20_Ctx
-{
-    /**
-     * ParagonIE_Sodium_Core_ChaCha20_IetfCtx constructor.
-     *
-     * @internal You should not use this directly from another application
-     *
-     * @param string $key     ChaCha20 key.
-     * @param string $iv      Initialization Vector (a.k.a. nonce).
-     * @param string $counter The initial counter value.
-     *                        Defaults to 4 0x00 bytes.
-     * @throws InvalidArgumentException
-     * @throws SodiumException
-     * @throws TypeError
-     */
-    public function __construct($key = '', $iv = '', $counter = '')
-    {
-        if (self::strlen($iv) !== 12) {
-            throw new InvalidArgumentException('ChaCha20 expects a 96-bit nonce in IETF mode.');
-        }
-        parent::__construct($key, self::substr($iv, 0, 8), $counter);
-
-        if (!empty($counter)) {
-            $this->container[12] = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($counter, 0, 4));
-        }
-        $this->container[13] = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($iv, 0, 4));
-        $this->container[14] = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($iv, 4, 4));
-        $this->container[15] = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($iv, 8, 4));
-    }
-}

diff --git a/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core32/Curve25519.php b/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core32/Curve25519.php
deleted file mode 100644 (file)
index aafffcd..0000000
--- a/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core32/Curve25519.php
+++ /dev/null
@@ -1,3161 +0,0 @@
-<?php
-
-if (class_exists('ParagonIE_Sodium_Core32_Curve25519', false)) {
-    return;
-}
-
-/**
- * Class ParagonIE_Sodium_Core32_Curve25519
- *
- * Implements Curve25519 core functions
- *
- * Based on the ref10 curve25519 code provided by libsodium
- *
- * @ref https://github.com/jedisct1/libsodium/blob/master/src/libsodium/crypto_core/curve25519/ref10/curve25519_ref10.c
- */
-abstract class ParagonIE_Sodium_Core32_Curve25519 extends ParagonIE_Sodium_Core32_Curve25519_H
-{
-    /**
-     * Get a field element of size 10 with a value of 0
-     *
-     * @internal You should not use this directly from another application
-     *
-     * @return ParagonIE_Sodium_Core32_Curve25519_Fe
-     * @throws SodiumException
-     * @throws TypeError
-     */
-    public static function fe_0()
-    {
-        return ParagonIE_Sodium_Core32_Curve25519_Fe::fromArray(
-            array(
-                new ParagonIE_Sodium_Core32_Int32(),
-                new ParagonIE_Sodium_Core32_Int32(),
-                new ParagonIE_Sodium_Core32_Int32(),
-                new ParagonIE_Sodium_Core32_Int32(),
-                new ParagonIE_Sodium_Core32_Int32(),
-                new ParagonIE_Sodium_Core32_Int32(),
-                new ParagonIE_Sodium_Core32_Int32(),
-                new ParagonIE_Sodium_Core32_Int32(),
-                new ParagonIE_Sodium_Core32_Int32(),
-                new ParagonIE_Sodium_Core32_Int32()
-            )
-        );
-    }
-
-    /**
-     * Get a field element of size 10 with a value of 1
-     *
-     * @internal You should not use this directly from another application
-     *
-     * @return ParagonIE_Sodium_Core32_Curve25519_Fe
-     * @throws SodiumException
-     * @throws TypeError
-     */
-    public static function fe_1()
-    {
-        return ParagonIE_Sodium_Core32_Curve25519_Fe::fromArray(
-            array(
-                ParagonIE_Sodium_Core32_Int32::fromInt(1),
-                new ParagonIE_Sodium_Core32_Int32(),
-                new ParagonIE_Sodium_Core32_Int32(),
-                new ParagonIE_Sodium_Core32_Int32(),
-                new ParagonIE_Sodium_Core32_Int32(),
-                new ParagonIE_Sodium_Core32_Int32(),
-                new ParagonIE_Sodium_Core32_Int32(),
-                new ParagonIE_Sodium_Core32_Int32(),
-                new ParagonIE_Sodium_Core32_Int32(),
-                new ParagonIE_Sodium_Core32_Int32()
-            )
-        );
-    }
-
-    /**
-     * Add two field elements.
-     *
-     * @internal You should not use this directly from another application
-     *
-     * @param ParagonIE_Sodium_Core32_Curve25519_Fe $f
-     * @param ParagonIE_Sodium_Core32_Curve25519_Fe $g
-     * @return ParagonIE_Sodium_Core32_Curve25519_Fe
-     * @throws SodiumException
-     * @throws TypeError
-     * @psalm-suppress MixedAssignment
-     * @psalm-suppress MixedMethodCall
-     */
-    public static function fe_add(
-        ParagonIE_Sodium_Core32_Curve25519_Fe $f,
-        ParagonIE_Sodium_Core32_Curve25519_Fe $g
-    ) {
-        $arr = array();
-        for ($i = 0; $i < 10; ++$i) {
-            $arr[$i] = $f[$i]->addInt32($g[$i]);
-        }
-        /** @var array<int, ParagonIE_Sodium_Core32_Int32> $arr */
-        return ParagonIE_Sodium_Core32_Curve25519_Fe::fromArray($arr);
-    }
-
-    /**
-     * Constant-time conditional move.
-     *
-     * @internal You should not use this directly from another application
-     *
-     * @param ParagonIE_Sodium_Core32_Curve25519_Fe $f
-     * @param ParagonIE_Sodium_Core32_Curve25519_Fe $g
-     * @param int $b
-     * @return ParagonIE_Sodium_Core32_Curve25519_Fe
-     * @throws SodiumException
-     * @throws TypeError
-     * @psalm-suppress MixedAssignment
-     * @psalm-suppress MixedMethodCall
-     */
-    public static function fe_cmov(
-        ParagonIE_Sodium_Core32_Curve25519_Fe $f,
-        ParagonIE_Sodium_Core32_Curve25519_Fe $g,
-        $b = 0
-    ) {
-        /** @var array<int, ParagonIE_Sodium_Core32_Int32> $h */
-        $h = array();
-        for ($i = 0; $i < 10; ++$i) {
-            if (!($f[$i] instanceof ParagonIE_Sodium_Core32_Int32)) {
-                throw new TypeError('Expected Int32');
-            }
-            if (!($g[$i] instanceof ParagonIE_Sodium_Core32_Int32)) {
-                throw new TypeError('Expected Int32');
-            }
-            $h[$i] = $f[$i]->xorInt32(
-                $f[$i]->xorInt32($g[$i])->mask($b)
-            );
-        }
-        /** @var array<int, ParagonIE_Sodium_Core32_Int32> $h */
-        return ParagonIE_Sodium_Core32_Curve25519_Fe::fromArray($h);
-    }
-
-    /**
-     * Create a copy of a field element.
-     *
-     * @internal You should not use this directly from another application
-     *
-     * @param ParagonIE_Sodium_Core32_Curve25519_Fe $f
-     * @return ParagonIE_Sodium_Core32_Curve25519_Fe
-     */
-    public static function fe_copy(ParagonIE_Sodium_Core32_Curve25519_Fe $f)
-    {
-        $h = clone $f;
-        return $h;
-    }
-
-    /**
-     * Give: 32-byte string.
-     * Receive: A field element object to use for internal calculations.
-     *
-     * @internal You should not use this directly from another application
-     *
-     * @param string $s
-     * @return ParagonIE_Sodium_Core32_Curve25519_Fe
-     * @throws RangeException
-     * @throws SodiumException
-     * @throws TypeError
-     * @psalm-suppress MixedMethodCall
-     */
-    public static function fe_frombytes($s)
-    {
-        if (self::strlen($s) !== 32) {
-            throw new RangeException('Expected a 32-byte string.');
-        }
-        /** @var ParagonIE_Sodium_Core32_Int32 $h0 */
-        $h0 = ParagonIE_Sodium_Core32_Int32::fromInt(
-            self::load_4($s)
-        );
-        /** @var ParagonIE_Sodium_Core32_Int32 $h1 */
-        $h1 = ParagonIE_Sodium_Core32_Int32::fromInt(
-            self::load_3(self::substr($s, 4, 3)) << 6
-        );
-        /** @var ParagonIE_Sodium_Core32_Int32 $h2 */
-        $h2 = ParagonIE_Sodium_Core32_Int32::fromInt(
-            self::load_3(self::substr($s, 7, 3)) << 5
-        );
-        /** @var ParagonIE_Sodium_Core32_Int32 $h3 */
-        $h3 = ParagonIE_Sodium_Core32_Int32::fromInt(
-            self::load_3(self::substr($s, 10, 3)) << 3
-        );
-        /** @var ParagonIE_Sodium_Core32_Int32 $h4 */
-        $h4 = ParagonIE_Sodium_Core32_Int32::fromInt(
-            self::load_3(self::substr($s, 13, 3)) << 2
-        );
-        /** @var ParagonIE_Sodium_Core32_Int32 $h5 */
-        $h5 = ParagonIE_Sodium_Core32_Int32::fromInt(
-            self::load_4(self::substr($s, 16, 4))
-        );
-        /** @var ParagonIE_Sodium_Core32_Int32 $h6 */
-        $h6 = ParagonIE_Sodium_Core32_Int32::fromInt(
-            self::load_3(self::substr($s, 20, 3)) << 7
-        );
-        /** @var ParagonIE_Sodium_Core32_Int32 $h7 */
-        $h7 = ParagonIE_Sodium_Core32_Int32::fromInt(
-            self::load_3(self::substr($s, 23, 3)) << 5
-        );
-        /** @var ParagonIE_Sodium_Core32_Int32 $h8 */
-        $h8 = ParagonIE_Sodium_Core32_Int32::fromInt(
-            self::load_3(self::substr($s, 26, 3)) << 4
-        );
-        /** @var ParagonIE_Sodium_Core32_Int32 $h9 */
-        $h9 = ParagonIE_Sodium_Core32_Int32::fromInt(
-            (self::load_3(self::substr($s, 29, 3)) & 8388607) << 2
-        );
-
-        $carry9 = $h9->addInt(1 << 24)->shiftRight(25);
-        $h0 = $h0->addInt32($carry9->mulInt(19, 5));
-        $h9 = $h9->subInt32($carry9->shiftLeft(25));
-
-        $carry1 = $h1->addInt(1 << 24)->shiftRight(25);
-        $h2 = $h2->addInt32($carry1);
-        $h1 = $h1->subInt32($carry1->shiftLeft(25));
-
-        $carry3 = $h3->addInt(1 << 24)->shiftRight(25);
-        $h4 = $h4->addInt32($carry3);
-        $h3 = $h3->subInt32($carry3->shiftLeft(25));
-
-        $carry5 = $h5->addInt(1 << 24)->shiftRight(25);
-        $h6 = $h6->addInt32($carry5);
-        $h5 = $h5->subInt32($carry5->shiftLeft(25));
-
-        $carry7 = $h7->addInt(1 << 24)->shiftRight(25);
-        $h8 = $h8->addInt32($carry7);
-        $h7 = $h7->subInt32($carry7->shiftLeft(25));
-
-        $carry0 = $h0->addInt(1 << 25)->shiftRight(26);
-        $h1 = $h1->addInt32($carry0);
-        $h0 = $h0->subInt32($carry0->shiftLeft(26));
-
-        $carry2 = $h2->addInt(1 << 25)->shiftRight(26);
-        $h3 = $h3->addInt32($carry2);
-        $h2 = $h2->subInt32($carry2->shiftLeft(26));
-
-        $carry4 = $h4->addInt(1 << 25)->shiftRight(26);
-        $h5 = $h5->addInt32($carry4);
-        $h4 = $h4->subInt32($carry4->shiftLeft(26));
-
-        $carry6 = $h6->addInt(1 << 25)->shiftRight(26);
-        $h7 = $h7->addInt32($carry6);
-        $h6 = $h6->subInt32($carry6->shiftLeft(26));
-
-        $carry8 = $h8->addInt(1 << 25)->shiftRight(26);
-        $h9 = $h9->addInt32($carry8);
-        $h8 = $h8->subInt32($carry8->shiftLeft(26));
-
-        return ParagonIE_Sodium_Core32_Curve25519_Fe::fromArray(
-            array($h0, $h1, $h2,$h3, $h4, $h5, $h6, $h7, $h8, $h9)
-        );
-    }
-
-    /**
-     * Convert a field element to a byte string.
-     *
-     * @internal You should not use this directly from another application
-     *
-     * @param ParagonIE_Sodium_Core32_Curve25519_Fe $h
-     * @return string
-     * @throws SodiumException
-     * @throws TypeError
-     * @psalm-suppress MixedAssignment
-     * @psalm-suppress MixedMethodCall
-     */
-    public static function fe_tobytes(ParagonIE_Sodium_Core32_Curve25519_Fe $h)
-    {
-        /**
-         * @var ParagonIE_Sodium_Core32_Int64[] $f
-         * @var ParagonIE_Sodium_Core32_Int64 $q
-         */
-        $f = array();
-
-        for ($i = 0; $i < 10; ++$i) {
-            $f[$i] = $h[$i]->toInt64();
-        }
-
-        $q = $f[9]->mulInt(19, 5)->addInt(1 << 14)->shiftRight(25)
-            ->addInt64($f[0])->shiftRight(26)
-            ->addInt64($f[1])->shiftRight(25)
-            ->addInt64($f[2])->shiftRight(26)
-            ->addInt64($f[3])->shiftRight(25)
-            ->addInt64($f[4])->shiftRight(26)
-            ->addInt64($f[5])->shiftRight(25)
-            ->addInt64($f[6])->shiftRight(26)
-            ->addInt64($f[7])->shiftRight(25)
-            ->addInt64($f[8])->shiftRight(26)
-            ->addInt64($f[9])->shiftRight(25);
-
-        $f[0] = $f[0]->addInt64($q->mulInt(19, 5));
-
-        $carry0 = $f[0]->shiftRight(26);
-        $f[1] = $f[1]->addInt64($carry0);
-        $f[0] = $f[0]->subInt64($carry0->shiftLeft(26));
-
-        $carry1 = $f[1]->shiftRight(25);
-        $f[2] = $f[2]->addInt64($carry1);
-        $f[1] = $f[1]->subInt64($carry1->shiftLeft(25));
-
-        $carry2 = $f[2]->shiftRight(26);
-        $f[3] = $f[3]->addInt64($carry2);
-        $f[2] = $f[2]->subInt64($carry2->shiftLeft(26));
-
-        $carry3 = $f[3]->shiftRight(25);
-        $f[4] = $f[4]->addInt64($carry3);
-        $f[3] = $f[3]->subInt64($carry3->shiftLeft(25));
-
-        $carry4 = $f[4]->shiftRight(26);
-        $f[5] = $f[5]->addInt64($carry4);
-        $f[4] = $f[4]->subInt64($carry4->shiftLeft(26));
-
-        $carry5 = $f[5]->shiftRight(25);
-        $f[6] = $f[6]->addInt64($carry5);
-        $f[5] = $f[5]->subInt64($carry5->shiftLeft(25));
-
-        $carry6 = $f[6]->shiftRight(26);
-        $f[7] = $f[7]->addInt64($carry6);
-        $f[6] = $f[6]->subInt64($carry6->shiftLeft(26));
-
-        $carry7 = $f[7]->shiftRight(25);
-        $f[8] = $f[8]->addInt64($carry7);
-        $f[7] = $f[7]->subInt64($carry7->shiftLeft(25));
-
-        $carry8 = $f[8]->shiftRight(26);
-        $f[9] = $f[9]->addInt64($carry8);
-        $f[8] = $f[8]->subInt64($carry8->shiftLeft(26));
-
-        $carry9 = $f[9]->shiftRight(25);
-        $f[9] = $f[9]->subInt64($carry9->shiftLeft(25));
-
-        $h0 = $f[0]->toInt32()->toInt();
-        $h1 = $f[1]->toInt32()->toInt();
-        $h2 = $f[2]->toInt32()->toInt();
-        $h3 = $f[3]->toInt32()->toInt();
-        $h4 = $f[4]->toInt32()->toInt();
-        $h5 = $f[5]->toInt32()->toInt();
-        $h6 = $f[6]->toInt32()->toInt();
-        $h7 = $f[7]->toInt32()->toInt();
-        $h8 = $f[8]->toInt32()->toInt();
-        $h9 = $f[9]->toInt32()->toInt();
-
-        /**
-         * @var array<int, int>
-         */
-        $s = array(
-            (int) (($h0 >> 0) & 0xff),
-            (int) (($h0 >> 8) & 0xff),
-            (int) (($h0 >> 16) & 0xff),
-            (int) ((($h0 >> 24) | ($h1 << 2)) & 0xff),
-            (int) (($h1 >> 6) & 0xff),
-            (int) (($h1 >> 14) & 0xff),
-            (int) ((($h1 >> 22) | ($h2 << 3)) & 0xff),
-            (int) (($h2 >> 5) & 0xff),
-            (int) (($h2 >> 13) & 0xff),
-            (int) ((($h2 >> 21) | ($h3 << 5)) & 0xff),
-            (int) (($h3 >> 3) & 0xff),
-            (int) (($h3 >> 11) & 0xff),
-            (int) ((($h3 >> 19) | ($h4 << 6)) & 0xff),
-            (int) (($h4 >> 2) & 0xff),
-            (int) (($h4 >> 10) & 0xff),
-            (int) (($h4 >> 18) & 0xff),
-            (int) (($h5 >> 0) & 0xff),
-            (int) (($h5 >> 8) & 0xff),
-            (int) (($h5 >> 16) & 0xff),
-            (int) ((($h5 >> 24) | ($h6 << 1)) & 0xff),
-            (int) (($h6 >> 7) & 0xff),
-            (int) (($h6 >> 15) & 0xff),
-            (int) ((($h6 >> 23) | ($h7 << 3)) & 0xff),
-            (int) (($h7 >> 5) & 0xff),
-            (int) (($h7 >> 13) & 0xff),
-            (int) ((($h7 >> 21) | ($h8 << 4)) & 0xff),
-            (int) (($h8 >> 4) & 0xff),
-            (int) (($h8 >> 12) & 0xff),
-            (int) ((($h8 >> 20) | ($h9 << 6)) & 0xff),
-            (int) (($h9 >> 2) & 0xff),
-            (int) (($h9 >> 10) & 0xff),
-            (int) (($h9 >> 18) & 0xff)
-        );
-        return self::intArrayToString($s);
-    }
-
-    /**
-     * Is a field element negative? (1 = yes, 0 = no. Used in calculations.)
-     *
-     * @internal You should not use this directly from another application
-     *
-     * @param ParagonIE_Sodium_Core32_Curve25519_Fe $f
-     * @return int
-     * @throws SodiumException
-     * @throws TypeError
-     */
-    public static function fe_isnegative(ParagonIE_Sodium_Core32_Curve25519_Fe $f)
-    {
-        $str = self::fe_tobytes($f);
-        return (int) (self::chrToInt($str[0]) & 1);
-    }
-
-    /**
-     * Returns 0 if this field element results in all NUL bytes.
-     *
-     * @internal You should not use this directly from another application
-     *
-     * @param ParagonIE_Sodium_Core32_Curve25519_Fe $f
-     * @return bool
-     * @throws SodiumException
-     * @throws TypeError
-     */
-    public static function fe_isnonzero(ParagonIE_Sodium_Core32_Curve25519_Fe $f)
-    {
-        static $zero;
-        if ($zero === null) {
-            $zero = str_repeat("\x00", 32);
-        }
-        $str = self::fe_tobytes($f);
-        /** @var string $zero */
-        return !self::verify_32($str, $zero);
-    }
-
-    /**
-     * Multiply two field elements
-     *
-     * h = f * g
-     *
-     * @internal You should not use this directly from another application
-     *
-     * @security Is multiplication a source of timing leaks? If so, can we do
-     *           anything to prevent that from happening?
-     *
-     * @param ParagonIE_Sodium_Core32_Curve25519_Fe $f
-     * @param ParagonIE_Sodium_Core32_Curve25519_Fe $g
-     * @return ParagonIE_Sodium_Core32_Curve25519_Fe
-     * @throws SodiumException
-     * @throws TypeError
-     */
-    public static function fe_mul(
-        ParagonIE_Sodium_Core32_Curve25519_Fe $f,
-        ParagonIE_Sodium_Core32_Curve25519_Fe $g
-    ) {
-        /**
-         * @var ParagonIE_Sodium_Core32_Int32[] $f
-         * @var ParagonIE_Sodium_Core32_Int32[] $g
-         * @var ParagonIE_Sodium_Core32_Int64 $f0
-         * @var ParagonIE_Sodium_Core32_Int64 $f1
-         * @var ParagonIE_Sodium_Core32_Int64 $f2
-         * @var ParagonIE_Sodium_Core32_Int64 $f3
-         * @var ParagonIE_Sodium_Core32_Int64 $f4
-         * @var ParagonIE_Sodium_Core32_Int64 $f5
-         * @var ParagonIE_Sodium_Core32_Int64 $f6
-         * @var ParagonIE_Sodium_Core32_Int64 $f7
-         * @var ParagonIE_Sodium_Core32_Int64 $f8
-         * @var ParagonIE_Sodium_Core32_Int64 $f9
-         * @var ParagonIE_Sodium_Core32_Int64 $g0
-         * @var ParagonIE_Sodium_Core32_Int64 $g1
-         * @var ParagonIE_Sodium_Core32_Int64 $g2
-         * @var ParagonIE_Sodium_Core32_Int64 $g3
-         * @var ParagonIE_Sodium_Core32_Int64 $g4
-         * @var ParagonIE_Sodium_Core32_Int64 $g5
-         * @var ParagonIE_Sodium_Core32_Int64 $g6
-         * @var ParagonIE_Sodium_Core32_Int64 $g7
-         * @var ParagonIE_Sodium_Core32_Int64 $g8
-         * @var ParagonIE_Sodium_Core32_Int64 $g9
-         */
-        $f0 = $f[0]->toInt64();
-        $f1 = $f[1]->toInt64();
-        $f2 = $f[2]->toInt64();
-        $f3 = $f[3]->toInt64();
-        $f4 = $f[4]->toInt64();
-        $f5 = $f[5]->toInt64();
-        $f6 = $f[6]->toInt64();
-        $f7 = $f[7]->toInt64();
-        $f8 = $f[8]->toInt64();
-        $f9 = $f[9]->toInt64();
-        $g0 = $g[0]->toInt64();
-        $g1 = $g[1]->toInt64();
-        $g2 = $g[2]->toInt64();
-        $g3 = $g[3]->toInt64();
-        $g4 = $g[4]->toInt64();
-        $g5 = $g[5]->toInt64();
-        $g6 = $g[6]->toInt64();
-        $g7 = $g[7]->toInt64();
-        $g8 = $g[8]->toInt64();
-        $g9 = $g[9]->toInt64();
-        $g1_19 = $g1->mulInt(19, 5); /* 2^4 <= 19 <= 2^5, but we only want 5 bits */
-        $g2_19 = $g2->mulInt(19, 5);
-        $g3_19 = $g3->mulInt(19, 5);
-        $g4_19 = $g4->mulInt(19, 5);
-        $g5_19 = $g5->mulInt(19, 5);
-        $g6_19 = $g6->mulInt(19, 5);
-        $g7_19 = $g7->mulInt(19, 5);
-        $g8_19 = $g8->mulInt(19, 5);
-        $g9_19 = $g9->mulInt(19, 5);
-        $f1_2 = $f1->shiftLeft(1);
-        $f3_2 = $f3->shiftLeft(1);
-        $f5_2 = $f5->shiftLeft(1);
-        $f7_2 = $f7->shiftLeft(1);
-        $f9_2 = $f9->shiftLeft(1);
-        $f0g0    = $f0->mulInt64($g0, 27);
-        $f0g1    = $f0->mulInt64($g1, 27);
-        $f0g2    = $f0->mulInt64($g2, 27);
-        $f0g3    = $f0->mulInt64($g3, 27);
-        $f0g4    = $f0->mulInt64($g4, 27);
-        $f0g5    = $f0->mulInt64($g5, 27);
-        $f0g6    = $f0->mulInt64($g6, 27);
-        $f0g7    = $f0->mulInt64($g7, 27);
-        $f0g8    = $f0->mulInt64($g8, 27);
-        $f0g9    = $f0->mulInt64($g9, 27);
-        $f1g0    = $f1->mulInt64($g0, 27);
-        $f1g1_2  = $f1_2->mulInt64($g1, 27);
-        $f1g2    = $f1->mulInt64($g2, 27);
-        $f1g3_2  = $f1_2->mulInt64($g3, 27);
-        $f1g4    = $f1->mulInt64($g4, 30);
-        $f1g5_2  = $f1_2->mulInt64($g5, 30);
-        $f1g6    = $f1->mulInt64($g6, 30);
-        $f1g7_2  = $f1_2->mulInt64($g7, 30);
-        $f1g8    = $f1->mulInt64($g8, 30);
-        $f1g9_38 = $g9_19->mulInt64($f1_2, 30);
-        $f2g0    = $f2->mulInt64($g0, 30);
-        $f2g1    = $f2->mulInt64($g1, 29);
-        $f2g2    = $f2->mulInt64($g2, 30);
-        $f2g3    = $f2->mulInt64($g3, 29);
-        $f2g4    = $f2->mulInt64($g4, 30);
-        $f2g5    = $f2->mulInt64($g5, 29);
-        $f2g6    = $f2->mulInt64($g6, 30);
-        $f2g7    = $f2->mulInt64($g7, 29);
-        $f2g8_19 = $g8_19->mulInt64($f2, 30);
-        $f2g9_19 = $g9_19->mulInt64($f2, 30);
-        $f3g0    = $f3->mulInt64($g0, 30);
-        $f3g1_2  = $f3_2->mulInt64($g1, 30);
-        $f3g2    = $f3->mulInt64($g2, 30);
-        $f3g3_2  = $f3_2->mulInt64($g3, 30);
-        $f3g4    = $f3->mulInt64($g4, 30);
-        $f3g5_2  = $f3_2->mulInt64($g5, 30);
-        $f3g6    = $f3->mulInt64($g6, 30);
-        $f3g7_38 = $g7_19->mulInt64($f3_2, 30);
-        $f3g8_19 = $g8_19->mulInt64($f3, 30);
-        $f3g9_38 = $g9_19->mulInt64($f3_2, 30);
-        $f4g0    = $f4->mulInt64($g0, 30);
-        $f4g1    = $f4->mulInt64($g1, 30);
-        $f4g2    = $f4->mulInt64($g2, 30);
-        $f4g3    = $f4->mulInt64($g3, 30);
-        $f4g4    = $f4->mulInt64($g4, 30);
-        $f4g5    = $f4->mulInt64($g5, 30);
-        $f4g6_19 = $g6_19->mulInt64($f4, 30);
-        $f4g7_19 = $g7_19->mulInt64($f4, 30);
-        $f4g8_19 = $g8_19->mulInt64($f4, 30);
-        $f4g9_19 = $g9_19->mulInt64($f4, 30);
-        $f5g0    = $f5->mulInt64($g0, 30);
-        $f5g1_2  = $f5_2->mulInt64($g1, 30);
-        $f5g2    = $f5->mulInt64($g2, 30);
-        $f5g3_2  = $f5_2->mulInt64($g3, 30);
-        $f5g4    = $f5->mulInt64($g4, 30);
-        $f5g5_38 = $g5_19->mulInt64($f5_2, 30);
-        $f5g6_19 = $g6_19->mulInt64($f5, 30);
-        $f5g7_38 = $g7_19->mulInt64($f5_2, 30);
-        $f5g8_19 = $g8_19->mulInt64($f5, 30);
-        $f5g9_38 = $g9_19->mulInt64($f5_2, 30);
-        $f6g0    = $f6->mulInt64($g0, 30);
-        $f6g1    = $f6->mulInt64($g1, 30);
-        $f6g2    = $f6->mulInt64($g2, 30);
-        $f6g3    = $f6->mulInt64($g3, 30);
-        $f6g4_19 = $g4_19->mulInt64($f6, 30);
-        $f6g5_19 = $g5_19->mulInt64($f6, 30);
-        $f6g6_19 = $g6_19->mulInt64($f6, 30);
-        $f6g7_19 = $g7_19->mulInt64($f6, 30);
-        $f6g8_19 = $g8_19->mulInt64($f6, 30);
-        $f6g9_19 = $g9_19->mulInt64($f6, 30);
-        $f7g0    = $f7->mulInt64($g0, 30);
-        $f7g1_2  = $g1->mulInt64($f7_2, 30);
-        $f7g2    = $f7->mulInt64($g2, 30);
-        $f7g3_38 = $g3_19->mulInt64($f7_2, 30);
-        $f7g4_19 = $g4_19->mulInt64($f7, 30);
-        $f7g5_38 = $g5_19->mulInt64($f7_2, 30);
-        $f7g6_19 = $g6_19->mulInt64($f7, 30);
-        $f7g7_38 = $g7_19->mulInt64($f7_2, 30);
-        $f7g8_19 = $g8_19->mulInt64($f7, 30);
-        $f7g9_38 = $g9_19->mulInt64($f7_2, 30);
-        $f8g0    = $f8->mulInt64($g0, 30);
-        $f8g1    = $f8->mulInt64($g1, 29);
-        $f8g2_19 = $g2_19->mulInt64($f8, 30);
-        $f8g3_19 = $g3_19->mulInt64($f8, 30);
-        $f8g4_19 = $g4_19->mulInt64($f8, 30);
-        $f8g5_19 = $g5_19->mulInt64($f8, 30);
-        $f8g6_19 = $g6_19->mulInt64($f8, 30);
-        $f8g7_19 = $g7_19->mulInt64($f8, 30);
-        $f8g8_19 = $g8_19->mulInt64($f8, 30);
-        $f8g9_19 = $g9_19->mulInt64($f8, 30);
-        $f9g0    = $f9->mulInt64($g0, 30);
-        $f9g1_38 = $g1_19->mulInt64($f9_2, 30);
-        $f9g2_19 = $g2_19->mulInt64($f9, 30);
-        $f9g3_38 = $g3_19->mulInt64($f9_2, 30);
-        $f9g4_19 = $g4_19->mulInt64($f9, 30);
-        $f9g5_38 = $g5_19->mulInt64($f9_2, 30);
-        $f9g6_19 = $g6_19->mulInt64($f9, 30);
-        $f9g7_38 = $g7_19->mulInt64($f9_2, 30);
-        $f9g8_19 = $g8_19->mulInt64($f9, 30);
-        $f9g9_38 = $g9_19->mulInt64($f9_2, 30);
-
-        // $h0 = $f0g0 + $f1g9_38 + $f2g8_19 + $f3g7_38 + $f4g6_19 + $f5g5_38 + $f6g4_19 + $f7g3_38 + $f8g2_19 + $f9g1_38;
-        $h0 = $f0g0->addInt64($f1g9_38)->addInt64($f2g8_19)->addInt64($f3g7_38)
-            ->addInt64($f4g6_19)->addInt64($f5g5_38)->addInt64($f6g4_19)
-            ->addInt64($f7g3_38)->addInt64($f8g2_19)->addInt64($f9g1_38);
-
-        // $h1 = $f0g1 + $f1g0    + $f2g9_19 + $f3g8_19 + $f4g7_19 + $f5g6_19 + $f6g5_19 + $f7g4_19 + $f8g3_19 + $f9g2_19;
-        $h1 = $f0g1->addInt64($f1g0)->addInt64($f2g9_19)->addInt64($f3g8_19)
-            ->addInt64($f4g7_19)->addInt64($f5g6_19)->addInt64($f6g5_19)
-            ->addInt64($f7g4_19)->addInt64($f8g3_19)->addInt64($f9g2_19);
-
-        // $h2 = $f0g2 + $f1g1_2  + $f2g0    + $f3g9_38 + $f4g8_19 + $f5g7_38 + $f6g6_19 + $f7g5_38 + $f8g4_19 + $f9g3_38;
-        $h2 = $f0g2->addInt64($f1g1_2)->addInt64($f2g0)->addInt64($f3g9_38)
-            ->addInt64($f4g8_19)->addInt64($f5g7_38)->addInt64($f6g6_19)
-            ->addInt64($f7g5_38)->addInt64($f8g4_19)->addInt64($f9g3_38);
-
-        // $h3 = $f0g3 + $f1g2    + $f2g1    + $f3g0    + $f4g9_19 + $f5g8_19 + $f6g7_19 + $f7g6_19 + $f8g5_19 + $f9g4_19;
-        $h3 = $f0g3->addInt64($f1g2)->addInt64($f2g1)->addInt64($f3g0)
-            ->addInt64($f4g9_19)->addInt64($f5g8_19)->addInt64($f6g7_19)
-            ->addInt64($f7g6_19)->addInt64($f8g5_19)->addInt64($f9g4_19);
-
-        // $h4 = $f0g4 + $f1g3_2  + $f2g2    + $f3g1_2  + $f4g0    + $f5g9_38 + $f6g8_19 + $f7g7_38 + $f8g6_19 + $f9g5_38;
-        $h4 = $f0g4->addInt64($f1g3_2)->addInt64($f2g2)->addInt64($f3g1_2)
-            ->addInt64($f4g0)->addInt64($f5g9_38)->addInt64($f6g8_19)
-            ->addInt64($f7g7_38)->addInt64($f8g6_19)->addInt64($f9g5_38);
-
-        // $h5 = $f0g5 + $f1g4    + $f2g3    + $f3g2    + $f4g1    + $f5g0    + $f6g9_19 + $f7g8_19 + $f8g7_19 + $f9g6_19;
-        $h5 = $f0g5->addInt64($f1g4)->addInt64($f2g3)->addInt64($f3g2)
-            ->addInt64($f4g1)->addInt64($f5g0)->addInt64($f6g9_19)
-            ->addInt64($f7g8_19)->addInt64($f8g7_19)->addInt64($f9g6_19);
-
-        // $h6 = $f0g6 + $f1g5_2  + $f2g4    + $f3g3_2  + $f4g2    + $f5g1_2  + $f6g0    + $f7g9_38 + $f8g8_19 + $f9g7_38;
-        $h6 = $f0g6->addInt64($f1g5_2)->addInt64($f2g4)->addInt64($f3g3_2)
-            ->addInt64($f4g2)->addInt64($f5g1_2)->addInt64($f6g0)
-            ->addInt64($f7g9_38)->addInt64($f8g8_19)->addInt64($f9g7_38);
-
-        // $h7 = $f0g7 + $f1g6    + $f2g5    + $f3g4    + $f4g3    + $f5g2    + $f6g1    + $f7g0    + $f8g9_19 + $f9g8_19;
-        $h7 = $f0g7->addInt64($f1g6)->addInt64($f2g5)->addInt64($f3g4)
-            ->addInt64($f4g3)->addInt64($f5g2)->addInt64($f6g1)
-            ->addInt64($f7g0)->addInt64($f8g9_19)->addInt64($f9g8_19);
-
-        // $h8 = $f0g8 + $f1g7_2  + $f2g6    + $f3g5_2  + $f4g4    + $f5g3_2  + $f6g2    + $f7g1_2  + $f8g0    + $f9g9_38;
-        $h8 = $f0g8->addInt64($f1g7_2)->addInt64($f2g6)->addInt64($f3g5_2)
-            ->addInt64($f4g4)->addInt64($f5g3_2)->addInt64($f6g2)
-            ->addInt64($f7g1_2)->addInt64($f8g0)->addInt64($f9g9_38);
-
-        // $h9 = $f0g9 + $f1g8    + $f2g7    + $f3g6    + $f4g5    + $f5g4    + $f6g3    + $f7g2    + $f8g1    + $f9g0   ;
-        $h9 = $f0g9->addInt64($f1g8)->addInt64($f2g7)->addInt64($f3g6)
-            ->addInt64($f4g5)->addInt64($f5g4)->addInt64($f6g3)
-            ->addInt64($f7g2)->addInt64($f8g1)->addInt64($f9g0);
-
-        /**
-         * @var ParagonIE_Sodium_Core32_Int64 $h0
-         * @var ParagonIE_Sodium_Core32_Int64 $h1
-         * @var ParagonIE_Sodium_Core32_Int64 $h2
-         * @var ParagonIE_Sodium_Core32_Int64 $h3
-         * @var ParagonIE_Sodium_Core32_Int64 $h4
-         * @var ParagonIE_Sodium_Core32_Int64 $h5
-         * @var ParagonIE_Sodium_Core32_Int64 $h6
-         * @var ParagonIE_Sodium_Core32_Int64 $h7
-         * @var ParagonIE_Sodium_Core32_Int64 $h8
-         * @var ParagonIE_Sodium_Core32_Int64 $h9
-         * @var ParagonIE_Sodium_Core32_Int64 $carry0
-         * @var ParagonIE_Sodium_Core32_Int64 $carry1
-         * @var ParagonIE_Sodium_Core32_Int64 $carry2
-         * @var ParagonIE_Sodium_Core32_Int64 $carry3
-         * @var ParagonIE_Sodium_Core32_Int64 $carry4
-         * @var ParagonIE_Sodium_Core32_Int64 $carry5
-         * @var ParagonIE_Sodium_Core32_Int64 $carry6
-         * @var ParagonIE_Sodium_Core32_Int64 $carry7
-         * @var ParagonIE_Sodium_Core32_Int64 $carry8
-         * @var ParagonIE_Sodium_Core32_Int64 $carry9
-         */
-        $carry0 = $h0->addInt(1 << 25)->shiftRight(26);
-        $h1 = $h1->addInt64($carry0);
-        $h0 = $h0->subInt64($carry0->shiftLeft(26));
-        $carry4 = $h4->addInt(1 << 25)->shiftRight(26);
-        $h5 = $h5->addInt64($carry4);
-        $h4 = $h4->subInt64($carry4->shiftLeft(26));
-
-        $carry1 = $h1->addInt(1 << 24)->shiftRight(25);
-        $h2 = $h2->addInt64($carry1);
-        $h1 = $h1->subInt64($carry1->shiftLeft(25));
-        $carry5 = $h5->addInt(1 << 24)->shiftRight(25);
-        $h6 = $h6->addInt64($carry5);
-        $h5 = $h5->subInt64($carry5->shiftLeft(25));
-
-        $carry2 = $h2->addInt(1 << 25)->shiftRight(26);
-        $h3 = $h3->addInt64($carry2);
-        $h2 = $h2->subInt64($carry2->shiftLeft(26));
-        $carry6 = $h6->addInt(1 << 25)->shiftRight(26);
-        $h7 = $h7->addInt64($carry6);
-        $h6 = $h6->subInt64($carry6->shiftLeft(26));
-
-        $carry3 = $h3->addInt(1 << 24)->shiftRight(25);
-        $h4 = $h4->addInt64($carry3);
-        $h3 = $h3->subInt64($carry3->shiftLeft(25));
-        $carry7 = $h7->addInt(1 << 24)->shiftRight(25);
-        $h8 = $h8->addInt64($carry7);
-        $h7 = $h7->subInt64($carry7->shiftLeft(25));
-
-        $carry4 = $h4->addInt(1 << 25)->shiftRight(26);
-        $h5 = $h5->addInt64($carry4);
-        $h4 = $h4->subInt64($carry4->shiftLeft(26));
-        $carry8 = $h8->addInt(1 << 25)->shiftRight(26);
-        $h9 = $h9->addInt64($carry8);
-        $h8 = $h8->subInt64($carry8->shiftLeft(26));
-
-        $carry9 = $h9->addInt(1 << 24)->shiftRight(25);
-        $h0 = $h0->addInt64($carry9->mulInt(19, 5));
-        $h9 = $h9->subInt64($carry9->shiftLeft(25));
-
-        $carry0 = $h0->addInt(1 << 25)->shiftRight(26);
-        $h1 = $h1->addInt64($carry0);
-        $h0 = $h0->subInt64($carry0->shiftLeft(26));
-
-        return ParagonIE_Sodium_Core32_Curve25519_Fe::fromArray(
-            array(
-                $h0->toInt32(),
-                $h1->toInt32(),
-                $h2->toInt32(),
-                $h3->toInt32(),
-                $h4->toInt32(),
-                $h5->toInt32(),
-                $h6->toInt32(),
-                $h7->toInt32(),
-                $h8->toInt32(),
-                $h9->toInt32()
-            )
-        );
-    }
-
-    /**
-     * Get the negative values for each piece of the field element.
-     *
-     * h = -f
-     *
-     * @internal You should not use this directly from another application
-     *
-     * @param ParagonIE_Sodium_Core32_Curve25519_Fe $f
-     * @return ParagonIE_Sodium_Core32_Curve25519_Fe
-     * @psalm-suppress MixedAssignment
-     * @psalm-suppress MixedMethodCall
-     */
-    public static function fe_neg(ParagonIE_Sodium_Core32_Curve25519_Fe $f)
-    {
-        $h = new ParagonIE_Sodium_Core32_Curve25519_Fe();
-        for ($i = 0; $i < 10; ++$i) {
-            $h[$i] = $h[$i]->subInt32($f[$i]);
-        }
-        return $h;
-    }
-
-    /**
-     * Square a field element
-     *
-     * h = f * f
-     *
-     * @internal You should not use this directly from another application
-     *
-     * @param ParagonIE_Sodium_Core32_Curve25519_Fe $f
-     * @return ParagonIE_Sodium_Core32_Curve25519_Fe
-     * @throws SodiumException
-     * @throws TypeError
-     * @psalm-suppress MixedMethodCall
-     */
-    public static function fe_sq(ParagonIE_Sodium_Core32_Curve25519_Fe $f)
-    {
-        $f0 = $f[0]->toInt64();
-        $f1 = $f[1]->toInt64();
-        $f2 = $f[2]->toInt64();
-        $f3 = $f[3]->toInt64();
-        $f4 = $f[4]->toInt64();
-        $f5 = $f[5]->toInt64();
-        $f6 = $f[6]->toInt64();
-        $f7 = $f[7]->toInt64();
-        $f8 = $f[8]->toInt64();
-        $f9 = $f[9]->toInt64();
-
-        $f0_2 = $f0->shiftLeft(1);
-        $f1_2 = $f1->shiftLeft(1);
-        $f2_2 = $f2->shiftLeft(1);
-        $f3_2 = $f3->shiftLeft(1);
-        $f4_2 = $f4->shiftLeft(1);
-        $f5_2 = $f5->shiftLeft(1);
-        $f6_2 = $f6->shiftLeft(1);
-        $f7_2 = $f7->shiftLeft(1);
-        $f5_38 = $f5->mulInt(38, 6);
-        $f6_19 = $f6->mulInt(19, 5);
-        $f7_38 = $f7->mulInt(38, 6);
-        $f8_19 = $f8->mulInt(19, 5);
-        $f9_38 = $f9->mulInt(38, 6);
-
-        $f0f0    = $f0->mulInt64($f0, 28);
-        $f0f1_2  = $f0_2->mulInt64($f1, 28);
-        $f0f2_2 =  $f0_2->mulInt64($f2, 28);
-        $f0f3_2 =  $f0_2->mulInt64($f3, 28);
-        $f0f4_2 =  $f0_2->mulInt64($f4, 28);
-        $f0f5_2 =  $f0_2->mulInt64($f5, 28);
-        $f0f6_2 =  $f0_2->mulInt64($f6, 28);
-        $f0f7_2 =  $f0_2->mulInt64($f7, 28);
-        $f0f8_2 =  $f0_2->mulInt64($f8, 28);
-        $f0f9_2 =  $f0_2->mulInt64($f9, 28);
-
-        $f1f1_2 = $f1_2->mulInt64($f1, 28);
-        $f1f2_2 = $f1_2->mulInt64($f2, 28);
-        $f1f3_4 = $f1_2->mulInt64($f3_2, 28);
-        $f1f4_2 = $f1_2->mulInt64($f4, 28);
-        $f1f5_4 = $f1_2->mulInt64($f5_2, 30);
-        $f1f6_2 = $f1_2->mulInt64($f6, 28);
-        $f1f7_4 = $f1_2->mulInt64($f7_2, 28);
-        $f1f8_2 = $f1_2->mulInt64($f8, 28);
-        $f1f9_76 = $f9_38->mulInt64($f1_2, 30);
-
-        $f2f2 = $f2->mulInt64($f2, 28);
-        $f2f3_2 = $f2_2->mulInt64($f3, 28);
-        $f2f4_2 = $f2_2->mulInt64($f4, 28);
-        $f2f5_2 = $f2_2->mulInt64($f5, 28);
-        $f2f6_2 = $f2_2->mulInt64($f6, 28);
-        $f2f7_2 = $f2_2->mulInt64($f7, 28);
-        $f2f8_38 = $f8_19->mulInt64($f2_2, 30);
-        $f2f9_38 = $f9_38->mulInt64($f2, 30);
-
-        $f3f3_2 = $f3_2->mulInt64($f3, 28);
-        $f3f4_2 = $f3_2->mulInt64($f4, 28);
-        $f3f5_4 = $f3_2->mulInt64($f5_2, 30);
-        $f3f6_2 = $f3_2->mulInt64($f6, 28);
-        $f3f7_76 = $f7_38->mulInt64($f3_2, 30);
-        $f3f8_38 = $f8_19->mulInt64($f3_2, 30);
-        $f3f9_76 = $f9_38->mulInt64($f3_2, 30);
-
-        $f4f4 = $f4->mulInt64($f4, 28);
-        $f4f5_2 = $f4_2->mulInt64($f5, 28);
-        $f4f6_38 = $f6_19->mulInt64($f4_2, 30);
-        $f4f7_38 = $f7_38->mulInt64($f4, 30);
-        $f4f8_38 = $f8_19->mulInt64($f4_2, 30);
-        $f4f9_38 = $f9_38->mulInt64($f4, 30);
-
-        $f5f5_38 = $f5_38->mulInt64($f5, 30);
-        $f5f6_38 = $f6_19->mulInt64($f5_2, 30);
-        $f5f7_76 = $f7_38->mulInt64($f5_2, 30);
-        $f5f8_38 = $f8_19->mulInt64($f5_2, 30);
-        $f5f9_76 = $f9_38->mulInt64($f5_2, 30);
-
-        $f6f6_19 = $f6_19->mulInt64($f6, 30);
-        $f6f7_38 = $f7_38->mulInt64($f6, 30);
-        $f6f8_38 = $f8_19->mulInt64($f6_2, 30);
-        $f6f9_38 = $f9_38->mulInt64($f6, 30);
-
-        $f7f7_38 = $f7_38->mulInt64($f7, 28);
-        $f7f8_38 = $f8_19->mulInt64($f7_2, 30);
-        $f7f9_76 = $f9_38->mulInt64($f7_2, 30);
-
-        $f8f8_19 = $f8_19->mulInt64($f8, 30);
-        $f8f9_38 = $f9_38->mulInt64($f8, 30);
-
-        $f9f9_38 = $f9_38->mulInt64($f9, 28);
-
-        $h0 = $f0f0->addInt64($f1f9_76)->addInt64($f2f8_38)->addInt64($f3f7_76)->addInt64($f4f6_38)->addInt64($f5f5_38);
-        $h1 = $f0f1_2->addInt64($f2f9_38)->addInt64($f3f8_38)->addInt64($f4f7_38)->addInt64($f5f6_38);
-        $h2 = $f0f2_2->addInt64($f1f1_2)->addInt64($f3f9_76)->addInt64($f4f8_38)->addInt64($f5f7_76)->addInt64($f6f6_19);
-        $h3 = $f0f3_2->addInt64($f1f2_2)->addInt64($f4f9_38)->addInt64($f5f8_38)->addInt64($f6f7_38);
-        $h4 = $f0f4_2->addInt64($f1f3_4)->addInt64($f2f2)->addInt64($f5f9_76)->addInt64($f6f8_38)->addInt64($f7f7_38);
-        $h5 = $f0f5_2->addInt64($f1f4_2)->addInt64($f2f3_2)->addInt64($f6f9_38)->addInt64($f7f8_38);
-        $h6 = $f0f6_2->addInt64($f1f5_4)->addInt64($f2f4_2)->addInt64($f3f3_2)->addInt64($f7f9_76)->addInt64($f8f8_19);
-        $h7 = $f0f7_2->addInt64($f1f6_2)->addInt64($f2f5_2)->addInt64($f3f4_2)->addInt64($f8f9_38);
-        $h8 = $f0f8_2->addInt64($f1f7_4)->addInt64($f2f6_2)->addInt64($f3f5_4)->addInt64($f4f4)->addInt64($f9f9_38);
-        $h9 = $f0f9_2->addInt64($f1f8_2)->addInt64($f2f7_2)->addInt64($f3f6_2)->addInt64($f4f5_2);
-
-        /**
-         * @var ParagonIE_Sodium_Core32_Int64 $h0
-         * @var ParagonIE_Sodium_Core32_Int64 $h1
-         * @var ParagonIE_Sodium_Core32_Int64 $h2
-         * @var ParagonIE_Sodium_Core32_Int64 $h3
-         * @var ParagonIE_Sodium_Core32_Int64 $h4
-         * @var ParagonIE_Sodium_Core32_Int64 $h5
-         * @var ParagonIE_Sodium_Core32_Int64 $h6
-         * @var ParagonIE_Sodium_Core32_Int64 $h7
-         * @var ParagonIE_Sodium_Core32_Int64 $h8
-         * @var ParagonIE_Sodium_Core32_Int64 $h9
-         */
-
-        $carry0 = $h0->addInt(1 << 25)->shiftRight(26);
-        $h1 = $h1->addInt64($carry0);
-        $h0 = $h0->subInt64($carry0->shiftLeft(26));
-
-        $carry4 = $h4->addInt(1 << 25)->shiftRight(26);
-        $h5 = $h5->addInt64($carry4);
-        $h4 = $h4->subInt64($carry4->shiftLeft(26));
-
-        $carry1 = $h1->addInt(1 << 24)->shiftRight(25);
-        $h2 = $h2->addInt64($carry1);
-        $h1 = $h1->subInt64($carry1->shiftLeft(25));
-
-        $carry5 = $h5->addInt(1 << 24)->shiftRight(25);
-        $h6 = $h6->addInt64($carry5);
-        $h5 = $h5->subInt64($carry5->shiftLeft(25));
-
-        $carry2 = $h2->addInt(1 << 25)->shiftRight(26);
-        $h3 = $h3->addInt64($carry2);
-        $h2 = $h2->subInt64($carry2->shiftLeft(26));
-
-        $carry6 = $h6->addInt(1 << 25)->shiftRight(26);
-        $h7 = $h7->addInt64($carry6);
-        $h6 = $h6->subInt64($carry6->shiftLeft(26));
-
-        $carry3 = $h3->addInt(1 << 24)->shiftRight(25);
-        $h4 = $h4->addInt64($carry3);
-        $h3 = $h3->subInt64($carry3->shiftLeft(25));
-
-        $carry7 = $h7->addInt(1 << 24)->shiftRight(25);
-        $h8 = $h8->addInt64($carry7);
-        $h7 = $h7->subInt64($carry7->shiftLeft(25));
-
-        $carry4 = $h4->addInt(1 << 25)->shiftRight(26);
-        $h5 = $h5->addInt64($carry4);
-        $h4 = $h4->subInt64($carry4->shiftLeft(26));
-
-        $carry8 = $h8->addInt(1 << 25)->shiftRight(26);
-        $h9 = $h9->addInt64($carry8);
-        $h8 = $h8->subInt64($carry8->shiftLeft(26));
-
-        $carry9 = $h9->addInt(1 << 24)->shiftRight(25);
-        $h0 = $h0->addInt64($carry9->mulInt(19, 5));
-        $h9 = $h9->subInt64($carry9->shiftLeft(25));
-
-        $carry0 = $h0->addInt(1 << 25)->shiftRight(26);
-        $h1 = $h1->addInt64($carry0);
-        $h0 = $h0->subInt64($carry0->shiftLeft(26));
-
-        return ParagonIE_Sodium_Core32_Curve25519_Fe::fromArray(
-            array(
-                $h0->toInt32(),
-                $h1->toInt32(),
-                $h2->toInt32(),
-                $h3->toInt32(),
-                $h4->toInt32(),
-                $h5->toInt32(),
-                $h6->toInt32(),
-                $h7->toInt32(),
-                $h8->toInt32(),
-                $h9->toInt32()
-            )
-        );
-    }
-
-    /**
-     * Square and double a field element
-     *
-     * h = 2 * f * f
-     *
-     * @internal You should not use this directly from another application
-     *
-     * @param ParagonIE_Sodium_Core32_Curve25519_Fe $f
-     * @return ParagonIE_Sodium_Core32_Curve25519_Fe
-     * @throws SodiumException
-     * @throws TypeError
-     * @psalm-suppress MixedMethodCall
-     */
-    public static function fe_sq2(ParagonIE_Sodium_Core32_Curve25519_Fe $f)
-    {
-        $f0 = $f[0]->toInt64();
-        $f1 = $f[1]->toInt64();
-        $f2 = $f[2]->toInt64();
-        $f3 = $f[3]->toInt64();
-        $f4 = $f[4]->toInt64();
-        $f5 = $f[5]->toInt64();
-        $f6 = $f[6]->toInt64();
-        $f7 = $f[7]->toInt64();
-        $f8 = $f[8]->toInt64();
-        $f9 = $f[9]->toInt64();
-
-        $f0_2 = $f0->shiftLeft(1);
-        $f1_2 = $f1->shiftLeft(1);
-        $f2_2 = $f2->shiftLeft(1);
-        $f3_2 = $f3->shiftLeft(1);
-        $f4_2 = $f4->shiftLeft(1);
-        $f5_2 = $f5->shiftLeft(1);
-        $f6_2 = $f6->shiftLeft(1);
-        $f7_2 = $f7->shiftLeft(1);
-        $f5_38 = $f5->mulInt(38, 6); /* 1.959375*2^30 */
-        $f6_19 = $f6->mulInt(19, 5); /* 1.959375*2^30 */
-        $f7_38 = $f7->mulInt(38, 6); /* 1.959375*2^30 */
-        $f8_19 = $f8->mulInt(19, 5); /* 1.959375*2^30 */
-        $f9_38 = $f9->mulInt(38, 6); /* 1.959375*2^30 */
-        $f0f0 = $f0->mulInt64($f0, 28);
-        $f0f1_2 = $f0_2->mulInt64($f1, 28);
-        $f0f2_2 = $f0_2->mulInt64($f2, 28);
-        $f0f3_2 = $f0_2->mulInt64($f3, 28);
-        $f0f4_2 = $f0_2->mulInt64($f4, 28);
-        $f0f5_2 = $f0_2->mulInt64($f5, 28);
-        $f0f6_2 = $f0_2->mulInt64($f6, 28);
-        $f0f7_2 = $f0_2->mulInt64($f7, 28);
-        $f0f8_2 = $f0_2->mulInt64($f8, 28);
-        $f0f9_2 = $f0_2->mulInt64($f9, 28);
-        $f1f1_2 = $f1_2->mulInt64($f1, 28);
-        $f1f2_2 = $f1_2->mulInt64($f2, 28);
-        $f1f3_4 = $f1_2->mulInt64($f3_2, 29);
-        $f1f4_2 = $f1_2->mulInt64($f4, 28);
-        $f1f5_4 = $f1_2->mulInt64($f5_2, 29);
-        $f1f6_2 = $f1_2->mulInt64($f6, 28);
-        $f1f7_4 = $f1_2->mulInt64($f7_2, 29);
-        $f1f8_2 = $f1_2->mulInt64($f8, 28);
-        $f1f9_76 = $f9_38->mulInt64($f1_2, 29);
-        $f2f2 = $f2->mulInt64($f2, 28);
-        $f2f3_2 = $f2_2->mulInt64($f3, 28);
-        $f2f4_2 = $f2_2->mulInt64($f4, 28);
-        $f2f5_2 = $f2_2->mulInt64($f5, 28);
-        $f2f6_2 = $f2_2->mulInt64($f6, 28);
-        $f2f7_2 = $f2_2->mulInt64($f7, 28);
-        $f2f8_38 = $f8_19->mulInt64($f2_2, 29);
-        $f2f9_38 = $f9_38->mulInt64($f2, 29);
-        $f3f3_2 = $f3_2->mulInt64($f3, 28);
-        $f3f4_2 = $f3_2->mulInt64($f4, 28);
-        $f3f5_4 = $f3_2->mulInt64($f5_2, 28);
-        $f3f6_2 = $f3_2->mulInt64($f6, 28);
-        $f3f7_76 = $f7_38->mulInt64($f3_2, 29);
-        $f3f8_38 = $f8_19->mulInt64($f3_2, 29);
-        $f3f9_76 = $f9_38->mulInt64($f3_2, 29);
-        $f4f4 = $f4->mulInt64($f4, 28);
-        $f4f5_2 = $f4_2->mulInt64($f5, 28);
-        $f4f6_38 = $f6_19->mulInt64($f4_2, 29);
-        $f4f7_38 = $f7_38->mulInt64($f4, 29);
-        $f4f8_38 = $f8_19->mulInt64($f4_2, 29);
-        $f4f9_38 = $f9_38->mulInt64($f4, 29);
-        $f5f5_38 = $f5_38->mulInt64($f5, 29);
-        $f5f6_38 = $f6_19->mulInt64($f5_2, 29);
-        $f5f7_76 = $f7_38->mulInt64($f5_2, 29);
-        $f5f8_38 = $f8_19->mulInt64($f5_2, 29);
-        $f5f9_76 = $f9_38->mulInt64($f5_2, 29);
-        $f6f6_19 = $f6_19->mulInt64($f6, 29);
-        $f6f7_38 = $f7_38->mulInt64($f6, 29);
-        $f6f8_38 = $f8_19->mulInt64($f6_2, 29);
-        $f6f9_38 = $f9_38->mulInt64($f6, 29);
-        $f7f7_38 = $f7_38->mulInt64($f7, 29);
-        $f7f8_38 = $f8_19->mulInt64($f7_2, 29);
-        $f7f9_76 = $f9_38->mulInt64($f7_2, 29);
-        $f8f8_19 = $f8_19->mulInt64($f8, 29);
-        $f8f9_38 = $f9_38->mulInt64($f8, 29);
-        $f9f9_38 = $f9_38->mulInt64($f9, 29);
-
-        $h0 = $f0f0->addInt64($f1f9_76)->addInt64($f2f8_38)->addInt64($f3f7_76)->addInt64($f4f6_38)->addInt64($f5f5_38);
-        $h1 = $f0f1_2->addInt64($f2f9_38)->addInt64($f3f8_38)->addInt64($f4f7_38)->addInt64($f5f6_38);
-        $h2 = $f0f2_2->addInt64($f1f1_2)->addInt64($f3f9_76)->addInt64($f4f8_38)->addInt64($f5f7_76)->addInt64($f6f6_19);
-        $h3 = $f0f3_2->addInt64($f1f2_2)->addInt64($f4f9_38)->addInt64($f5f8_38)->addInt64($f6f7_38);
-        $h4 = $f0f4_2->addInt64($f1f3_4)->addInt64($f2f2)->addInt64($f5f9_76)->addInt64($f6f8_38)->addInt64($f7f7_38);
-        $h5 = $f0f5_2->addInt64($f1f4_2)->addInt64($f2f3_2)->addInt64($f6f9_38)->addInt64($f7f8_38);
-        $h6 = $f0f6_2->addInt64($f1f5_4)->addInt64($f2f4_2)->addInt64($f3f3_2)->addInt64($f7f9_76)->addInt64($f8f8_19);
-        $h7 = $f0f7_2->addInt64($f1f6_2)->addInt64($f2f5_2)->addInt64($f3f4_2)->addInt64($f8f9_38);
-        $h8 = $f0f8_2->addInt64($f1f7_4)->addInt64($f2f6_2)->addInt64($f3f5_4)->addInt64($f4f4)->addInt64($f9f9_38);
-        $h9 = $f0f9_2->addInt64($f1f8_2)->addInt64($f2f7_2)->addInt64($f3f6_2)->addInt64($f4f5_2);
-
-        /**
-         * @var ParagonIE_Sodium_Core32_Int64 $h0
-         * @var ParagonIE_Sodium_Core32_Int64 $h1
-         * @var ParagonIE_Sodium_Core32_Int64 $h2
-         * @var ParagonIE_Sodium_Core32_Int64 $h3
-         * @var ParagonIE_Sodium_Core32_Int64 $h4
-         * @var ParagonIE_Sodium_Core32_Int64 $h5
-         * @var ParagonIE_Sodium_Core32_Int64 $h6
-         * @var ParagonIE_Sodium_Core32_Int64 $h7
-         * @var ParagonIE_Sodium_Core32_Int64 $h8
-         * @var ParagonIE_Sodium_Core32_Int64 $h9
-         */
-        $h0 = $h0->shiftLeft(1);
-        $h1 = $h1->shiftLeft(1);
-        $h2 = $h2->shiftLeft(1);
-        $h3 = $h3->shiftLeft(1);
-        $h4 = $h4->shiftLeft(1);
-        $h5 = $h5->shiftLeft(1);
-        $h6 = $h6->shiftLeft(1);
-        $h7 = $h7->shiftLeft(1);
-        $h8 = $h8->shiftLeft(1);
-        $h9 = $h9->shiftLeft(1);
-
-        $carry0 = $h0->addInt(1 << 25)->shiftRight(26);
-        $h1 = $h1->addInt64($carry0);
-        $h0 = $h0->subInt64($carry0->shiftLeft(26));
-        $carry4 = $h4->addInt(1 << 25)->shiftRight(26);
-        $h5 = $h5->addInt64($carry4);
-        $h4 = $h4->subInt64($carry4->shiftLeft(26));
-
-        $carry1 = $h1->addInt(1 << 24)->shiftRight(25);
-        $h2 = $h2->addInt64($carry1);
-        $h1 = $h1->subInt64($carry1->shiftLeft(25));
-        $carry5 = $h5->addInt(1 << 24)->shiftRight(25);
-        $h6 = $h6->addInt64($carry5);
-        $h5 = $h5->subInt64($carry5->shiftLeft(25));
-
-        $carry2 = $h2->addInt(1 << 25)->shiftRight(26);
-        $h3 = $h3->addInt64($carry2);
-        $h2 = $h2->subInt64($carry2->shiftLeft(26));
-        $carry6 = $h6->addInt(1 << 25)->shiftRight(26);
-        $h7 = $h7->addInt64($carry6);
-        $h6 = $h6->subInt64($carry6->shiftLeft(26));
-
-        $carry3 = $h3->addInt(1 << 24)->shiftRight(25);
-        $h4 = $h4->addInt64($carry3);
-        $h3 = $h3->subInt64($carry3->shiftLeft(25));
-        $carry7 = $h7->addInt(1 << 24)->shiftRight(25);
-        $h8 = $h8->addInt64($carry7);
-        $h7 = $h7->subInt64($carry7->shiftLeft(25));
-
-        $carry4 = $h4->addInt(1 << 25)->shiftRight(26);
-        $h5 = $h5->addInt64($carry4);
-        $h4 = $h4->subInt64($carry4->shiftLeft(26));
-        $carry8 = $h8->addInt(1 << 25)->shiftRight(26);
-        $h9 = $h9->addInt64($carry8);
-        $h8 = $h8->subInt64($carry8->shiftLeft(26));
-
-        $carry9 = $h9->addInt(1 << 24)->shiftRight(25);
-        $h0 = $h0->addInt64($carry9->mulInt(19, 5));
-        $h9 = $h9->subInt64($carry9->shiftLeft(25));
-
-        $carry0 = $h0->addInt(1 << 25)->shiftRight(26);
-        $h1 = $h1->addInt64($carry0);
-        $h0 = $h0->subInt64($carry0->shiftLeft(26));
-
-        return ParagonIE_Sodium_Core32_Curve25519_Fe::fromArray(
-            array(
-                $h0->toInt32(),
-                $h1->toInt32(),
-                $h2->toInt32(),
-                $h3->toInt32(),
-                $h4->toInt32(),
-                $h5->toInt32(),
-                $h6->toInt32(),
-                $h7->toInt32(),
-                $h8->toInt32(),
-                $h9->toInt32()
-            )
-        );
-    }
-
-    /**
-     * @internal You should not use this directly from another application
-     *
-     * @param ParagonIE_Sodium_Core32_Curve25519_Fe $Z
-     * @return ParagonIE_Sodium_Core32_Curve25519_Fe
-     * @throws SodiumException
-     * @throws TypeError
-     */
-    public static function fe_invert(ParagonIE_Sodium_Core32_Curve25519_Fe $Z)
-    {
-        $z = clone $Z;
-        $t0 = self::fe_sq($z);
-        $t1 = self::fe_sq($t0);
-        $t1 = self::fe_sq($t1);
-        $t1 = self::fe_mul($z, $t1);
-        $t0 = self::fe_mul($t0, $t1);
-        $t2 = self::fe_sq($t0);
-        $t1 = self::fe_mul($t1, $t2);
-        $t2 = self::fe_sq($t1);
-        for ($i = 1; $i < 5; ++$i) {
-            $t2 = self::fe_sq($t2);
-        }
-        $t1 = self::fe_mul($t2, $t1);
-        $t2 = self::fe_sq($t1);
-        for ($i = 1; $i < 10; ++$i) {
-            $t2 = self::fe_sq($t2);
-        }
-        $t2 = self::fe_mul($t2, $t1);
-        $t3 = self::fe_sq($t2);
-        for ($i = 1; $i < 20; ++$i) {
-            $t3 = self::fe_sq($t3);
-        }
-        $t2 = self::fe_mul($t3, $t2);
-        $t2 = self::fe_sq($t2);
-        for ($i = 1; $i < 10; ++$i) {
-            $t2 = self::fe_sq($t2);
-        }
-        $t1 = self::fe_mul($t2, $t1);
-        $t2 = self::fe_sq($t1);
-        for ($i = 1; $i < 50; ++$i) {
-            $t2 = self::fe_sq($t2);
-        }
-        $t2 = self::fe_mul($t2, $t1);
-        $t3 = self::fe_sq($t2);
-        for ($i = 1; $i < 100; ++$i) {
-            $t3 = self::fe_sq($t3);
-        }
-        $t2 = self::fe_mul($t3, $t2);
-        $t2 = self::fe_sq($t2);
-        for ($i = 1; $i < 50; ++$i) {
-            $t2 = self::fe_sq($t2);
-        }
-        $t1 = self::fe_mul($t2, $t1);
-        $t1 = self::fe_sq($t1);
-        for ($i = 1; $i < 5; ++$i) {
-            $t1 = self::fe_sq($t1);
-        }
-        return self::fe_mul($t1, $t0);
-    }
-
-    /**
-     * @internal You should not use this directly from another application
-     *
-     * @ref https://github.com/jedisct1/libsodium/blob/68564326e1e9dc57ef03746f85734232d20ca6fb/src/libsodium/crypto_core/curve25519/ref10/curve25519_ref10.c#L1054-L1106
-     *
-     * @param ParagonIE_Sodium_Core32_Curve25519_Fe $z
-     * @return ParagonIE_Sodium_Core32_Curve25519_Fe
-     * @throws SodiumException
-     * @throws TypeError
-     */
-    public static function fe_pow22523(ParagonIE_Sodium_Core32_Curve25519_Fe $z)
-    {
-        # fe_sq(t0, z);
-        # fe_sq(t1, t0);
-        # fe_sq(t1, t1);
-        # fe_mul(t1, z, t1);
-        # fe_mul(t0, t0, t1);
-        # fe_sq(t0, t0);
-        # fe_mul(t0, t1, t0);
-        # fe_sq(t1, t0);
-        $t0 = self::fe_sq($z);
-        $t1 = self::fe_sq($t0);
-        $t1 = self::fe_sq($t1);
-        $t1 = self::fe_mul($z, $t1);
-        $t0 = self::fe_mul($t0, $t1);
-        $t0 = self::fe_sq($t0);
-        $t0 = self::fe_mul($t1, $t0);
-        $t1 = self::fe_sq($t0);
-
-        # for (i = 1; i < 5; ++i) {
-        #     fe_sq(t1, t1);
-        # }
-        for ($i = 1; $i < 5; ++$i) {
-            $t1 = self::fe_sq($t1);
-        }
-
-        # fe_mul(t0, t1, t0);
-        # fe_sq(t1, t0);
-        $t0 = self::fe_mul($t1, $t0);
-        $t1 = self::fe_sq($t0);
-
-        # for (i = 1; i < 10; ++i) {
-        #     fe_sq(t1, t1);
-        # }
-        for ($i = 1; $i < 10; ++$i) {
-            $t1 = self::fe_sq($t1);
-        }
-
-        # fe_mul(t1, t1, t0);
-        # fe_sq(t2, t1);
-        $t1 = self::fe_mul($t1, $t0);
-        $t2 = self::fe_sq($t1);
-
-        # for (i = 1; i < 20; ++i) {
-        #     fe_sq(t2, t2);
-        # }
-        for ($i = 1; $i < 20; ++$i) {
-            $t2 = self::fe_sq($t2);
-        }
-
-        # fe_mul(t1, t2, t1);
-        # fe_sq(t1, t1);
-        $t1 = self::fe_mul($t2, $t1);
-        $t1 = self::fe_sq($t1);
-
-        # for (i = 1; i < 10; ++i) {
-        #     fe_sq(t1, t1);
-        # }
-        for ($i = 1; $i < 10; ++$i) {
-            $t1 = self::fe_sq($t1);
-        }
-
-        # fe_mul(t0, t1, t0);
-        # fe_sq(t1, t0);
-        $t0 = self::fe_mul($t1, $t0);
-        $t1 = self::fe_sq($t0);
-
-        # for (i = 1; i < 50; ++i) {
-        #     fe_sq(t1, t1);
-        # }
-        for ($i = 1; $i < 50; ++$i) {
-            $t1 = self::fe_sq($t1);
-        }
-
-        # fe_mul(t1, t1, t0);
-        # fe_sq(t2, t1);
-        $t1 = self::fe_mul($t1, $t0);
-        $t2 = self::fe_sq($t1);
-
-        # for (i = 1; i < 100; ++i) {
-        #     fe_sq(t2, t2);
-        # }
-        for ($i = 1; $i < 100; ++$i) {
-            $t2 = self::fe_sq($t2);
-        }
-
-        # fe_mul(t1, t2, t1);
-        # fe_sq(t1, t1);
-        $t1 = self::fe_mul($t2, $t1);
-        $t1 = self::fe_sq($t1);
-
-        # for (i = 1; i < 50; ++i) {
-        #     fe_sq(t1, t1);
-        # }
-        for ($i = 1; $i < 50; ++$i) {
-            $t1 = self::fe_sq($t1);
-        }
-
-        # fe_mul(t0, t1, t0);
-        # fe_sq(t0, t0);
-        # fe_sq(t0, t0);
-        # fe_mul(out, t0, z);
-        $t0 = self::fe_mul($t1, $t0);
-        $t0 = self::fe_sq($t0);
-        $t0 = self::fe_sq($t0);
-        return self::fe_mul($t0, $z);
-    }
-
-    /**
-     * Subtract two field elements.
-     *
-     * h = f - g
-     *
-     * Preconditions:
-     * |f| bounded by 1.1*2^25,1.1*2^24,1.1*2^25,1.1*2^24,etc.
-     * |g| bounded by 1.1*2^25,1.1*2^24,1.1*2^25,1.1*2^24,etc.
-     *
-     * Postconditions:
-     * |h| bounded by 1.1*2^26,1.1*2^25,1.1*2^26,1.1*2^25,etc.
-     *
-     * @internal You should not use this directly from another application
-     *
-     * @param ParagonIE_Sodium_Core32_Curve25519_Fe $f
-     * @param ParagonIE_Sodium_Core32_Curve25519_Fe $g
-     * @return ParagonIE_Sodium_Core32_Curve25519_Fe
-     * @throws SodiumException
-     * @throws TypeError
-     * @psalm-suppress MixedMethodCall
-     * @psalm-suppress MixedTypeCoercion
-     */
-    public static function fe_sub(ParagonIE_Sodium_Core32_Curve25519_Fe $f, ParagonIE_Sodium_Core32_Curve25519_Fe $g)
-    {
-        return ParagonIE_Sodium_Core32_Curve25519_Fe::fromArray(
-            array(
-                $f[0]->subInt32($g[0]),
-                $f[1]->subInt32($g[1]),
-                $f[2]->subInt32($g[2]),
-                $f[3]->subInt32($g[3]),
-                $f[4]->subInt32($g[4]),
-                $f[5]->subInt32($g[5]),
-                $f[6]->subInt32($g[6]),
-                $f[7]->subInt32($g[7]),
-                $f[8]->subInt32($g[8]),
-                $f[9]->subInt32($g[9])
-            )
-        );
-    }
-
-    /**
-     * Add two group elements.
-     *
-     * r = p + q
-     *
-     * @internal You should not use this directly from another application
-     *
-     * @param ParagonIE_Sodium_Core32_Curve25519_Ge_P3 $p
-     * @param ParagonIE_Sodium_Core32_Curve25519_Ge_Cached $q
-     * @return ParagonIE_Sodium_Core32_Curve25519_Ge_P1p1
-     * @throws SodiumException
-     * @throws TypeError
-     */
-    public static function ge_add(
-        ParagonIE_Sodium_Core32_Curve25519_Ge_P3 $p,
-        ParagonIE_Sodium_Core32_Curve25519_Ge_Cached $q
-    ) {
-        $r = new ParagonIE_Sodium_Core32_Curve25519_Ge_P1p1();
-        $r->X = self::fe_add($p->Y, $p->X);
-        $r->Y = self::fe_sub($p->Y, $p->X);
-        $r->Z = self::fe_mul($r->X, $q->YplusX);
-        $r->Y = self::fe_mul($r->Y, $q->YminusX);
-        $r->T = self::fe_mul($q->T2d, $p->T);
-        $r->X = self::fe_mul($p->Z, $q->Z);
-        $t0   = self::fe_add($r->X, $r->X);
-        $r->X = self::fe_sub($r->Z, $r->Y);
-        $r->Y = self::fe_add($r->Z, $r->Y);
-        $r->Z = self::fe_add($t0, $r->T);
-        $r->T = self::fe_sub($t0, $r->T);
-        return $r;
-    }
-
-    /**
-     * @internal You should not use this directly from another application
-     *
-     * @ref https://github.com/jedisct1/libsodium/blob/157c4a80c13b117608aeae12178b2d38825f9f8f/src/libsodium/crypto_core/curve25519/ref10/curve25519_ref10.c#L1185-L1215
-     * @param string $a
-     * @return array<int, mixed>
-     * @throws SodiumException
-     * @throws TypeError
-     * @psalm-suppress MixedArrayOffset
-     */
-    public static function slide($a)
-    {
-        if (self::strlen($a) < 256) {
-            if (self::strlen($a) < 16) {
-                $a = str_pad($a, 256, '0', STR_PAD_RIGHT);
-            }
-        }
-        /** @var array<int, int> $r */
-        $r = array();
-        for ($i = 0; $i < 256; ++$i) {
-            $r[$i] = (int) (1 &
-                (
-                    self::chrToInt($a[$i >> 3])
-                        >>
-                    ($i & 7)
-                )
-            );
-        }
-
-        for ($i = 0;$i < 256;++$i) {
-            if ($r[$i]) {
-                for ($b = 1;$b <= 6 && $i + $b < 256;++$b) {
-                    if ($r[$i + $b]) {
-                        if ($r[$i] + ($r[$i + $b] << $b) <= 15) {
-                            $r[$i] += $r[$i + $b] << $b;
-                            $r[$i + $b] = 0;
-                        } elseif ($r[$i] - ($r[$i + $b] << $b) >= -15) {
-                            $r[$i] -= $r[$i + $b] << $b;
-                            for ($k = $i + $b; $k < 256; ++$k) {
-                                if (!$r[$k]) {
-                                    $r[$k] = 1;
-                                    break;
-                                }
-                                $r[$k] = 0;
-                            }
-                        } else {
-                            break;
-                        }
-                    }
-                }
-            }
-        }
-        return $r;
-    }
-
-    /**
-     * @internal You should not use this directly from another application
-     *
-     * @param string $s
-     * @return ParagonIE_Sodium_Core32_Curve25519_Ge_P3
-     * @throws SodiumException
-     * @throws TypeError
-     */
-    public static function ge_frombytes_negate_vartime($s)
-    {
-        static $d = null;
-        if (!$d) {
-            $d = ParagonIE_Sodium_Core32_Curve25519_Fe::fromArray(
-                array(
-                    ParagonIE_Sodium_Core32_Int32::fromInt(self::$d[0]),
-                    ParagonIE_Sodium_Core32_Int32::fromInt(self::$d[1]),
-                    ParagonIE_Sodium_Core32_Int32::fromInt(self::$d[2]),
-                    ParagonIE_Sodium_Core32_Int32::fromInt(self::$d[3]),
-                    ParagonIE_Sodium_Core32_Int32::fromInt(self::$d[4]),
-                    ParagonIE_Sodium_Core32_Int32::fromInt(self::$d[5]),
-                    ParagonIE_Sodium_Core32_Int32::fromInt(self::$d[6]),
-                    ParagonIE_Sodium_Core32_Int32::fromInt(self::$d[7]),
-                    ParagonIE_Sodium_Core32_Int32::fromInt(self::$d[8]),
-                    ParagonIE_Sodium_Core32_Int32::fromInt(self::$d[9])
-                )
-            );
-        }
-        /** @var ParagonIE_Sodium_Core32_Curve25519_Fe $d */
-
-        # fe_frombytes(h->Y,s);
-        # fe_1(h->Z);
-        $h = new ParagonIE_Sodium_Core32_Curve25519_Ge_P3(
-            self::fe_0(),
-            self::fe_frombytes($s),
-            self::fe_1()
-        );
-
-        # fe_sq(u,h->Y);
-        # fe_mul(v,u,d);
-        # fe_sub(u,u,h->Z);       /* u = y^2-1 */
-        # fe_add(v,v,h->Z);       /* v = dy^2+1 */
-        $u = self::fe_sq($h->Y);
-        /** @var ParagonIE_Sodium_Core32_Curve25519_Fe $d */
-        $v = self::fe_mul($u, $d);
-        $u = self::fe_sub($u, $h->Z); /* u =  y^2 - 1 */
-        $v = self::fe_add($v, $h->Z); /* v = dy^2 + 1 */
-
-        # fe_sq(v3,v);
-        # fe_mul(v3,v3,v);        /* v3 = v^3 */
-        # fe_sq(h->X,v3);
-        # fe_mul(h->X,h->X,v);
-        # fe_mul(h->X,h->X,u);    /* x = uv^7 */
-        $v3 = self::fe_sq($v);
-        $v3 = self::fe_mul($v3, $v); /* v3 = v^3 */
-        $h->X = self::fe_sq($v3);
-        $h->X = self::fe_mul($h->X, $v);
-        $h->X = self::fe_mul($h->X, $u); /* x = uv^7 */
-
-        # fe_pow22523(h->X,h->X); /* x = (uv^7)^((q-5)/8) */
-        # fe_mul(h->X,h->X,v3);
-        # fe_mul(h->X,h->X,u);    /* x = uv^3(uv^7)^((q-5)/8) */
-        $h->X = self::fe_pow22523($h->X); /* x = (uv^7)^((q-5)/8) */
-        $h->X = self::fe_mul($h->X, $v3);
-        $h->X = self::fe_mul($h->X, $u); /* x = uv^3(uv^7)^((q-5)/8) */
-
-        # fe_sq(vxx,h->X);
-        # fe_mul(vxx,vxx,v);
-        # fe_sub(check,vxx,u);    /* vx^2-u */
-        $vxx = self::fe_sq($h->X);
-        $vxx = self::fe_mul($vxx, $v);
-        $check = self::fe_sub($vxx, $u); /* vx^2 - u */
-
-        # if (fe_isnonzero(check)) {
-        #     fe_add(check,vxx,u);  /* vx^2+u */
-        #     if (fe_isnonzero(check)) {
-        #         return -1;
-        #     }
-        #     fe_mul(h->X,h->X,sqrtm1);
-        # }
-        if (self::fe_isnonzero($check)) {
-            $check = self::fe_add($vxx, $u); /* vx^2 + u */
-            if (self::fe_isnonzero($check)) {
-                throw new RangeException('Internal check failed.');
-            }
-            $h->X = self::fe_mul(
-                $h->X,
-                ParagonIE_Sodium_Core32_Curve25519_Fe::fromIntArray(self::$sqrtm1)
-            );
-        }
-
-        # if (fe_isnegative(h->X) == (s[31] >> 7)) {
-        #     fe_neg(h->X,h->X);
-        # }
-        $i = self::chrToInt($s[31]);
-        if (self::fe_isnegative($h->X) === ($i >> 7)) {
-            $h->X = self::fe_neg($h->X);
-        }
-
-        # fe_mul(h->T,h->X,h->Y);
-        $h->T = self::fe_mul($h->X, $h->Y);
-        return $h;
-    }
-
-    /**
-     * @internal You should not use this directly from another application
-     *
-     * @param ParagonIE_Sodium_Core32_Curve25519_Ge_P1p1 $R
-     * @param ParagonIE_Sodium_Core32_Curve25519_Ge_P3 $p
-     * @param ParagonIE_Sodium_Core32_Curve25519_Ge_Precomp $q
-     * @return ParagonIE_Sodium_Core32_Curve25519_Ge_P1p1
-     * @throws SodiumException
-     * @throws TypeError
-     */
-    public static function ge_madd(
-        ParagonIE_Sodium_Core32_Curve25519_Ge_P1p1 $R,
-        ParagonIE_Sodium_Core32_Curve25519_Ge_P3 $p,
-        ParagonIE_Sodium_Core32_Curve25519_Ge_Precomp $q
-    ) {
-        $r = clone $R;
-        $r->X = self::fe_add($p->Y, $p->X);
-        $r->Y = self::fe_sub($p->Y, $p->X);
-        $r->Z = self::fe_mul($r->X, $q->yplusx);
-        $r->Y = self::fe_mul($r->Y, $q->yminusx);
-        $r->T = self::fe_mul($q->xy2d, $p->T);
-        $t0 = self::fe_add(clone $p->Z, clone $p->Z);
-        $r->X = self::fe_sub($r->Z, $r->Y);
-        $r->Y = self::fe_add($r->Z, $r->Y);
-        $r->Z = self::fe_add($t0, $r->T);
-        $r->T = self::fe_sub($t0, $r->T);
-
-        return $r;
-    }
-
-    /**
-     * @internal You should not use this directly from another application
-     *
-     * @param ParagonIE_Sodium_Core32_Curve25519_Ge_P1p1 $R
-     * @param ParagonIE_Sodium_Core32_Curve25519_Ge_P3 $p
-     * @param ParagonIE_Sodium_Core32_Curve25519_Ge_Precomp $q
-     * @return ParagonIE_Sodium_Core32_Curve25519_Ge_P1p1
-     * @throws SodiumException
-     * @throws TypeError
-     */
-    public static function ge_msub(
-        ParagonIE_Sodium_Core32_Curve25519_Ge_P1p1 $R,
-        ParagonIE_Sodium_Core32_Curve25519_Ge_P3 $p,
-        ParagonIE_Sodium_Core32_Curve25519_Ge_Precomp $q
-    ) {
-        $r = clone $R;
-
-        $r->X = self::fe_add($p->Y, $p->X);
-        $r->Y = self::fe_sub($p->Y, $p->X);
-        $r->Z = self::fe_mul($r->X, $q->yminusx);
-        $r->Y = self::fe_mul($r->Y, $q->yplusx);
-        $r->T = self::fe_mul($q->xy2d, $p->T);
-        $t0 = self::fe_add($p->Z, $p->Z);
-        $r->X = self::fe_sub($r->Z, $r->Y);
-        $r->Y = self::fe_add($r->Z, $r->Y);
-        $r->Z = self::fe_sub($t0, $r->T);
-        $r->T = self::fe_add($t0, $r->T);
-
-        return $r;
-    }
-
-    /**
-     * @internal You should not use this directly from another application
-     *
-     * @param ParagonIE_Sodium_Core32_Curve25519_Ge_P1p1 $p
-     * @return ParagonIE_Sodium_Core32_Curve25519_Ge_P2
-     * @throws SodiumException
-     * @throws TypeError
-     */
-    public static function ge_p1p1_to_p2(ParagonIE_Sodium_Core32_Curve25519_Ge_P1p1 $p)
-    {
-        $r = new ParagonIE_Sodium_Core32_Curve25519_Ge_P2();
-        $r->X = self::fe_mul($p->X, $p->T);
-        $r->Y = self::fe_mul($p->Y, $p->Z);
-        $r->Z = self::fe_mul($p->Z, $p->T);
-        return $r;
-    }
-
-    /**
-     * @internal You should not use this directly from another application
-     *
-     * @param ParagonIE_Sodium_Core32_Curve25519_Ge_P1p1 $p
-     * @return ParagonIE_Sodium_Core32_Curve25519_Ge_P3
-     * @throws SodiumException
-     * @throws TypeError
-     */
-    public static function ge_p1p1_to_p3(ParagonIE_Sodium_Core32_Curve25519_Ge_P1p1 $p)
-    {
-        $r = new ParagonIE_Sodium_Core32_Curve25519_Ge_P3();
-        $r->X = self::fe_mul($p->X, $p->T);
-        $r->Y = self::fe_mul($p->Y, $p->Z);
-        $r->Z = self::fe_mul($p->Z, $p->T);
-        $r->T = self::fe_mul($p->X, $p->Y);
-        return $r;
-    }
-
-    /**
-     * @internal You should not use this directly from another application
-     *
-     * @return ParagonIE_Sodium_Core32_Curve25519_Ge_P2
-     * @throws SodiumException
-     * @throws TypeError
-     */
-    public static function ge_p2_0()
-    {
-        return new ParagonIE_Sodium_Core32_Curve25519_Ge_P2(
-            self::fe_0(),
-            self::fe_1(),
-            self::fe_1()
-        );
-    }
-
-    /**
-     * @internal You should not use this directly from another application
-     *
-     * @param ParagonIE_Sodium_Core32_Curve25519_Ge_P2 $p
-     * @return ParagonIE_Sodium_Core32_Curve25519_Ge_P1p1
-     * @throws SodiumException
-     * @throws TypeError
-     */
-    public static function ge_p2_dbl(ParagonIE_Sodium_Core32_Curve25519_Ge_P2 $p)
-    {
-        $r = new ParagonIE_Sodium_Core32_Curve25519_Ge_P1p1();
-
-        $r->X = self::fe_sq($p->X);
-        $r->Z = self::fe_sq($p->Y);
-        $r->T = self::fe_sq2($p->Z);
-        $r->Y = self::fe_add($p->X, $p->Y);
-        $t0   = self::fe_sq($r->Y);
-        $r->Y = self::fe_add($r->Z, $r->X);
-        $r->Z = self::fe_sub($r->Z, $r->X);
-        $r->X = self::fe_sub($t0, $r->Y);
-        $r->T = self::fe_sub($r->T, $r->Z);
-
-        return $r;
-    }
-
-    /**
-     * @internal You should not use this directly from another application
-     *
-     * @return ParagonIE_Sodium_Core32_Curve25519_Ge_P3
-     * @throws SodiumException
-     * @throws TypeError
-     */
-    public static function ge_p3_0()
-    {
-        return new ParagonIE_Sodium_Core32_Curve25519_Ge_P3(
-            self::fe_0(),
-            self::fe_1(),
-            self::fe_1(),
-            self::fe_0()
-        );
-    }
-
-    /**
-     * @internal You should not use this directly from another application
-     *
-     * @param ParagonIE_Sodium_Core32_Curve25519_Ge_P3 $p
-     * @return ParagonIE_Sodium_Core32_Curve25519_Ge_Cached
-     * @throws SodiumException
-     * @throws TypeError
-     */
-    public static function ge_p3_to_cached(ParagonIE_Sodium_Core32_Curve25519_Ge_P3 $p)
-    {
-        static $d2 = null;
-        if ($d2 === null) {
-            $d2 = ParagonIE_Sodium_Core32_Curve25519_Fe::fromArray(
-                array(
-                    ParagonIE_Sodium_Core32_Int32::fromInt(self::$d2[0]),
-                    ParagonIE_Sodium_Core32_Int32::fromInt(self::$d2[1]),
-                    ParagonIE_Sodium_Core32_Int32::fromInt(self::$d2[2]),
-                    ParagonIE_Sodium_Core32_Int32::fromInt(self::$d2[3]),
-                    ParagonIE_Sodium_Core32_Int32::fromInt(self::$d2[4]),
-                    ParagonIE_Sodium_Core32_Int32::fromInt(self::$d2[5]),
-                    ParagonIE_Sodium_Core32_Int32::fromInt(self::$d2[6]),
-                    ParagonIE_Sodium_Core32_Int32::fromInt(self::$d2[7]),
-                    ParagonIE_Sodium_Core32_Int32::fromInt(self::$d2[8]),
-                    ParagonIE_Sodium_Core32_Int32::fromInt(self::$d2[9])
-                )
-            );
-        }
-        /** @var ParagonIE_Sodium_Core32_Curve25519_Fe $d2 */
-        $r = new ParagonIE_Sodium_Core32_Curve25519_Ge_Cached();
-        $r->YplusX = self::fe_add($p->Y, $p->X);
-        $r->YminusX = self::fe_sub($p->Y, $p->X);
-        $r->Z = self::fe_copy($p->Z);
-        $r->T2d = self::fe_mul($p->T, $d2);
-        return $r;
-    }
-
-    /**
-     * @internal You should not use this directly from another application
-     *
-     * @param ParagonIE_Sodium_Core32_Curve25519_Ge_P3 $p
-     * @return ParagonIE_Sodium_Core32_Curve25519_Ge_P2
-     */
-    public static function ge_p3_to_p2(ParagonIE_Sodium_Core32_Curve25519_Ge_P3 $p)
-    {
-        return new ParagonIE_Sodium_Core32_Curve25519_Ge_P2(
-            $p->X,
-            $p->Y,
-            $p->Z
-        );
-    }
-
-    /**
-     * @internal You should not use this directly from another application
-     *
-     * @param ParagonIE_Sodium_Core32_Curve25519_Ge_P3 $h
-     * @return string
-     * @throws SodiumException
-     * @throws TypeError
-     */
-    public static function ge_p3_tobytes(ParagonIE_Sodium_Core32_Curve25519_Ge_P3 $h)
-    {
-        $recip = self::fe_invert($h->Z);
-        $x = self::fe_mul($h->X, $recip);
-        $y = self::fe_mul($h->Y, $recip);
-        $s = self::fe_tobytes($y);
-        $s[31] = self::intToChr(
-            self::chrToInt($s[31]) ^ (self::fe_isnegative($x) << 7)
-        );
-        return $s;
-    }
-
-    /**
-     * @internal You should not use this directly from another application
-     *
-     * @param ParagonIE_Sodium_Core32_Curve25519_Ge_P3 $p
-     * @return ParagonIE_Sodium_Core32_Curve25519_Ge_P1p1
-     * @throws SodiumException
-     * @throws TypeError
-     */
-    public static function ge_p3_dbl(ParagonIE_Sodium_Core32_Curve25519_Ge_P3 $p)
-    {
-        $q = self::ge_p3_to_p2($p);
-        return self::ge_p2_dbl($q);
-    }
-
-    /**
-     * @return ParagonIE_Sodium_Core32_Curve25519_Ge_Precomp
-     * @throws SodiumException
-     * @throws TypeError
-     */
-    public static function ge_precomp_0()
-    {
-        return new ParagonIE_Sodium_Core32_Curve25519_Ge_Precomp(
-            self::fe_1(),
-            self::fe_1(),
-            self::fe_0()
-        );
-    }
-
-    /**
-     * @internal You should not use this directly from another application
-     *
-     * @param int $b
-     * @param int $c
-     * @return int
-     * @psalm-suppress MixedReturnStatement
-     */
-    public static function equal($b, $c)
-    {
-        $b0 = $b & 0xffff;
-        $b1 = ($b >> 16) & 0xffff;
-        $c0 = $c & 0xffff;
-        $c1 = ($c >> 16) & 0xffff;
-
-        $d0 = (($b0 ^ $c0) - 1) >> 31;
-        $d1 = (($b1 ^ $c1) - 1) >> 31;
-        return ($d0 & $d1) & 1;
-    }
-
-    /**
-     * @internal You should not use this directly from another application
-     *
-     * @param string|int $char
-     * @return int (1 = yes, 0 = no)
-     * @throws SodiumException
-     * @throws TypeError
-     */
-    public static function negative($char)
-    {
-        if (is_int($char)) {
-            return $char < 0 ? 1 : 0;
-        }
-        /** @var string $char */
-        $x = self::chrToInt(self::substr($char, 0, 1));
-        return (int) ($x >> 31);
-    }
-
-    /**
-     * Conditional move
-     *
-     * @internal You should not use this directly from another application
-     *
-     * @param ParagonIE_Sodium_Core32_Curve25519_Ge_Precomp $t
-     * @param ParagonIE_Sodium_Core32_Curve25519_Ge_Precomp $u
-     * @param int $b
-     * @return ParagonIE_Sodium_Core32_Curve25519_Ge_Precomp
-     * @throws SodiumException
-     * @throws TypeError
-     */
-    public static function cmov(
-        ParagonIE_Sodium_Core32_Curve25519_Ge_Precomp $t,
-        ParagonIE_Sodium_Core32_Curve25519_Ge_Precomp $u,
-        $b
-    ) {
-        if (!is_int($b)) {
-            throw new InvalidArgumentException('Expected an integer.');
-        }
-        return new ParagonIE_Sodium_Core32_Curve25519_Ge_Precomp(
-            self::fe_cmov($t->yplusx, $u->yplusx, $b),
-            self::fe_cmov($t->yminusx, $u->yminusx, $b),
-            self::fe_cmov($t->xy2d, $u->xy2d, $b)
-        );
-    }
-
-    /**
-     * @internal You should not use this directly from another application
-     *
-     * @param int $pos
-     * @param int $b
-     * @return ParagonIE_Sodium_Core32_Curve25519_Ge_Precomp
-     * @throws SodiumException
-     * @throws TypeError
-     * @psalm-suppress MixedArrayAccess
-     * @psalm-suppress MixedArrayOffset
-     * @psalm-suppress MixedArgument
-     */
-    public static function ge_select($pos = 0, $b = 0)
-    {
-        static $base = null;
-        if ($base === null) {
-            $base = array();
-            foreach (self::$base as $i => $bas) {
-                for ($j = 0; $j < 8; ++$j) {
-                    $base[$i][$j] = new ParagonIE_Sodium_Core32_Curve25519_Ge_Precomp(
-                        ParagonIE_Sodium_Core32_Curve25519_Fe::fromArray(
-                            array(
-                                ParagonIE_Sodium_Core32_Int32::fromInt($bas[$j][0][0]),
-                                ParagonIE_Sodium_Core32_Int32::fromInt($bas[$j][0][1]),
-                                ParagonIE_Sodium_Core32_Int32::fromInt($bas[$j][0][2]),
-                                ParagonIE_Sodium_Core32_Int32::fromInt($bas[$j][0][3]),
-                                ParagonIE_Sodium_Core32_Int32::fromInt($bas[$j][0][4]),
-                                ParagonIE_Sodium_Core32_Int32::fromInt($bas[$j][0][5]),
-                                ParagonIE_Sodium_Core32_Int32::fromInt($bas[$j][0][6]),
-                                ParagonIE_Sodium_Core32_Int32::fromInt($bas[$j][0][7]),
-                                ParagonIE_Sodium_Core32_Int32::fromInt($bas[$j][0][8]),
-                                ParagonIE_Sodium_Core32_Int32::fromInt($bas[$j][0][9])
-                            )
-                        ),
-                        ParagonIE_Sodium_Core32_Curve25519_Fe::fromArray(
-                            array(
-                                ParagonIE_Sodium_Core32_Int32::fromInt($bas[$j][1][0]),
-                                ParagonIE_Sodium_Core32_Int32::fromInt($bas[$j][1][1]),
-                                ParagonIE_Sodium_Core32_Int32::fromInt($bas[$j][1][2]),
-                                ParagonIE_Sodium_Core32_Int32::fromInt($bas[$j][1][3]),
-                                ParagonIE_Sodium_Core32_Int32::fromInt($bas[$j][1][4]),
-                                ParagonIE_Sodium_Core32_Int32::fromInt($bas[$j][1][5]),
-                                ParagonIE_Sodium_Core32_Int32::fromInt($bas[$j][1][6]),
-                                ParagonIE_Sodium_Core32_Int32::fromInt($bas[$j][1][7]),
-                                ParagonIE_Sodium_Core32_Int32::fromInt($bas[$j][1][8]),
-                                ParagonIE_Sodium_Core32_Int32::fromInt($bas[$j][1][9])
-                            )
-                        ),
-                        ParagonIE_Sodium_Core32_Curve25519_Fe::fromArray(
-                            array(
-                                ParagonIE_Sodium_Core32_Int32::fromInt($bas[$j][2][0]),
-                                ParagonIE_Sodium_Core32_Int32::fromInt($bas[$j][2][1]),
-                                ParagonIE_Sodium_Core32_Int32::fromInt($bas[$j][2][2]),
-                                ParagonIE_Sodium_Core32_Int32::fromInt($bas[$j][2][3]),
-                                ParagonIE_Sodium_Core32_Int32::fromInt($bas[$j][2][4]),
-                                ParagonIE_Sodium_Core32_Int32::fromInt($bas[$j][2][5]),
-                                ParagonIE_Sodium_Core32_Int32::fromInt($bas[$j][2][6]),
-                                ParagonIE_Sodium_Core32_Int32::fromInt($bas[$j][2][7]),
-                                ParagonIE_Sodium_Core32_Int32::fromInt($bas[$j][2][8]),
-                                ParagonIE_Sodium_Core32_Int32::fromInt($bas[$j][2][9])
-                            )
-                        )
-                    );
-                }
-            }
-        }
-        if (!is_int($pos)) {
-            throw new InvalidArgumentException('Position must be an integer');
-        }
-        if ($pos < 0 || $pos > 31) {
-            throw new RangeException('Position is out of range [0, 31]');
-        }
-
-        $bnegative = self::negative($b);
-        $babs = $b - (((-$bnegative) & $b) << 1);
-
-        $t = self::ge_precomp_0();
-        for ($i = 0; $i < 8; ++$i) {
-            $t = self::cmov(
-                $t,
-                $base[$pos][$i],
-                -self::equal($babs, $i + 1)
-            );
-        }
-        $minusT = new ParagonIE_Sodium_Core32_Curve25519_Ge_Precomp(
-            self::fe_copy($t->yminusx),
-            self::fe_copy($t->yplusx),
-            self::fe_neg($t->xy2d)
-        );
-        return self::cmov($t, $minusT, -$bnegative);
-    }
-
-    /**
-     * Subtract two group elements.
-     *
-     * r = p - q
-     *
-     * @internal You should not use this directly from another application
-     *
-     * @param ParagonIE_Sodium_Core32_Curve25519_Ge_P3 $p
-     * @param ParagonIE_Sodium_Core32_Curve25519_Ge_Cached $q
-     * @return ParagonIE_Sodium_Core32_Curve25519_Ge_P1p1
-     * @throws SodiumException
-     * @throws TypeError
-     */
-    public static function ge_sub(
-        ParagonIE_Sodium_Core32_Curve25519_Ge_P3 $p,
-        ParagonIE_Sodium_Core32_Curve25519_Ge_Cached $q
-    ) {
-        $r = new ParagonIE_Sodium_Core32_Curve25519_Ge_P1p1();
-
-        $r->X = self::fe_add($p->Y, $p->X);
-        $r->Y = self::fe_sub($p->Y, $p->X);
-        $r->Z = self::fe_mul($r->X, $q->YminusX);
-        $r->Y = self::fe_mul($r->Y, $q->YplusX);
-        $r->T = self::fe_mul($q->T2d, $p->T);
-        $r->X = self::fe_mul($p->Z, $q->Z);
-        $t0 = self::fe_add($r->X, $r->X);
-        $r->X = self::fe_sub($r->Z, $r->Y);
-        $r->Y = self::fe_add($r->Z, $r->Y);
-        $r->Z = self::fe_sub($t0, $r->T);
-        $r->T = self::fe_add($t0, $r->T);
-
-        return $r;
-    }
-
-    /**
-     * Convert a group element to a byte string.
-     *
-     * @param ParagonIE_Sodium_Core32_Curve25519_Ge_P2 $h
-     * @return string
-     * @throws SodiumException
-     * @throws TypeError
-     */
-    public static function ge_tobytes(ParagonIE_Sodium_Core32_Curve25519_Ge_P2 $h)
-    {
-        $recip = self::fe_invert($h->Z);
-        $x = self::fe_mul($h->X, $recip);
-        $y = self::fe_mul($h->Y, $recip);
-        $s = self::fe_tobytes($y);
-        $s[31] = self::intToChr(
-            self::chrToInt($s[31]) ^ (self::fe_isnegative($x) << 7)
-        );
-        return $s;
-    }
-
-    /**
-     * @internal You should not use this directly from another application
-     *
-     * @param string $a
-     * @param ParagonIE_Sodium_Core32_Curve25519_Ge_P3 $A
-     * @param string $b
-     * @return ParagonIE_Sodium_Core32_Curve25519_Ge_P2
-     * @throws SodiumException
-     * @throws TypeError
-     * @psalm-suppress MixedArrayAccess
-     */
-    public static function ge_double_scalarmult_vartime(
-        $a,
-        ParagonIE_Sodium_Core32_Curve25519_Ge_P3 $A,
-        $b
-    ) {
-        /** @var array<int, ParagonIE_Sodium_Core32_Curve25519_Ge_Cached> $Ai */
-        $Ai = array();
-
-        static $Bi = array();
-        /** @var array<int, ParagonIE_Sodium_Core32_Curve25519_Ge_Precomp> $Bi */
-        if (!$Bi) {
-            for ($i = 0; $i < 8; ++$i) {
-                $Bi[$i] = new ParagonIE_Sodium_Core32_Curve25519_Ge_Precomp(
-                    ParagonIE_Sodium_Core32_Curve25519_Fe::fromArray(
-                        array(
-                            ParagonIE_Sodium_Core32_Int32::fromInt(self::$base2[$i][0][0]),
-                            ParagonIE_Sodium_Core32_Int32::fromInt(self::$base2[$i][0][1]),
-                            ParagonIE_Sodium_Core32_Int32::fromInt(self::$base2[$i][0][2]),
-                            ParagonIE_Sodium_Core32_Int32::fromInt(self::$base2[$i][0][3]),
-                            ParagonIE_Sodium_Core32_Int32::fromInt(self::$base2[$i][0][4]),
-                            ParagonIE_Sodium_Core32_Int32::fromInt(self::$base2[$i][0][5]),
-                            ParagonIE_Sodium_Core32_Int32::fromInt(self::$base2[$i][0][6]),
-                            ParagonIE_Sodium_Core32_Int32::fromInt(self::$base2[$i][0][7]),
-                            ParagonIE_Sodium_Core32_Int32::fromInt(self::$base2[$i][0][8]),
-                            ParagonIE_Sodium_Core32_Int32::fromInt(self::$base2[$i][0][9])
-                        )
-                    ),
-                    ParagonIE_Sodium_Core32_Curve25519_Fe::fromArray(
-                        array(
-                            ParagonIE_Sodium_Core32_Int32::fromInt(self::$base2[$i][1][0]),
-                            ParagonIE_Sodium_Core32_Int32::fromInt(self::$base2[$i][1][1]),
-                            ParagonIE_Sodium_Core32_Int32::fromInt(self::$base2[$i][1][2]),
-                            ParagonIE_Sodium_Core32_Int32::fromInt(self::$base2[$i][1][3]),
-                            ParagonIE_Sodium_Core32_Int32::fromInt(self::$base2[$i][1][4]),
-                            ParagonIE_Sodium_Core32_Int32::fromInt(self::$base2[$i][1][5]),
-                            ParagonIE_Sodium_Core32_Int32::fromInt(self::$base2[$i][1][6]),
-                            ParagonIE_Sodium_Core32_Int32::fromInt(self::$base2[$i][1][7]),
-                            ParagonIE_Sodium_Core32_Int32::fromInt(self::$base2[$i][1][8]),
-                            ParagonIE_Sodium_Core32_Int32::fromInt(self::$base2[$i][1][9])
-                        )
-                    ),
-                    ParagonIE_Sodium_Core32_Curve25519_Fe::fromArray(
-                        array(
-                            ParagonIE_Sodium_Core32_Int32::fromInt(self::$base2[$i][2][0]),
-                            ParagonIE_Sodium_Core32_Int32::fromInt(self::$base2[$i][2][1]),
-                            ParagonIE_Sodium_Core32_Int32::fromInt(self::$base2[$i][2][2]),
-                            ParagonIE_Sodium_Core32_Int32::fromInt(self::$base2[$i][2][3]),
-                            ParagonIE_Sodium_Core32_Int32::fromInt(self::$base2[$i][2][4]),
-                            ParagonIE_Sodium_Core32_Int32::fromInt(self::$base2[$i][2][5]),
-                            ParagonIE_Sodium_Core32_Int32::fromInt(self::$base2[$i][2][6]),
-                            ParagonIE_Sodium_Core32_Int32::fromInt(self::$base2[$i][2][7]),
-                            ParagonIE_Sodium_Core32_Int32::fromInt(self::$base2[$i][2][8]),
-                            ParagonIE_Sodium_Core32_Int32::fromInt(self::$base2[$i][2][9])
-                        )
-                    )
-                );
-            }
-        }
-
-        for ($i = 0; $i < 8; ++$i) {
-            $Ai[$i] = new ParagonIE_Sodium_Core32_Curve25519_Ge_Cached(
-                self::fe_0(),
-                self::fe_0(),
-                self::fe_0(),
-                self::fe_0()
-            );
-        }
-        /** @var array<int, ParagonIE_Sodium_Core32_Curve25519_Ge_Cached> $Ai */
-
-        # slide(aslide,a);
-        # slide(bslide,b);
-        /** @var array<int, int> $aslide */
-        $aslide = self::slide($a);
-        /** @var array<int, int> $bslide */
-        $bslide = self::slide($b);
-
-        # ge_p3_to_cached(&Ai[0],A);
-        # ge_p3_dbl(&t,A); ge_p1p1_to_p3(&A2,&t);
-        $Ai[0] = self::ge_p3_to_cached($A);
-        $t = self::ge_p3_dbl($A);
-        $A2 = self::ge_p1p1_to_p3($t);
-
-        # ge_add(&t,&A2,&Ai[0]); ge_p1p1_to_p3(&u,&t); ge_p3_to_cached(&Ai[1],&u);
-        # ge_add(&t,&A2,&Ai[1]); ge_p1p1_to_p3(&u,&t); ge_p3_to_cached(&Ai[2],&u);
-        # ge_add(&t,&A2,&Ai[2]); ge_p1p1_to_p3(&u,&t); ge_p3_to_cached(&Ai[3],&u);
-        # ge_add(&t,&A2,&Ai[3]); ge_p1p1_to_p3(&u,&t); ge_p3_to_cached(&Ai[4],&u);
-        # ge_add(&t,&A2,&Ai[4]); ge_p1p1_to_p3(&u,&t); ge_p3_to_cached(&Ai[5],&u);
-        # ge_add(&t,&A2,&Ai[5]); ge_p1p1_to_p3(&u,&t); ge_p3_to_cached(&Ai[6],&u);
-        # ge_add(&t,&A2,&Ai[6]); ge_p1p1_to_p3(&u,&t); ge_p3_to_cached(&Ai[7],&u);
-        for ($i = 0; $i < 7; ++$i) {
-            $t = self::ge_add($A2, $Ai[$i]);
-            $u = self::ge_p1p1_to_p3($t);
-            $Ai[$i + 1] = self::ge_p3_to_cached($u);
-        }
-
-        # ge_p2_0(r);
-        $r = self::ge_p2_0();
-
-        # for (i = 255;i >= 0;--i) {
-        #     if (aslide[i] || bslide[i]) break;
-        # }
-        $i = 255;
-        for (; $i >= 0; --$i) {
-            if ($aslide[$i] || $bslide[$i]) {
-                break;
-            }
-        }
-
-        # for (;i >= 0;--i) {
-        for (; $i >= 0; --$i) {
-            # ge_p2_dbl(&t,r);
-            $t = self::ge_p2_dbl($r);
-
-            # if (aslide[i] > 0) {
-            if ($aslide[$i] > 0) {
-                # ge_p1p1_to_p3(&u,&t);
-                # ge_add(&t,&u,&Ai[aslide[i]/2]);
-                $u = self::ge_p1p1_to_p3($t);
-                $t = self::ge_add(
-                    $u,
-                    $Ai[(int) floor($aslide[$i] / 2)]
-                );
-                # } else if (aslide[i] < 0) {
-            } elseif ($aslide[$i] < 0) {
-                # ge_p1p1_to_p3(&u,&t);
-                # ge_sub(&t,&u,&Ai[(-aslide[i])/2]);
-                $u = self::ge_p1p1_to_p3($t);
-                $t = self::ge_sub(
-                    $u,
-                    $Ai[(int) floor(-$aslide[$i] / 2)]
-                );
-            }
-            /** @var array<int, ParagonIE_Sodium_Core32_Curve25519_Ge_Precomp> $Bi */
-
-            # if (bslide[i] > 0) {
-            if ($bslide[$i] > 0) {
-                # ge_p1p1_to_p3(&u,&t);
-                # ge_madd(&t,&u,&Bi[bslide[i]/2]);
-                $u = self::ge_p1p1_to_p3($t);
-                /** @var int $index */
-                $index = (int) floor($bslide[$i] / 2);
-                /** @var ParagonIE_Sodium_Core32_Curve25519_Ge_Precomp $thisB */
-                $thisB = $Bi[$index];
-                $t = self::ge_madd($t, $u, $thisB);
-                # } else if (bslide[i] < 0) {
-            } elseif ($bslide[$i] < 0) {
-                # ge_p1p1_to_p3(&u,&t);
-                # ge_msub(&t,&u,&Bi[(-bslide[i])/2]);
-                $u = self::ge_p1p1_to_p3($t);
-
-                /** @var int $index */
-                $index = (int) floor(-$bslide[$i] / 2);
-
-                /** @var ParagonIE_Sodium_Core32_Curve25519_Ge_Precomp $thisB */
-                $thisB = $Bi[$index];
-                $t = self::ge_msub($t, $u, $thisB);
-            }
-            # ge_p1p1_to_p2(r,&t);
-            $r = self::ge_p1p1_to_p2($t);
-        }
-        return $r;
-    }
-
-    /**
-     * @internal You should not use this directly from another application
-     *
-     * @param string $a
-     * @return ParagonIE_Sodium_Core32_Curve25519_Ge_P3
-     * @psalm-suppress MixedAssignment
-     * @psalm-suppress MixedOperand
-     * @throws SodiumException
-     * @throws TypeError
-     */
-    public static function ge_scalarmult_base($a)
-    {
-        /** @var array<int, int> $e */
-        $e = array();
-        $r = new ParagonIE_Sodium_Core32_Curve25519_Ge_P1p1();
-
-        for ($i = 0; $i < 32; ++$i) {
-            /** @var int $dbl */
-            $dbl = (int) $i << 1;
-            $e[$dbl] = (int) self::chrToInt($a[$i]) & 15;
-            $e[$dbl + 1] = (int) (self::chrToInt($a[$i]) >> 4) & 15;
-        }
-
-        /** @var int $carry */
-        $carry = 0;
-        for ($i = 0; $i < 63; ++$i) {
-            $e[$i] += $carry;
-            $carry = $e[$i] + 8;
-            $carry >>= 4;
-            $e[$i] -= $carry << 4;
-        }
-
-        /** @var array<int, int> $e */
-        $e[63] += (int) $carry;
-
-        $h = self::ge_p3_0();
-
-        for ($i = 1; $i < 64; $i += 2) {
-            $t = self::ge_select((int) floor($i / 2), (int) $e[$i]);
-            $r = self::ge_madd($r, $h, $t);
-            $h = self::ge_p1p1_to_p3($r);
-        }
-
-        $r = self::ge_p3_dbl($h);
-
-        $s = self::ge_p1p1_to_p2($r);
-        $r = self::ge_p2_dbl($s);
-        $s = self::ge_p1p1_to_p2($r);
-        $r = self::ge_p2_dbl($s);
-        $s = self::ge_p1p1_to_p2($r);
-        $r = self::ge_p2_dbl($s);
-
-        $h = self::ge_p1p1_to_p3($r);
-
-        for ($i = 0; $i < 64; $i += 2) {
-            $t = self::ge_select($i >> 1, (int) $e[$i]);
-            $r = self::ge_madd($r, $h, $t);
-            $h = self::ge_p1p1_to_p3($r);
-        }
-        return $h;
-    }
-
-    /**
-     * Calculates (ab + c) mod l
-     * where l = 2^252 + 27742317777372353535851937790883648493
-     *
-     * @internal You should not use this directly from another application
-     *
-     * @param string $a
-     * @param string $b
-     * @param string $c
-     * @return string
-     * @throws SodiumException
-     * @throws TypeError
-     */
-    public static function sc_muladd($a, $b, $c)
-    {
-        $a0 = ParagonIE_Sodium_Core32_Int64::fromInt(2097151 & self::load_3(self::substr($a, 0, 3)));
-        $a1 = ParagonIE_Sodium_Core32_Int64::fromInt(2097151 & (self::load_4(self::substr($a, 2, 4)) >> 5));
-        $a2 = ParagonIE_Sodium_Core32_Int64::fromInt(2097151 & (self::load_3(self::substr($a, 5, 3)) >> 2));
-        $a3 = ParagonIE_Sodium_Core32_Int64::fromInt(2097151 & (self::load_4(self::substr($a, 7, 4)) >> 7));
-        $a4 = ParagonIE_Sodium_Core32_Int64::fromInt(2097151 & (self::load_4(self::substr($a, 10, 4)) >> 4));
-        $a5 = ParagonIE_Sodium_Core32_Int64::fromInt(2097151 & (self::load_3(self::substr($a, 13, 3)) >> 1));
-        $a6 = ParagonIE_Sodium_Core32_Int64::fromInt(2097151 & (self::load_4(self::substr($a, 15, 4)) >> 6));
-        $a7 = ParagonIE_Sodium_Core32_Int64::fromInt(2097151 & (self::load_3(self::substr($a, 18, 3)) >> 3));
-        $a8 = ParagonIE_Sodium_Core32_Int64::fromInt(2097151 & self::load_3(self::substr($a, 21, 3)));
-        $a9 = ParagonIE_Sodium_Core32_Int64::fromInt(2097151 & (self::load_4(self::substr($a, 23, 4)) >> 5));
-        $a10 = ParagonIE_Sodium_Core32_Int64::fromInt(2097151 & (self::load_3(self::substr($a, 26, 3)) >> 2));
-        $a11 = ParagonIE_Sodium_Core32_Int64::fromInt(0x1fffffff & (self::load_4(self::substr($a, 28, 4)) >> 7));
-        $b0 = ParagonIE_Sodium_Core32_Int64::fromInt(2097151 & self::load_3(self::substr($b, 0, 3)));
-        $b1 = ParagonIE_Sodium_Core32_Int64::fromInt(2097151 & (self::load_4(self::substr($b, 2, 4)) >> 5));
-        $b2 = ParagonIE_Sodium_Core32_Int64::fromInt(2097151 & (self::load_3(self::substr($b, 5, 3)) >> 2));
-        $b3 = ParagonIE_Sodium_Core32_Int64::fromInt(2097151 & (self::load_4(self::substr($b, 7, 4)) >> 7));
-        $b4 = ParagonIE_Sodium_Core32_Int64::fromInt(2097151 & (self::load_4(self::substr($b, 10, 4)) >> 4));
-        $b5 = ParagonIE_Sodium_Core32_Int64::fromInt(2097151 & (self::load_3(self::substr($b, 13, 3)) >> 1));
-        $b6 = ParagonIE_Sodium_Core32_Int64::fromInt(2097151 & (self::load_4(self::substr($b, 15, 4)) >> 6));
-        $b7 = ParagonIE_Sodium_Core32_Int64::fromInt(2097151 & (self::load_3(self::substr($b, 18, 3)) >> 3));
-        $b8 = ParagonIE_Sodium_Core32_Int64::fromInt(2097151 & self::load_3(self::substr($b, 21, 3)));
-        $b9 = ParagonIE_Sodium_Core32_Int64::fromInt(2097151 & (self::load_4(self::substr($b, 23, 4)) >> 5));
-        $b10 = ParagonIE_Sodium_Core32_Int64::fromInt(2097151 & (self::load_3(self::substr($b, 26, 3)) >> 2));
-        $b11 = ParagonIE_Sodium_Core32_Int64::fromInt(0x1fffffff & (self::load_4(self::substr($b, 28, 4)) >> 7));
-        $c0 = ParagonIE_Sodium_Core32_Int64::fromInt(2097151 & self::load_3(self::substr($c, 0, 3)));
-        $c1 = ParagonIE_Sodium_Core32_Int64::fromInt(2097151 & (self::load_4(self::substr($c, 2, 4)) >> 5));
-        $c2 = ParagonIE_Sodium_Core32_Int64::fromInt(2097151 & (self::load_3(self::substr($c, 5, 3)) >> 2));
-        $c3 = ParagonIE_Sodium_Core32_Int64::fromInt(2097151 & (self::load_4(self::substr($c, 7, 4)) >> 7));
-        $c4 = ParagonIE_Sodium_Core32_Int64::fromInt(2097151 & (self::load_4(self::substr($c, 10, 4)) >> 4));
-        $c5 = ParagonIE_Sodium_Core32_Int64::fromInt(2097151 & (self::load_3(self::substr($c, 13, 3)) >> 1));
-        $c6 = ParagonIE_Sodium_Core32_Int64::fromInt(2097151 & (self::load_4(self::substr($c, 15, 4)) >> 6));
-        $c7 = ParagonIE_Sodium_Core32_Int64::fromInt(2097151 & (self::load_3(self::substr($c, 18, 3)) >> 3));
-        $c8 = ParagonIE_Sodium_Core32_Int64::fromInt(2097151 & self::load_3(self::substr($c, 21, 3)));
-        $c9 = ParagonIE_Sodium_Core32_Int64::fromInt(2097151 & (self::load_4(self::substr($c, 23, 4)) >> 5));
-        $c10 = ParagonIE_Sodium_Core32_Int64::fromInt(2097151 & (self::load_3(self::substr($c, 26, 3)) >> 2));
-        $c11 = ParagonIE_Sodium_Core32_Int64::fromInt(0x1fffffff & (self::load_4(self::substr($c, 28, 4)) >> 7));
-
-        /* Can't really avoid the pyramid here: */
-        /**
-         * @var ParagonIE_Sodium_Core32_Int64 $s0
-         * @var ParagonIE_Sodium_Core32_Int64 $s1
-         * @var ParagonIE_Sodium_Core32_Int64 $s2
-         * @var ParagonIE_Sodium_Core32_Int64 $s3
-         * @var ParagonIE_Sodium_Core32_Int64 $s4
-         * @var ParagonIE_Sodium_Core32_Int64 $s5
-         * @var ParagonIE_Sodium_Core32_Int64 $s6
-         * @var ParagonIE_Sodium_Core32_Int64 $s7
-         * @var ParagonIE_Sodium_Core32_Int64 $s8
-         * @var ParagonIE_Sodium_Core32_Int64 $s9
-         * @var ParagonIE_Sodium_Core32_Int64 $s10
-         * @var ParagonIE_Sodium_Core32_Int64 $s11
-         * @var ParagonIE_Sodium_Core32_Int64 $s12
-         * @var ParagonIE_Sodium_Core32_Int64 $s13
-         * @var ParagonIE_Sodium_Core32_Int64 $s14
-         * @var ParagonIE_Sodium_Core32_Int64 $s15
-         * @var ParagonIE_Sodium_Core32_Int64 $s16
-         * @var ParagonIE_Sodium_Core32_Int64 $s17
-         * @var ParagonIE_Sodium_Core32_Int64 $s18
-         * @var ParagonIE_Sodium_Core32_Int64 $s19
-         * @var ParagonIE_Sodium_Core32_Int64 $s20
-         * @var ParagonIE_Sodium_Core32_Int64 $s21
-         * @var ParagonIE_Sodium_Core32_Int64 $s22
-         * @var ParagonIE_Sodium_Core32_Int64 $s23
-         */
-
-        $s0 = $c0->addInt64($a0->mulInt64($b0, 24));
-        $s1 = $c1->addInt64($a0->mulInt64($b1, 24))->addInt64($a1->mulInt64($b0, 24));
-        $s2 = $c2->addInt64($a0->mulInt64($b2, 24))->addInt64($a1->mulInt64($b1, 24))->addInt64($a2->mulInt64($b0, 24));
-        $s3 = $c3->addInt64($a0->mulInt64($b3, 24))->addInt64($a1->mulInt64($b2, 24))->addInt64($a2->mulInt64($b1, 24))
-                 ->addInt64($a3->mulInt64($b0, 24));
-        $s4 = $c4->addInt64($a0->mulInt64($b4, 24))->addInt64($a1->mulInt64($b3, 24))->addInt64($a2->mulInt64($b2, 24))
-                 ->addInt64($a3->mulInt64($b1, 24))->addInt64($a4->mulInt64($b0, 24));
-        $s5 = $c5->addInt64($a0->mulInt64($b5, 24))->addInt64($a1->mulInt64($b4, 24))->addInt64($a2->mulInt64($b3, 24))
-                 ->addInt64($a3->mulInt64($b2, 24))->addInt64($a4->mulInt64($b1, 24))->addInt64($a5->mulInt64($b0, 24));
-        $s6 = $c6->addInt64($a0->mulInt64($b6, 24))->addInt64($a1->mulInt64($b5, 24))->addInt64($a2->mulInt64($b4, 24))
-                 ->addInt64($a3->mulInt64($b3, 24))->addInt64($a4->mulInt64($b2, 24))->addInt64($a5->mulInt64($b1, 24))
-                 ->addInt64($a6->mulInt64($b0, 24));
-        $s7 = $c7->addInt64($a0->mulInt64($b7, 24))->addInt64($a1->mulInt64($b6, 24))->addInt64($a2->mulInt64($b5, 24))
-                 ->addInt64($a3->mulInt64($b4, 24))->addInt64($a4->mulInt64($b3, 24))->addInt64($a5->mulInt64($b2, 24))
-                 ->addInt64($a6->mulInt64($b1, 24))->addInt64($a7->mulInt64($b0, 24));
-        $s8 = $c8->addInt64($a0->mulInt64($b8, 24))->addInt64($a1->mulInt64($b7, 24))->addInt64($a2->mulInt64($b6, 24))
-                 ->addInt64($a3->mulInt64($b5, 24))->addInt64($a4->mulInt64($b4, 24))->addInt64($a5->mulInt64($b3, 24))
-                 ->addInt64($a6->mulInt64($b2, 24))->addInt64($a7->mulInt64($b1, 24))->addInt64($a8->mulInt64($b0, 24));
-        $s9 = $c9->addInt64($a0->mulInt64($b9, 24))->addInt64($a1->mulInt64($b8, 24))->addInt64($a2->mulInt64($b7, 24))
-                 ->addInt64($a3->mulInt64($b6, 24))->addInt64($a4->mulInt64($b5, 24))->addInt64($a5->mulInt64($b4, 24))
-                 ->addInt64($a6->mulInt64($b3, 24))->addInt64($a7->mulInt64($b2, 24))->addInt64($a8->mulInt64($b1, 24))
-                 ->addInt64($a9->mulInt64($b0, 24));
-        $s10 = $c10->addInt64($a0->mulInt64($b10, 24))->addInt64($a1->mulInt64($b9, 24))->addInt64($a2->mulInt64($b8, 24))
-                   ->addInt64($a3->mulInt64($b7, 24))->addInt64($a4->mulInt64($b6, 24))->addInt64($a5->mulInt64($b5, 24))
-                   ->addInt64($a6->mulInt64($b4, 24))->addInt64($a7->mulInt64($b3, 24))->addInt64($a8->mulInt64($b2, 24))
-                   ->addInt64($a9->mulInt64($b1, 24))->addInt64($a10->mulInt64($b0, 24));
-        $s11 = $c11->addInt64($a0->mulInt64($b11, 24))->addInt64($a1->mulInt64($b10, 24))->addInt64($a2->mulInt64($b9, 24))
-                   ->addInt64($a3->mulInt64($b8, 24))->addInt64($a4->mulInt64($b7, 24))->addInt64($a5->mulInt64($b6, 24))
-                   ->addInt64($a6->mulInt64($b5, 24))->addInt64($a7->mulInt64($b4, 24))->addInt64($a8->mulInt64($b3, 24))
-                   ->addInt64($a9->mulInt64($b2, 24))->addInt64($a10->mulInt64($b1, 24))->addInt64($a11->mulInt64($b0, 24));
-        $s12 = $a1->mulInt64($b11, 24)->addInt64($a2->mulInt64($b10, 24))->addInt64($a3->mulInt64($b9, 24))
-                  ->addInt64($a4->mulInt64($b8, 24))->addInt64($a5->mulInt64($b7, 24))->addInt64($a6->mulInt64($b6, 24))
-                  ->addInt64($a7->mulInt64($b5, 24))->addInt64($a8->mulInt64($b4, 24))->addInt64($a9->mulInt64($b3, 24))
-                  ->addInt64($a10->mulInt64($b2, 24))->addInt64($a11->mulInt64($b1, 24));
-        $s13 = $a2->mulInt64($b11, 24)->addInt64($a3->mulInt64($b10, 24))->addInt64($a4->mulInt64($b9, 24))
-                  ->addInt64($a5->mulInt64($b8, 24))->addInt64($a6->mulInt64($b7, 24))->addInt64($a7->mulInt64($b6, 24))
-                  ->addInt64($a8->mulInt64($b5, 24))->addInt64($a9->mulInt64($b4, 24))->addInt64($a10->mulInt64($b3, 24))
-                  ->addInt64($a11->mulInt64($b2, 24));
-        $s14 = $a3->mulInt64($b11, 24)->addInt64($a4->mulInt64($b10, 24))->addInt64($a5->mulInt64($b9, 24))
-                  ->addInt64($a6->mulInt64($b8, 24))->addInt64($a7->mulInt64($b7, 24))->addInt64($a8->mulInt64($b6, 24))
-                  ->addInt64($a9->mulInt64($b5, 24))->addInt64($a10->mulInt64($b4, 24))->addInt64($a11->mulInt64($b3, 24));
-        $s15 = $a4->mulInt64($b11, 24)->addInt64($a5->mulInt64($b10, 24))->addInt64($a6->mulInt64($b9, 24))
-                  ->addInt64($a7->mulInt64($b8, 24))->addInt64($a8->mulInt64($b7, 24))->addInt64($a9->mulInt64($b6, 24))
-                  ->addInt64($a10->mulInt64($b5, 24))->addInt64($a11->mulInt64($b4, 24));
-        $s16 = $a5->mulInt64($b11, 24)->addInt64($a6->mulInt64($b10, 24))->addInt64($a7->mulInt64($b9, 24))
-                  ->addInt64($a8->mulInt64($b8, 24))->addInt64($a9->mulInt64($b7, 24))->addInt64($a10->mulInt64($b6, 24))
-                  ->addInt64($a11->mulInt64($b5, 24));
-        $s17 = $a6->mulInt64($b11, 24)->addInt64($a7->mulInt64($b10, 24))->addInt64($a8->mulInt64($b9, 24))
-                  ->addInt64($a9->mulInt64($b8, 24))->addInt64($a10->mulInt64($b7, 24))->addInt64($a11->mulInt64($b6, 24));
-        $s18 = $a7->mulInt64($b11, 24)->addInt64($a8->mulInt64($b10, 24))->addInt64($a9->mulInt64($b9, 24))
-                  ->addInt64($a10->mulInt64($b8, 24))->addInt64($a11->mulInt64($b7, 24));
-        $s19 = $a8->mulInt64($b11, 24)->addInt64($a9->mulInt64($b10, 24))->addInt64($a10->mulInt64($b9, 24))
-                  ->addInt64($a11->mulInt64($b8, 24));
-        $s20 = $a9->mulInt64($b11, 24)->addInt64($a10->mulInt64($b10, 24))->addInt64($a11->mulInt64($b9, 24));
-        $s21 = $a10->mulInt64($b11, 24)->addInt64($a11->mulInt64($b10, 24));
-        $s22 = $a11->mulInt64($b11, 24);
-        $s23 = new ParagonIE_Sodium_Core32_Int64();
-
-        $carry0 = $s0->addInt(1 << 20)->shiftRight(21);
-        $s1 = $s1->addInt64($carry0);
-        $s0 = $s0->subInt64($carry0->shiftLeft(21));
-        $carry2 = $s2->addInt(1 << 20)->shiftRight(21);
-        $s3 = $s3->addInt64($carry2);
-        $s2 = $s2->subInt64($carry2->shiftLeft(21));
-        $carry4 = $s4->addInt(1 << 20)->shiftRight(21);
-        $s5 = $s5->addInt64($carry4);
-        $s4 = $s4->subInt64($carry4->shiftLeft(21));
-        $carry6 = $s6->addInt(1 << 20)->shiftRight(21);
-        $s7 = $s7->addInt64($carry6);
-        $s6 = $s6->subInt64($carry6->shiftLeft(21));
-        $carry8 = $s8->addInt(1 << 20)->shiftRight(21);
-        $s9 = $s9->addInt64($carry8);
-        $s8 = $s8->subInt64($carry8->shiftLeft(21));
-        $carry10 = $s10->addInt(1 << 20)->shiftRight(21);
-        $s11 = $s11->addInt64($carry10);
-        $s10 = $s10->subInt64($carry10->shiftLeft(21));
-        $carry12 = $s12->addInt(1 << 20)->shiftRight(21);
-        $s13 = $s13->addInt64($carry12);
-        $s12 = $s12->subInt64($carry12->shiftLeft(21));
-        $carry14 = $s14->addInt(1 << 20)->shiftRight(21);
-        $s15 = $s15->addInt64($carry14);
-        $s14 = $s14->subInt64($carry14->shiftLeft(21));
-        $carry16 = $s16->addInt(1 << 20)->shiftRight(21);
-        $s17 = $s17->addInt64($carry16);
-        $s16 = $s16->subInt64($carry16->shiftLeft(21));
-        $carry18 = $s18->addInt(1 << 20)->shiftRight(21);
-        $s19 = $s19->addInt64($carry18);
-        $s18 = $s18->subInt64($carry18->shiftLeft(21));
-        $carry20 = $s20->addInt(1 << 20)->shiftRight(21);
-        $s21 = $s21->addInt64($carry20);
-        $s20 = $s20->subInt64($carry20->shiftLeft(21));
-        $carry22 = $s22->addInt(1 << 20)->shiftRight(21);
-        $s23 = $s23->addInt64($carry22);
-        $s22 = $s22->subInt64($carry22->shiftLeft(21));
-
-        $carry1 = $s1->addInt(1 << 20)->shiftRight(21);
-        $s2 = $s2->addInt64($carry1);
-        $s1 = $s1->subInt64($carry1->shiftLeft(21));
-        $carry3 = $s3->addInt(1 << 20)->shiftRight(21);
-        $s4 = $s4->addInt64($carry3);
-        $s3 = $s3->subInt64($carry3->shiftLeft(21));
-        $carry5 = $s5->addInt(1 << 20)->shiftRight(21);
-        $s6 = $s6->addInt64($carry5);
-        $s5 = $s5->subInt64($carry5->shiftLeft(21));
-        $carry7 = $s7->addInt(1 << 20)->shiftRight(21);
-        $s8 = $s8->addInt64($carry7);
-        $s7 = $s7->subInt64($carry7->shiftLeft(21));
-        $carry9 = $s9->addInt(1 << 20)->shiftRight(21);
-        $s10 = $s10->addInt64($carry9);
-        $s9 = $s9->subInt64($carry9->shiftLeft(21));
-        $carry11 = $s11->addInt(1 << 20)->shiftRight(21);
-        $s12 = $s12->addInt64($carry11);
-        $s11 = $s11->subInt64($carry11->shiftLeft(21));
-        $carry13 = $s13->addInt(1 << 20)->shiftRight(21);
-        $s14 = $s14->addInt64($carry13);
-        $s13 = $s13->subInt64($carry13->shiftLeft(21));
-        $carry15 = $s15->addInt(1 << 20)->shiftRight(21);
-        $s16 = $s16->addInt64($carry15);
-        $s15 = $s15->subInt64($carry15->shiftLeft(21));
-        $carry17 = $s17->addInt(1 << 20)->shiftRight(21);
-        $s18 = $s18->addInt64($carry17);
-        $s17 = $s17->subInt64($carry17->shiftLeft(21));
-        $carry19 = $s19->addInt(1 << 20)->shiftRight(21);
-        $s20 = $s20->addInt64($carry19);
-        $s19 = $s19->subInt64($carry19->shiftLeft(21));
-        $carry21 = $s21->addInt(1 << 20)->shiftRight(21);
-        $s22 = $s22->addInt64($carry21);
-        $s21 = $s21->subInt64($carry21->shiftLeft(21));
-
-        $s11 = $s11->addInt64($s23->mulInt(666643, 20));
-        $s12 = $s12->addInt64($s23->mulInt(470296, 19));
-        $s13 = $s13->addInt64($s23->mulInt(654183, 20));
-        $s14 = $s14->subInt64($s23->mulInt(997805, 20));
-        $s15 = $s15->addInt64($s23->mulInt(136657, 18));
-        $s16 = $s16->subInt64($s23->mulInt(683901, 20));
-
-        $s10 = $s10->addInt64($s22->mulInt(666643, 20));
-        $s11 = $s11->addInt64($s22->mulInt(470296, 19));
-        $s12 = $s12->addInt64($s22->mulInt(654183, 20));
-        $s13 = $s13->subInt64($s22->mulInt(997805, 20));
-        $s14 = $s14->addInt64($s22->mulInt(136657, 18));
-        $s15 = $s15->subInt64($s22->mulInt(683901, 20));
-
-        $s9  =  $s9->addInt64($s21->mulInt(666643, 20));
-        $s10 = $s10->addInt64($s21->mulInt(470296, 19));
-        $s11 = $s11->addInt64($s21->mulInt(654183, 20));
-        $s12 = $s12->subInt64($s21->mulInt(997805, 20));
-        $s13 = $s13->addInt64($s21->mulInt(136657, 18));
-        $s14 = $s14->subInt64($s21->mulInt(683901, 20));
-
-        $s8  =  $s8->addInt64($s20->mulInt(666643, 20));
-        $s9  =  $s9->addInt64($s20->mulInt(470296, 19));
-        $s10 = $s10->addInt64($s20->mulInt(654183, 20));
-        $s11 = $s11->subInt64($s20->mulInt(997805, 20));
-        $s12 = $s12->addInt64($s20->mulInt(136657, 18));
-        $s13 = $s13->subInt64($s20->mulInt(683901, 20));
-
-        $s7  =  $s7->addInt64($s19->mulInt(666643, 20));
-        $s8  =  $s8->addInt64($s19->mulInt(470296, 19));
-        $s9  =  $s9->addInt64($s19->mulInt(654183, 20));
-        $s10 = $s10->subInt64($s19->mulInt(997805, 20));
-        $s11 = $s11->addInt64($s19->mulInt(136657, 18));
-        $s12 = $s12->subInt64($s19->mulInt(683901, 20));
-
-        $s6  =  $s6->addInt64($s18->mulInt(666643, 20));
-        $s7  =  $s7->addInt64($s18->mulInt(470296, 19));
-        $s8  =  $s8->addInt64($s18->mulInt(654183, 20));
-        $s9  =  $s9->subInt64($s18->mulInt(997805, 20));
-        $s10 = $s10->addInt64($s18->mulInt(136657, 18));
-        $s11 = $s11->subInt64($s18->mulInt(683901, 20));
-
-        $carry6 = $s6->addInt(1 << 20)->shiftRight(21);
-        $s7 = $s7->addInt64($carry6);
-        $s6 = $s6->subInt64($carry6->shiftLeft(21));
-        $carry8 = $s8->addInt(1 << 20)->shiftRight(21);
-        $s9 = $s9->addInt64($carry8);
-        $s8 = $s8->subInt64($carry8->shiftLeft(21));
-        $carry10 = $s10->addInt(1 << 20)->shiftRight(21);
-        $s11 = $s11->addInt64($carry10);
-        $s10 = $s10->subInt64($carry10->shiftLeft(21));
-        $carry12 = $s12->addInt(1 << 20)->shiftRight(21);
-        $s13 = $s13->addInt64($carry12);
-        $s12 = $s12->subInt64($carry12->shiftLeft(21));
-        $carry14 = $s14->addInt(1 << 20)->shiftRight(21);
-        $s15 = $s15->addInt64($carry14);
-        $s14 = $s14->subInt64($carry14->shiftLeft(21));
-        $carry16 = $s16->addInt(1 << 20)->shiftRight(21);
-        $s17 = $s17->addInt64($carry16);
-        $s16 = $s16->subInt64($carry16->shiftLeft(21));
-
-        $carry7 = $s7->addInt(1 << 20)->shiftRight(21);
-        $s8 = $s8->addInt64($carry7);
-        $s7 = $s7->subInt64($carry7->shiftLeft(21));
-        $carry9 = $s9->addInt(1 << 20)->shiftRight(21);
-        $s10 = $s10->addInt64($carry9);
-        $s9 = $s9->subInt64($carry9->shiftLeft(21));
-        $carry11 = $s11->addInt(1 << 20)->shiftRight(21);
-        $s12 = $s12->addInt64($carry11);
-        $s11 = $s11->subInt64($carry11->shiftLeft(21));
-        $carry13 = $s13->addInt(1 << 20)->shiftRight(21);
-        $s14 = $s14->addInt64($carry13);
-        $s13 = $s13->subInt64($carry13->shiftLeft(21));
-        $carry15 = $s15->addInt(1 << 20)->shiftRight(21);
-        $s16 = $s16->addInt64($carry15);
-        $s15 = $s15->subInt64($carry15->shiftLeft(21));
-
-        $s5  =  $s5->addInt64($s17->mulInt(666643, 20));
-        $s6  =  $s6->addInt64($s17->mulInt(470296, 19));
-        $s7  =  $s7->addInt64($s17->mulInt(654183, 20));
-        $s8  =  $s8->subInt64($s17->mulInt(997805, 20));
-        $s9  =  $s9->addInt64($s17->mulInt(136657, 18));
-        $s10 = $s10->subInt64($s17->mulInt(683901, 20));
-
-        $s4  =  $s4->addInt64($s16->mulInt(666643, 20));
-        $s5  =  $s5->addInt64($s16->mulInt(470296, 19));
-        $s6  =  $s6->addInt64($s16->mulInt(654183, 20));
-        $s7  =  $s7->subInt64($s16->mulInt(997805, 20));
-        $s8  =  $s8->addInt64($s16->mulInt(136657, 18));
-        $s9  =  $s9->subInt64($s16->mulInt(683901, 20));
-
-        $s3  =  $s3->addInt64($s15->mulInt(666643, 20));
-        $s4  =  $s4->addInt64($s15->mulInt(470296, 19));
-        $s5  =  $s5->addInt64($s15->mulInt(654183, 20));
-        $s6  =  $s6->subInt64($s15->mulInt(997805, 20));
-        $s7  =  $s7->addInt64($s15->mulInt(136657, 18));
-        $s8  =  $s8->subInt64($s15->mulInt(683901, 20));
-
-        $s2  =  $s2->addInt64($s14->mulInt(666643, 20));
-        $s3  =  $s3->addInt64($s14->mulInt(470296, 19));
-        $s4  =  $s4->addInt64($s14->mulInt(654183, 20));
-        $s5  =  $s5->subInt64($s14->mulInt(997805, 20));
-        $s6  =  $s6->addInt64($s14->mulInt(136657, 18));
-        $s7  =  $s7->subInt64($s14->mulInt(683901, 20));
-
-        $s1  =  $s1->addInt64($s13->mulInt(666643, 20));
-        $s2  =  $s2->addInt64($s13->mulInt(470296, 19));
-        $s3  =  $s3->addInt64($s13->mulInt(654183, 20));
-        $s4  =  $s4->subInt64($s13->mulInt(997805, 20));
-        $s5  =  $s5->addInt64($s13->mulInt(136657, 18));
-        $s6  =  $s6->subInt64($s13->mulInt(683901, 20));
-
-        $s0  =  $s0->addInt64($s12->mulInt(666643, 20));
-        $s1  =  $s1->addInt64($s12->mulInt(470296, 19));
-        $s2  =  $s2->addInt64($s12->mulInt(654183, 20));
-        $s3  =  $s3->subInt64($s12->mulInt(997805, 20));
-        $s4  =  $s4->addInt64($s12->mulInt(136657, 18));
-        $s5  =  $s5->subInt64($s12->mulInt(683901, 20));
-        $s12 = new ParagonIE_Sodium_Core32_Int64();
-
-        $carry0 = $s0->addInt(1 << 20)->shiftRight(21);
-        $s1 = $s1->addInt64($carry0);
-        $s0 = $s0->subInt64($carry0->shiftLeft(21));
-        $carry2 = $s2->addInt(1 << 20)->shiftRight(21);
-        $s3 = $s3->addInt64($carry2);
-        $s2 = $s2->subInt64($carry2->shiftLeft(21));
-        $carry4 = $s4->addInt(1 << 20)->shiftRight(21);
-        $s5 = $s5->addInt64($carry4);
-        $s4 = $s4->subInt64($carry4->shiftLeft(21));
-        $carry6 = $s6->addInt(1 << 20)->shiftRight(21);
-        $s7 = $s7->addInt64($carry6);
-        $s6 = $s6->subInt64($carry6->shiftLeft(21));
-        $carry8 = $s8->addInt(1 << 20)->shiftRight(21);
-        $s9 = $s9->addInt64($carry8);
-        $s8 = $s8->subInt64($carry8->shiftLeft(21));
-        $carry10 = $s10->addInt(1 << 20)->shiftRight(21);
-        $s11 = $s11->addInt64($carry10);
-        $s10 = $s10->subInt64($carry10->shiftLeft(21));
-
-        $carry1 = $s1->addInt(1 << 20)->shiftRight(21);
-        $s2 = $s2->addInt64($carry1);
-        $s1 = $s1->subInt64($carry1->shiftLeft(21));
-        $carry3 = $s3->addInt(1 << 20)->shiftRight(21);
-        $s4 = $s4->addInt64($carry3);
-        $s3 = $s3->subInt64($carry3->shiftLeft(21));
-        $carry5 = $s5->addInt(1 << 20)->shiftRight(21);
-        $s6 = $s6->addInt64($carry5);
-        $s5 = $s5->subInt64($carry5->shiftLeft(21));
-        $carry7 = $s7->addInt(1 << 20)->shiftRight(21);
-        $s8 = $s8->addInt64($carry7);
-        $s7 = $s7->subInt64($carry7->shiftLeft(21));
-        $carry9 = $s9->addInt(1 << 20)->shiftRight(21);
-        $s10 = $s10->addInt64($carry9);
-        $s9 = $s9->subInt64($carry9->shiftLeft(21));
-        $carry11 = $s11->addInt(1 << 20)->shiftRight(21);
-        $s12 = $s12->addInt64($carry11);
-        $s11 = $s11->subInt64($carry11->shiftLeft(21));
-
-        $s0  =  $s0->addInt64($s12->mulInt(666643, 20));
-        $s1  =  $s1->addInt64($s12->mulInt(470296, 19));
-        $s2  =  $s2->addInt64($s12->mulInt(654183, 20));
-        $s3  =  $s3->subInt64($s12->mulInt(997805, 20));
-        $s4  =  $s4->addInt64($s12->mulInt(136657, 18));
-        $s5  =  $s5->subInt64($s12->mulInt(683901, 20));
-        $s12 = new ParagonIE_Sodium_Core32_Int64();
-
-        $carry0 = $s0->shiftRight(21);
-        $s1 = $s1->addInt64($carry0);
-        $s0 = $s0->subInt64($carry0->shiftLeft(21));
-        $carry1 = $s1->shiftRight(21);
-        $s2 = $s2->addInt64($carry1);
-        $s1 = $s1->subInt64($carry1->shiftLeft(21));
-        $carry2 = $s2->shiftRight(21);
-        $s3 = $s3->addInt64($carry2);
-        $s2 = $s2->subInt64($carry2->shiftLeft(21));
-        $carry3 = $s3->shiftRight(21);
-        $s4 = $s4->addInt64($carry3);
-        $s3 = $s3->subInt64($carry3->shiftLeft(21));
-        $carry4 = $s4->shiftRight(21);
-        $s5 = $s5->addInt64($carry4);
-        $s4 = $s4->subInt64($carry4->shiftLeft(21));
-        $carry5 = $s5->shiftRight(21);
-        $s6 = $s6->addInt64($carry5);
-        $s5 = $s5->subInt64($carry5->shiftLeft(21));
-        $carry6 = $s6->shiftRight(21);
-        $s7 = $s7->addInt64($carry6);
-        $s6 = $s6->subInt64($carry6->shiftLeft(21));
-        $carry7 = $s7->shiftRight(21);
-        $s8 = $s8->addInt64($carry7);
-        $s7 = $s7->subInt64($carry7->shiftLeft(21));
-        $carry8 = $s8->shiftRight(21);
-        $s9 = $s9->addInt64($carry8);
-        $s8 = $s8->subInt64($carry8->shiftLeft(21));
-        $carry9 = $s9->shiftRight(21);
-        $s10 = $s10->addInt64($carry9);
-        $s9 = $s9->subInt64($carry9->shiftLeft(21));
-        $carry10 = $s10->shiftRight(21);
-        $s11 = $s11->addInt64($carry10);
-        $s10 = $s10->subInt64($carry10->shiftLeft(21));
-        $carry11 = $s11->shiftRight(21);
-        $s12 = $s12->addInt64($carry11);
-        $s11 = $s11->subInt64($carry11->shiftLeft(21));
-
-        $s0  =  $s0->addInt64($s12->mulInt(666643, 20));
-        $s1  =  $s1->addInt64($s12->mulInt(470296, 19));
-        $s2  =  $s2->addInt64($s12->mulInt(654183, 20));
-        $s3  =  $s3->subInt64($s12->mulInt(997805, 20));
-        $s4  =  $s4->addInt64($s12->mulInt(136657, 18));
-        $s5  =  $s5->subInt64($s12->mulInt(683901, 20));
-
-        $carry0 = $s0->shiftRight(21);
-        $s1 = $s1->addInt64($carry0);
-        $s0 = $s0->subInt64($carry0->shiftLeft(21));
-        $carry1 = $s1->shiftRight(21);
-        $s2 = $s2->addInt64($carry1);
-        $s1 = $s1->subInt64($carry1->shiftLeft(21));
-        $carry2 = $s2->shiftRight(21);
-        $s3 = $s3->addInt64($carry2);
-        $s2 = $s2->subInt64($carry2->shiftLeft(21));
-        $carry3 = $s3->shiftRight(21);
-        $s4 = $s4->addInt64($carry3);
-        $s3 = $s3->subInt64($carry3->shiftLeft(21));
-        $carry4 = $s4->shiftRight(21);
-        $s5 = $s5->addInt64($carry4);
-        $s4 = $s4->subInt64($carry4->shiftLeft(21));
-        $carry5 = $s5->shiftRight(21);
-        $s6 = $s6->addInt64($carry5);
-        $s5 = $s5->subInt64($carry5->shiftLeft(21));
-        $carry6 = $s6->shiftRight(21);
-        $s7 = $s7->addInt64($carry6);
-        $s6 = $s6->subInt64($carry6->shiftLeft(21));
-        $carry7 = $s7->shiftRight(21);
-        $s8 = $s8->addInt64($carry7);
-        $s7 = $s7->subInt64($carry7->shiftLeft(21));
-        $carry8 = $s10->shiftRight(21);
-        $s9 = $s9->addInt64($carry8);
-        $s8 = $s8->subInt64($carry8->shiftLeft(21));
-        $carry9 = $s9->shiftRight(21);
-        $s10 = $s10->addInt64($carry9);
-        $s9 = $s9->subInt64($carry9->shiftLeft(21));
-        $carry10 = $s10->shiftRight(21);
-        $s11 = $s11->addInt64($carry10);
-        $s10 = $s10->subInt64($carry10->shiftLeft(21));
-
-        $S0  =  $s0->toInt();
-        $S1  =  $s1->toInt();
-        $S2  =  $s2->toInt();
-        $S3  =  $s3->toInt();
-        $S4  =  $s4->toInt();
-        $S5  =  $s5->toInt();
-        $S6  =  $s6->toInt();
-        $S7  =  $s7->toInt();
-        $S8  =  $s8->toInt();
-        $S9  =  $s9->toInt();
-        $S10 = $s10->toInt();
-        $S11 = $s11->toInt();
-
-        /**
-         * @var array<int, int>
-         */
-        $arr = array(
-            (int) (0xff & ($S0 >> 0)),
-            (int) (0xff & ($S0 >> 8)),
-            (int) (0xff & (($S0 >> 16) | ($S1 << 5))),
-            (int) (0xff & ($S1 >> 3)),
-            (int) (0xff & ($S1 >> 11)),
-            (int) (0xff & (($S1 >> 19) | ($S2 << 2))),
-            (int) (0xff & ($S2 >> 6)),
-            (int) (0xff & (($S2 >> 14) | ($S3 << 7))),
-            (int) (0xff & ($S3 >> 1)),
-            (int) (0xff & ($S3 >> 9)),
-            (int) (0xff & (($S3 >> 17) | ($S4 << 4))),
-            (int) (0xff & ($S4 >> 4)),
-            (int) (0xff & ($S4 >> 12)),
-            (int) (0xff & (($S4 >> 20) | ($S5 << 1))),
-            (int) (0xff & ($S5 >> 7)),
-            (int) (0xff & (($S5 >> 15) | ($S6 << 6))),
-            (int) (0xff & ($S6 >> 2)),
-            (int) (0xff & ($S6 >> 10)),
-            (int) (0xff & (($S6 >> 18) | ($S7 << 3))),
-            (int) (0xff & ($S7 >> 5)),
-            (int) (0xff & ($S7 >> 13)),
-            (int) (0xff & ($S8 >> 0)),
-            (int) (0xff & ($S8 >> 8)),
-            (int) (0xff & (($S8 >> 16) | ($S9 << 5))),
-            (int) (0xff & ($S9 >> 3)),
-            (int) (0xff & ($S9 >> 11)),
-            (int) (0xff & (($S9 >> 19) | ($S10 << 2))),
-            (int) (0xff & ($S10 >> 6)),
-            (int) (0xff & (($S10 >> 14) | ($S11 << 7))),
-            (int) (0xff & ($S11 >> 1)),
-            (int) (0xff & ($S11 >> 9)),
-            (int) (0xff & ($S11 >> 17))
-        );
-        return self::intArrayToString($arr);
-    }
-
-    /**
-     * @internal You should not use this directly from another application
-     *
-     * @param string $s
-     * @return string
-     * @throws SodiumException
-     * @throws TypeError
-     */
-    public static function sc_reduce($s)
-    {
-        /**
-         * @var ParagonIE_Sodium_Core32_Int64 $s0
-         * @var ParagonIE_Sodium_Core32_Int64 $s1
-         * @var ParagonIE_Sodium_Core32_Int64 $s2
-         * @var ParagonIE_Sodium_Core32_Int64 $s3
-         * @var ParagonIE_Sodium_Core32_Int64 $s4
-         * @var ParagonIE_Sodium_Core32_Int64 $s5
-         * @var ParagonIE_Sodium_Core32_Int64 $s6
-         * @var ParagonIE_Sodium_Core32_Int64 $s7
-         * @var ParagonIE_Sodium_Core32_Int64 $s8
-         * @var ParagonIE_Sodium_Core32_Int64 $s9
-         * @var ParagonIE_Sodium_Core32_Int64 $s10
-         * @var ParagonIE_Sodium_Core32_Int64 $s11
-         * @var ParagonIE_Sodium_Core32_Int64 $s12
-         * @var ParagonIE_Sodium_Core32_Int64 $s13
-         * @var ParagonIE_Sodium_Core32_Int64 $s14
-         * @var ParagonIE_Sodium_Core32_Int64 $s15
-         * @var ParagonIE_Sodium_Core32_Int64 $s16
-         * @var ParagonIE_Sodium_Core32_Int64 $s17
-         * @var ParagonIE_Sodium_Core32_Int64 $s18
-         * @var ParagonIE_Sodium_Core32_Int64 $s19
-         * @var ParagonIE_Sodium_Core32_Int64 $s20
-         * @var ParagonIE_Sodium_Core32_Int64 $s21
-         * @var ParagonIE_Sodium_Core32_Int64 $s22
-         * @var ParagonIE_Sodium_Core32_Int64 $s23
-         */
-        $s0 = ParagonIE_Sodium_Core32_Int64::fromInt(2097151 & self::load_3(self::substr($s, 0, 3)));
-        $s1 = ParagonIE_Sodium_Core32_Int64::fromInt(2097151 & (self::load_4(self::substr($s, 2, 4)) >> 5));
-        $s2 = ParagonIE_Sodium_Core32_Int64::fromInt(2097151 & (self::load_3(self::substr($s, 5, 3)) >> 2));
-        $s3 = ParagonIE_Sodium_Core32_Int64::fromInt(2097151 & (self::load_4(self::substr($s, 7, 4)) >> 7));
-        $s4 = ParagonIE_Sodium_Core32_Int64::fromInt(2097151 & (self::load_4(self::substr($s, 10, 4)) >> 4));
-        $s5 = ParagonIE_Sodium_Core32_Int64::fromInt(2097151 & (self::load_3(self::substr($s, 13, 3)) >> 1));
-        $s6 = ParagonIE_Sodium_Core32_Int64::fromInt(2097151 & (self::load_4(self::substr($s, 15, 4)) >> 6));
-        $s7 = ParagonIE_Sodium_Core32_Int64::fromInt(2097151 & (self::load_3(self::substr($s, 18, 4)) >> 3));
-        $s8 = ParagonIE_Sodium_Core32_Int64::fromInt(2097151 & self::load_3(self::substr($s, 21, 3)));
-        $s9 = ParagonIE_Sodium_Core32_Int64::fromInt(2097151 & (self::load_4(self::substr($s, 23, 4)) >> 5));
-        $s10 = ParagonIE_Sodium_Core32_Int64::fromInt(2097151 & (self::load_3(self::substr($s, 26, 3)) >> 2));
-        $s11 = ParagonIE_Sodium_Core32_Int64::fromInt(2097151 & (self::load_4(self::substr($s, 28, 4)) >> 7));
-        $s12 = ParagonIE_Sodium_Core32_Int64::fromInt(2097151 & (self::load_4(self::substr($s, 31, 4)) >> 4));
-        $s13 = ParagonIE_Sodium_Core32_Int64::fromInt(2097151 & (self::load_3(self::substr($s, 34, 3)) >> 1));
-        $s14 = ParagonIE_Sodium_Core32_Int64::fromInt(2097151 & (self::load_4(self::substr($s, 36, 4)) >> 6));
-        $s15 = ParagonIE_Sodium_Core32_Int64::fromInt(2097151 & (self::load_3(self::substr($s, 39, 4)) >> 3));
-        $s16 = ParagonIE_Sodium_Core32_Int64::fromInt(2097151 & self::load_3(self::substr($s, 42, 3)));
-        $s17 = ParagonIE_Sodium_Core32_Int64::fromInt(2097151 & (self::load_4(self::substr($s, 44, 4)) >> 5));
-        $s18 = ParagonIE_Sodium_Core32_Int64::fromInt(2097151 & (self::load_3(self::substr($s, 47, 3)) >> 2));
-        $s19 = ParagonIE_Sodium_Core32_Int64::fromInt(2097151 & (self::load_4(self::substr($s, 49, 4)) >> 7));
-        $s20 = ParagonIE_Sodium_Core32_Int64::fromInt(2097151 & (self::load_4(self::substr($s, 52, 4)) >> 4));
-        $s21 = ParagonIE_Sodium_Core32_Int64::fromInt(2097151 & (self::load_3(self::substr($s, 55, 3)) >> 1));
-        $s22 = ParagonIE_Sodium_Core32_Int64::fromInt(2097151 & (self::load_4(self::substr($s, 57, 4)) >> 6));
-        $s23 = ParagonIE_Sodium_Core32_Int64::fromInt(0x1fffffff & (self::load_4(self::substr($s, 60, 4)) >> 3));
-
-        $s11 = $s11->addInt64($s23->mulInt(666643, 20));
-        $s12 = $s12->addInt64($s23->mulInt(470296, 19));
-        $s13 = $s13->addInt64($s23->mulInt(654183, 20));
-        $s14 = $s14->subInt64($s23->mulInt(997805, 20));
-        $s15 = $s15->addInt64($s23->mulInt(136657, 18));
-        $s16 = $s16->subInt64($s23->mulInt(683901, 20));
-
-        $s10 = $s10->addInt64($s22->mulInt(666643, 20));
-        $s11 = $s11->addInt64($s22->mulInt(470296, 19));
-        $s12 = $s12->addInt64($s22->mulInt(654183, 20));
-        $s13 = $s13->subInt64($s22->mulInt(997805, 20));
-        $s14 = $s14->addInt64($s22->mulInt(136657, 18));
-        $s15 = $s15->subInt64($s22->mulInt(683901, 20));
-
-        $s9  =  $s9->addInt64($s21->mulInt(666643, 20));
-        $s10 = $s10->addInt64($s21->mulInt(470296, 19));
-        $s11 = $s11->addInt64($s21->mulInt(654183, 20));
-        $s12 = $s12->subInt64($s21->mulInt(997805, 20));
-        $s13 = $s13->addInt64($s21->mulInt(136657, 18));
-        $s14 = $s14->subInt64($s21->mulInt(683901, 20));
-
-        $s8  =  $s8->addInt64($s20->mulInt(666643, 20));
-        $s9  =  $s9->addInt64($s20->mulInt(470296, 19));
-        $s10 = $s10->addInt64($s20->mulInt(654183, 20));
-        $s11 = $s11->subInt64($s20->mulInt(997805, 20));
-        $s12 = $s12->addInt64($s20->mulInt(136657, 18));
-        $s13 = $s13->subInt64($s20->mulInt(683901, 20));
-
-        $s7  =  $s7->addInt64($s19->mulInt(666643, 20));
-        $s8  =  $s8->addInt64($s19->mulInt(470296, 19));
-        $s9  =  $s9->addInt64($s19->mulInt(654183, 20));
-        $s10 = $s10->subInt64($s19->mulInt(997805, 20));
-        $s11 = $s11->addInt64($s19->mulInt(136657, 18));
-        $s12 = $s12->subInt64($s19->mulInt(683901, 20));
-
-        $s6  =  $s6->addInt64($s18->mulInt(666643, 20));
-        $s7  =  $s7->addInt64($s18->mulInt(470296, 19));
-        $s8  =  $s8->addInt64($s18->mulInt(654183, 20));
-        $s9  =  $s9->subInt64($s18->mulInt(997805, 20));
-        $s10 = $s10->addInt64($s18->mulInt(136657, 18));
-        $s11 = $s11->subInt64($s18->mulInt(683901, 20));
-
-        $carry6 = $s6->addInt(1 << 20)->shiftRight(21);
-        $s7 = $s7->addInt64($carry6);
-        $s6 = $s6->subInt64($carry6->shiftLeft(21));
-        $carry8 = $s8->addInt(1 << 20)->shiftRight(21);
-        $s9 = $s9->addInt64($carry8);
-        $s8 = $s8->subInt64($carry8->shiftLeft(21));
-        $carry10 = $s10->addInt(1 << 20)->shiftRight(21);
-        $s11 = $s11->addInt64($carry10);
-        $s10 = $s10->subInt64($carry10->shiftLeft(21));
-        $carry12 = $s12->addInt(1 << 20)->shiftRight(21);
-        $s13 = $s13->addInt64($carry12);
-        $s12 = $s12->subInt64($carry12->shiftLeft(21));
-        $carry14 = $s14->addInt(1 << 20)->shiftRight(21);
-        $s15 = $s15->addInt64($carry14);
-        $s14 = $s14->subInt64($carry14->shiftLeft(21));
-        $carry16 = $s16->addInt(1 << 20)->shiftRight(21);
-        $s17 = $s17->addInt64($carry16);
-        $s16 = $s16->subInt64($carry16->shiftLeft(21));
-
-        $carry7 = $s7->addInt(1 << 20)->shiftRight(21);
-        $s8 = $s8->addInt64($carry7);
-        $s7 = $s7->subInt64($carry7->shiftLeft(21));
-        $carry9 = $s9->addInt(1 << 20)->shiftRight(21);
-        $s10 = $s10->addInt64($carry9);
-        $s9 = $s9->subInt64($carry9->shiftLeft(21));
-        $carry11 = $s11->addInt(1 << 20)->shiftRight(21);
-        $s12 = $s12->addInt64($carry11);
-        $s11 = $s11->subInt64($carry11->shiftLeft(21));
-        $carry13 = $s13->addInt(1 << 20)->shiftRight(21);
-        $s14 = $s14->addInt64($carry13);
-        $s13 = $s13->subInt64($carry13->shiftLeft(21));
-        $carry15 = $s15->addInt(1 << 20)->shiftRight(21);
-        $s16 = $s16->addInt64($carry15);
-        $s15 = $s15->subInt64($carry15->shiftLeft(21));
-
-        $s5  =  $s5->addInt64($s17->mulInt(666643, 20));
-        $s6  =  $s6->addInt64($s17->mulInt(470296, 19));
-        $s7  =  $s7->addInt64($s17->mulInt(654183, 20));
-        $s8  =  $s8->subInt64($s17->mulInt(997805, 20));
-        $s9  =  $s9->addInt64($s17->mulInt(136657, 18));
-        $s10 = $s10->subInt64($s17->mulInt(683901, 20));
-
-        $s4  =  $s4->addInt64($s16->mulInt(666643, 20));
-        $s5  =  $s5->addInt64($s16->mulInt(470296, 19));
-        $s6  =  $s6->addInt64($s16->mulInt(654183, 20));
-        $s7  =  $s7->subInt64($s16->mulInt(997805, 20));
-        $s8  =  $s8->addInt64($s16->mulInt(136657, 18));
-        $s9  =  $s9->subInt64($s16->mulInt(683901, 20));
-
-        $s3  =  $s3->addInt64($s15->mulInt(666643, 20));
-        $s4  =  $s4->addInt64($s15->mulInt(470296, 19));
-        $s5  =  $s5->addInt64($s15->mulInt(654183, 20));
-        $s6  =  $s6->subInt64($s15->mulInt(997805, 20));
-        $s7  =  $s7->addInt64($s15->mulInt(136657, 18));
-        $s8  =  $s8->subInt64($s15->mulInt(683901, 20));
-
-        $s2  =  $s2->addInt64($s14->mulInt(666643, 20));
-        $s3  =  $s3->addInt64($s14->mulInt(470296, 19));
-        $s4  =  $s4->addInt64($s14->mulInt(654183, 20));
-        $s5  =  $s5->subInt64($s14->mulInt(997805, 20));
-        $s6  =  $s6->addInt64($s14->mulInt(136657, 18));
-        $s7  =  $s7->subInt64($s14->mulInt(683901, 20));
-
-        $s1  =  $s1->addInt64($s13->mulInt(666643, 20));
-        $s2  =  $s2->addInt64($s13->mulInt(470296, 19));
-        $s3  =  $s3->addInt64($s13->mulInt(654183, 20));
-        $s4  =  $s4->subInt64($s13->mulInt(997805, 20));
-        $s5  =  $s5->addInt64($s13->mulInt(136657, 18));
-        $s6  =  $s6->subInt64($s13->mulInt(683901, 20));
-
-        $s0  =  $s0->addInt64($s12->mulInt(666643, 20));
-        $s1  =  $s1->addInt64($s12->mulInt(470296, 19));
-        $s2  =  $s2->addInt64($s12->mulInt(654183, 20));
-        $s3  =  $s3->subInt64($s12->mulInt(997805, 20));
-        $s4  =  $s4->addInt64($s12->mulInt(136657, 18));
-        $s5  =  $s5->subInt64($s12->mulInt(683901, 20));
-        $s12 = new ParagonIE_Sodium_Core32_Int64();
-
-        $carry0 = $s0->addInt(1 << 20)->shiftRight(21);
-        $s1 = $s1->addInt64($carry0);
-        $s0 = $s0->subInt64($carry0->shiftLeft(21));
-        $carry2 = $s2->addInt(1 << 20)->shiftRight(21);
-        $s3 = $s3->addInt64($carry2);
-        $s2 = $s2->subInt64($carry2->shiftLeft(21));
-        $carry4 = $s4->addInt(1 << 20)->shiftRight(21);
-        $s5 = $s5->addInt64($carry4);
-        $s4 = $s4->subInt64($carry4->shiftLeft(21));
-        $carry6 = $s6->addInt(1 << 20)->shiftRight(21);
-        $s7 = $s7->addInt64($carry6);
-        $s6 = $s6->subInt64($carry6->shiftLeft(21));
-        $carry8 = $s8->addInt(1 << 20)->shiftRight(21);
-        $s9 = $s9->addInt64($carry8);
-        $s8 = $s8->subInt64($carry8->shiftLeft(21));
-        $carry10 = $s10->addInt(1 << 20)->shiftRight(21);
-        $s11 = $s11->addInt64($carry10);
-        $s10 = $s10->subInt64($carry10->shiftLeft(21));
-        $carry1 = $s1->addInt(1 << 20)->shiftRight(21);
-        $s2 = $s2->addInt64($carry1);
-        $s1 = $s1->subInt64($carry1->shiftLeft(21));
-        $carry3 = $s3->addInt(1 << 20)->shiftRight(21);
-        $s4 = $s4->addInt64($carry3);
-        $s3 = $s3->subInt64($carry3->shiftLeft(21));
-        $carry5 = $s5->addInt(1 << 20)->shiftRight(21);
-        $s6 = $s6->addInt64($carry5);
-        $s5 = $s5->subInt64($carry5->shiftLeft(21));
-        $carry7 = $s7->addInt(1 << 20)->shiftRight(21);
-        $s8 = $s8->addInt64($carry7);
-        $s7 = $s7->subInt64($carry7->shiftLeft(21));
-        $carry9 = $s9->addInt(1 << 20)->shiftRight(21);
-        $s10 = $s10->addInt64($carry9);
-        $s9 = $s9->subInt64($carry9->shiftLeft(21));
-        $carry11 = $s11->addInt(1 << 20)->shiftRight(21);
-        $s12 = $s12->addInt64($carry11);
-        $s11 = $s11->subInt64($carry11->shiftLeft(21));
-
-        $s0  =  $s0->addInt64($s12->mulInt(666643, 20));
-        $s1  =  $s1->addInt64($s12->mulInt(470296, 19));
-        $s2  =  $s2->addInt64($s12->mulInt(654183, 20));
-        $s3  =  $s3->subInt64($s12->mulInt(997805, 20));
-        $s4  =  $s4->addInt64($s12->mulInt(136657, 18));
-        $s5  =  $s5->subInt64($s12->mulInt(683901, 20));
-        $s12 = new ParagonIE_Sodium_Core32_Int64();
-
-        $carry0 = $s0->shiftRight(21);
-        $s1 = $s1->addInt64($carry0);
-        $s0 = $s0->subInt64($carry0->shiftLeft(21));
-        $carry1 = $s1->shiftRight(21);
-        $s2 = $s2->addInt64($carry1);
-        $s1 = $s1->subInt64($carry1->shiftLeft(21));
-        $carry2 = $s2->shiftRight(21);
-        $s3 = $s3->addInt64($carry2);
-        $s2 = $s2->subInt64($carry2->shiftLeft(21));
-        $carry3 = $s3->shiftRight(21);
-        $s4 = $s4->addInt64($carry3);
-        $s3 = $s3->subInt64($carry3->shiftLeft(21));
-        $carry4 = $s4->shiftRight(21);
-        $s5 = $s5->addInt64($carry4);
-        $s4 = $s4->subInt64($carry4->shiftLeft(21));
-        $carry5 = $s5->shiftRight(21);
-        $s6 = $s6->addInt64($carry5);
-        $s5 = $s5->subInt64($carry5->shiftLeft(21));
-        $carry6 = $s6->shiftRight(21);
-        $s7 = $s7->addInt64($carry6);
-        $s6 = $s6->subInt64($carry6->shiftLeft(21));
-        $carry7 = $s7->shiftRight(21);
-        $s8 = $s8->addInt64($carry7);
-        $s7 = $s7->subInt64($carry7->shiftLeft(21));
-        $carry8 = $s8->shiftRight(21);
-        $s9 = $s9->addInt64($carry8);
-        $s8 = $s8->subInt64($carry8->shiftLeft(21));
-        $carry9 = $s9->shiftRight(21);
-        $s10 = $s10->addInt64($carry9);
-        $s9 = $s9->subInt64($carry9->shiftLeft(21));
-        $carry10 = $s10->shiftRight(21);
-        $s11 = $s11->addInt64($carry10);
-        $s10 = $s10->subInt64($carry10->shiftLeft(21));
-        $carry11 = $s11->shiftRight(21);
-        $s12 = $s12->addInt64($carry11);
-        $s11 = $s11->subInt64($carry11->shiftLeft(21));
-
-        $s0  =  $s0->addInt64($s12->mulInt(666643, 20));
-        $s1  =  $s1->addInt64($s12->mulInt(470296, 19));
-        $s2  =  $s2->addInt64($s12->mulInt(654183, 20));
-        $s3  =  $s3->subInt64($s12->mulInt(997805, 20));
-        $s4  =  $s4->addInt64($s12->mulInt(136657, 18));
-        $s5  =  $s5->subInt64($s12->mulInt(683901, 20));
-
-        $carry0 = $s0->shiftRight(21);
-        $s1 = $s1->addInt64($carry0);
-        $s0 = $s0->subInt64($carry0->shiftLeft(21));
-        $carry1 = $s1->shiftRight(21);
-        $s2 = $s2->addInt64($carry1);
-        $s1 = $s1->subInt64($carry1->shiftLeft(21));
-        $carry2 = $s2->shiftRight(21);
-        $s3 = $s3->addInt64($carry2);
-        $s2 = $s2->subInt64($carry2->shiftLeft(21));
-        $carry3 = $s3->shiftRight(21);
-        $s4 = $s4->addInt64($carry3);
-        $s3 = $s3->subInt64($carry3->shiftLeft(21));
-        $carry4 = $s4->shiftRight(21);
-        $s5 = $s5->addInt64($carry4);
-        $s4 = $s4->subInt64($carry4->shiftLeft(21));
-        $carry5 = $s5->shiftRight(21);
-        $s6 = $s6->addInt64($carry5);
-        $s5 = $s5->subInt64($carry5->shiftLeft(21));
-        $carry6 = $s6->shiftRight(21);
-        $s7 = $s7->addInt64($carry6);
-        $s6 = $s6->subInt64($carry6->shiftLeft(21));
-        $carry7 = $s7->shiftRight(21);
-        $s8 = $s8->addInt64($carry7);
-        $s7 = $s7->subInt64($carry7->shiftLeft(21));
-        $carry8 = $s8->shiftRight(21);
-        $s9 = $s9->addInt64($carry8);
-        $s8 = $s8->subInt64($carry8->shiftLeft(21));
-        $carry9 = $s9->shiftRight(21);
-        $s10 = $s10->addInt64($carry9);
-        $s9 = $s9->subInt64($carry9->shiftLeft(21));
-        $carry10 = $s10->shiftRight(21);
-        $s11 = $s11->addInt64($carry10);
-        $s10 = $s10->subInt64($carry10->shiftLeft(21));
-
-        $S0 = $s0->toInt32()->toInt();
-        $S1 = $s1->toInt32()->toInt();
-        $S2 = $s2->toInt32()->toInt();
-        $S3 = $s3->toInt32()->toInt();
-        $S4 = $s4->toInt32()->toInt();
-        $S5 = $s5->toInt32()->toInt();
-        $S6 = $s6->toInt32()->toInt();
-        $S7 = $s7->toInt32()->toInt();
-        $S8 = $s8->toInt32()->toInt();
-        $S9 = $s9->toInt32()->toInt();
-        $S10 = $s10->toInt32()->toInt();
-        $S11 = $s11->toInt32()->toInt();
-
-        /**
-         * @var array<int, int>
-         */
-        $arr = array(
-            (int) ($S0 >> 0),
-            (int) ($S0 >> 8),
-            (int) (($S0 >> 16) | ($S1 << 5)),
-            (int) ($S1 >> 3),
-            (int) ($S1 >> 11),
-            (int) (($S1 >> 19) | ($S2 << 2)),
-            (int) ($S2 >> 6),
-            (int) (($S2 >> 14) | ($S3 << 7)),
-            (int) ($S3 >> 1),
-            (int) ($S3 >> 9),
-            (int) (($S3 >> 17) | ($S4 << 4)),
-            (int) ($S4 >> 4),
-            (int) ($S4 >> 12),
-            (int) (($S4 >> 20) | ($S5 << 1)),
-            (int) ($S5 >> 7),
-            (int) (($S5 >> 15) | ($S6 << 6)),
-            (int) ($S6 >> 2),
-            (int) ($S6 >> 10),
-            (int) (($S6 >> 18) | ($S7 << 3)),
-            (int) ($S7 >> 5),
-            (int) ($S7 >> 13),
-            (int) ($S8 >> 0),
-            (int) ($S8 >> 8),
-            (int) (($S8 >> 16) | ($S9 << 5)),
-            (int) ($S9 >> 3),
-            (int) ($S9 >> 11),
-            (int) (($S9 >> 19) | ($S10 << 2)),
-            (int) ($S10 >> 6),
-            (int) (($S10 >> 14) | ($S11 << 7)),
-            (int) ($S11 >> 1),
-            (int) ($S11 >> 9),
-            (int) $S11 >> 17
-        );
-        return self::intArrayToString($arr);
-    }
-
-    /**
-     * multiply by the order of the main subgroup l = 2^252+27742317777372353535851937790883648493
-     *
-     * @param ParagonIE_Sodium_Core32_Curve25519_Ge_P3 $A
-     * @return ParagonIE_Sodium_Core32_Curve25519_Ge_P3
-     * @throws SodiumException
-     * @throws TypeError
-     */
-    public static function ge_mul_l(ParagonIE_Sodium_Core32_Curve25519_Ge_P3 $A)
-    {
-        $aslide = array(
-            13, 0, 0, 0, 0, -1, 0, 0, 0, 0, -11, 0, 0, 0, 0, 0, 0, -5, 0, 0, 0,
-            0, 0, 0, -3, 0, 0, 0, 0, -13, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 3, 0,
-            0, 0, 0, -13, 0, 0, 0, 0, 5, 0, 0, 0, 0, 0, 0, 0, 0, 11, 0, 0, 0,
-            0, 0, 11, 0, 0, 0, 0, -13, 0, 0, 0, 0, 0, 0, -3, 0, 0, 0, 0, 0, -1,
-            0, 0, 0, 0, 3, 0, 0, 0, 0, -11, 0, 0, 0, 0, 0, 0, 0, 15, 0, 0, 0,
-            0, 0, -1, 0, 0, 0, 0, -1, 0, 0, 0, 0, 7, 0, 0, 0, 0, 5, 0, 0, 0, 0,
-            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1
-        );
-
-        /** @var array<int, ParagonIE_Sodium_Core32_Curve25519_Ge_Cached> $Ai size 8 */
-        $Ai = array();
-
-        # ge_p3_to_cached(&Ai[0], A);
-        $Ai[0] = self::ge_p3_to_cached($A);
-        # ge_p3_dbl(&t, A);
-        $t = self::ge_p3_dbl($A);
-        # ge_p1p1_to_p3(&A2, &t);
-        $A2 = self::ge_p1p1_to_p3($t);
-
-        for ($i = 1; $i < 8; ++$i) {
-            # ge_add(&t, &A2, &Ai[0]);
-            $t = self::ge_add($A2, $Ai[$i - 1]);
-            # ge_p1p1_to_p3(&u, &t);
-            $u = self::ge_p1p1_to_p3($t);
-            # ge_p3_to_cached(&Ai[i], &u);
-            $Ai[$i] = self::ge_p3_to_cached($u);
-        }
-
-        $r = self::ge_p3_0();
-        for ($i = 252; $i >= 0; --$i) {
-            $t = self::ge_p3_dbl($r);
-            if ($aslide[$i] > 0) {
-                # ge_p1p1_to_p3(&u, &t);
-                $u = self::ge_p1p1_to_p3($t);
-                # ge_add(&t, &u, &Ai[aslide[i] / 2]);
-                $t = self::ge_add($u, $Ai[(int)($aslide[$i] / 2)]);
-            } elseif ($aslide[$i] < 0) {
-                # ge_p1p1_to_p3(&u, &t);
-                $u = self::ge_p1p1_to_p3($t);
-                # ge_sub(&t, &u, &Ai[(-aslide[i]) / 2]);
-                $t = self::ge_sub($u, $Ai[(int)(-$aslide[$i] / 2)]);
-            }
-        }
-        # ge_p1p1_to_p3(r, &t);
-        return self::ge_p1p1_to_p3($t);
-    }
-}

diff --git a/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core32/Curve25519/Fe.php b/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core32/Curve25519/Fe.php
deleted file mode 100644 (file)
index 21b3188..0000000
--- a/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core32/Curve25519/Fe.php
+++ /dev/null
@@ -1,192 +0,0 @@
-<?php
-
-if (class_exists('ParagonIE_Sodium_Core32_Curve25519_Fe', false)) {
-    return;
-}
-
-/**
- * Class ParagonIE_Sodium_Core32_Curve25519_Fe
- *
- * This represents a Field Element
- */
-class ParagonIE_Sodium_Core32_Curve25519_Fe implements ArrayAccess
-{
-    /**
-     * @var array<int, ParagonIE_Sodium_Core32_Int32>
-     */
-    protected $container = array();
-
-    /**
-     * @var int
-     */
-    protected $size = 10;
-
-    /**
-     * @internal You should not use this directly from another application
-     *
-     * @param array<int, ParagonIE_Sodium_Core32_Int32> $array
-     * @param bool $save_indexes
-     * @return self
-     * @throws SodiumException
-     * @throws TypeError
-     */
-    public static function fromArray($array, $save_indexes = null)
-    {
-        $count = count($array);
-        if ($save_indexes) {
-            $keys = array_keys($array);
-        } else {
-            $keys = range(0, $count - 1);
-        }
-        $array = array_values($array);
-
-        $obj = new ParagonIE_Sodium_Core32_Curve25519_Fe();
-        if ($save_indexes) {
-            for ($i = 0; $i < $count; ++$i) {
-                $array[$i]->overflow = 0;
-                $obj->offsetSet($keys[$i], $array[$i]);
-            }
-        } else {
-            for ($i = 0; $i < $count; ++$i) {
-                if (!($array[$i] instanceof ParagonIE_Sodium_Core32_Int32)) {
-                    throw new TypeError('Expected ParagonIE_Sodium_Core32_Int32');
-                }
-                $array[$i]->overflow = 0;
-                $obj->offsetSet($i, $array[$i]);
-            }
-        }
-        return $obj;
-    }
-
-    /**
-     * @internal You should not use this directly from another application
-     *
-     * @param array<int, int> $array
-     * @param bool $save_indexes
-     * @return self
-     * @throws SodiumException
-     * @throws TypeError
-     */
-    public static function fromIntArray($array, $save_indexes = null)
-    {
-        $count = count($array);
-        if ($save_indexes) {
-            $keys = array_keys($array);
-        } else {
-            $keys = range(0, $count - 1);
-        }
-        $array = array_values($array);
-        $set = array();
-        /** @var int $i */
-        /** @var int $v */
-        foreach ($array as $i => $v) {
-            $set[$i] = ParagonIE_Sodium_Core32_Int32::fromInt($v);
-        }
-
-        $obj = new ParagonIE_Sodium_Core32_Curve25519_Fe();
-        if ($save_indexes) {
-            for ($i = 0; $i < $count; ++$i) {
-                $set[$i]->overflow = 0;
-                $obj->offsetSet($keys[$i], $set[$i]);
-            }
-        } else {
-            for ($i = 0; $i < $count; ++$i) {
-                $set[$i]->overflow = 0;
-                $obj->offsetSet($i, $set[$i]);
-            }
-        }
-        return $obj;
-    }
-
-    /**
-     * @internal You should not use this directly from another application
-     *
-     * @param mixed $offset
-     * @param mixed $value
-     * @return void
-     * @throws SodiumException
-     * @throws TypeError
-     */
-    #[ReturnTypeWillChange]
-    public function offsetSet($offset, $value)
-    {
-        if (!($value instanceof ParagonIE_Sodium_Core32_Int32)) {
-            throw new InvalidArgumentException('Expected an instance of ParagonIE_Sodium_Core32_Int32');
-        }
-        if (is_null($offset)) {
-            $this->container[] = $value;
-        } else {
-            ParagonIE_Sodium_Core32_Util::declareScalarType($offset, 'int', 1);
-            $this->container[(int) $offset] = $value;
-        }
-    }
-
-    /**
-     * @internal You should not use this directly from another application
-     *
-     * @param mixed $offset
-     * @return bool
-     * @psalm-suppress MixedArrayOffset
-     */
-    #[ReturnTypeWillChange]
-    public function offsetExists($offset)
-    {
-        return isset($this->container[$offset]);
-    }
-
-    /**
-     * @internal You should not use this directly from another application
-     *
-     * @param mixed $offset
-     * @return void
-     * @psalm-suppress MixedArrayOffset
-     */
-    #[ReturnTypeWillChange]
-    public function offsetUnset($offset)
-    {
-        unset($this->container[$offset]);
-    }
-
-    /**
-     * @internal You should not use this directly from another application
-     *
-     * @param mixed $offset
-     * @return ParagonIE_Sodium_Core32_Int32
-     * @psalm-suppress MixedArrayOffset
-     */
-    #[ReturnTypeWillChange]
-    public function offsetGet($offset)
-    {
-        if (!isset($this->container[$offset])) {
-            $this->container[(int) $offset] = new ParagonIE_Sodium_Core32_Int32();
-        }
-        /** @var ParagonIE_Sodium_Core32_Int32 $get */
-        $get = $this->container[$offset];
-        return $get;
-    }
-
-    /**
-     * @internal You should not use this directly from another application
-     *
-     * @return array
-     */
-    public function __debugInfo()
-    {
-        if (empty($this->container)) {
-            return array();
-        }
-        $c = array(
-            (int) ($this->container[0]->toInt()),
-            (int) ($this->container[1]->toInt()),
-            (int) ($this->container[2]->toInt()),
-            (int) ($this->container[3]->toInt()),
-            (int) ($this->container[4]->toInt()),
-            (int) ($this->container[5]->toInt()),
-            (int) ($this->container[6]->toInt()),
-            (int) ($this->container[7]->toInt()),
-            (int) ($this->container[8]->toInt()),
-            (int) ($this->container[9]->toInt())
-        );
-        return array(implode(', ', $c));
-    }
-}

diff --git a/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core32/Curve25519/Ge/Cached.php b/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core32/Curve25519/Ge/Cached.php
deleted file mode 100644 (file)
index 970481f..0000000
--- a/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core32/Curve25519/Ge/Cached.php
+++ /dev/null
@@ -1,65 +0,0 @@
-<?php
-
-
-if (class_exists('ParagonIE_Sodium_Core32_Curve25519_Ge_Cached', false)) {
-    return;
-}
-/**
- * Class ParagonIE_Sodium_Core32_Curve25519_Ge_Cached
- */
-class ParagonIE_Sodium_Core32_Curve25519_Ge_Cached
-{
-    /**
-     * @var ParagonIE_Sodium_Core32_Curve25519_Fe
-     */
-    public $YplusX;
-
-    /**
-     * @var ParagonIE_Sodium_Core32_Curve25519_Fe
-     */
-    public $YminusX;
-
-    /**
-     * @var ParagonIE_Sodium_Core32_Curve25519_Fe
-     */
-    public $Z;
-
-    /**
-     * @var ParagonIE_Sodium_Core32_Curve25519_Fe
-     */
-    public $T2d;
-
-    /**
-     * ParagonIE_Sodium_Core32_Curve25519_Ge_Cached constructor.
-     *
-     * @internal You should not use this directly from another application
-     *
-     * @param ParagonIE_Sodium_Core32_Curve25519_Fe|null $YplusX
-     * @param ParagonIE_Sodium_Core32_Curve25519_Fe|null $YminusX
-     * @param ParagonIE_Sodium_Core32_Curve25519_Fe|null $Z
-     * @param ParagonIE_Sodium_Core32_Curve25519_Fe|null $T2d
-     */
-    public function __construct(
-        ParagonIE_Sodium_Core32_Curve25519_Fe $YplusX = null,
-        ParagonIE_Sodium_Core32_Curve25519_Fe $YminusX = null,
-        ParagonIE_Sodium_Core32_Curve25519_Fe $Z = null,
-        ParagonIE_Sodium_Core32_Curve25519_Fe $T2d = null
-    ) {
-        if ($YplusX === null) {
-            $YplusX = new ParagonIE_Sodium_Core32_Curve25519_Fe();
-        }
-        $this->YplusX = $YplusX;
-        if ($YminusX === null) {
-            $YminusX = new ParagonIE_Sodium_Core32_Curve25519_Fe();
-        }
-        $this->YminusX = $YminusX;
-        if ($Z === null) {
-            $Z = new ParagonIE_Sodium_Core32_Curve25519_Fe();
-        }
-        $this->Z = $Z;
-        if ($T2d === null) {
-            $T2d = new ParagonIE_Sodium_Core32_Curve25519_Fe();
-        }
-        $this->T2d = $T2d;
-    }
-}

diff --git a/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core32/Curve25519/Ge/P1p1.php b/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core32/Curve25519/Ge/P1p1.php
deleted file mode 100644 (file)
index ff10b1d..0000000
--- a/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core32/Curve25519/Ge/P1p1.php
+++ /dev/null
@@ -1,67 +0,0 @@
-<?php
-
-if (class_exists('ParagonIE_Sodium_Core32_Curve25519_Ge_P1p1', false)) {
-    return;
-}
-/**
- * Class ParagonIE_Sodium_Core32_Curve25519_Ge_P1p1
- */
-class ParagonIE_Sodium_Core32_Curve25519_Ge_P1p1
-{
-    /**
-     * @var ParagonIE_Sodium_Core32_Curve25519_Fe
-     */
-    public $X;
-
-    /**
-     * @var ParagonIE_Sodium_Core32_Curve25519_Fe
-     */
-    public $Y;
-
-    /**
-     * @var ParagonIE_Sodium_Core32_Curve25519_Fe
-     */
-    public $Z;
-
-    /**
-     * @var ParagonIE_Sodium_Core32_Curve25519_Fe
-     */
-    public $T;
-
-    /**
-     * ParagonIE_Sodium_Core32_Curve25519_Ge_P1p1 constructor.
-     *
-     * @internal You should not use this directly from another application
-     *
-     * @param ParagonIE_Sodium_Core32_Curve25519_Fe|null $x
-     * @param ParagonIE_Sodium_Core32_Curve25519_Fe|null $y
-     * @param ParagonIE_Sodium_Core32_Curve25519_Fe|null $z
-     * @param ParagonIE_Sodium_Core32_Curve25519_Fe|null $t
-     *
-     * @throws SodiumException
-     * @throws TypeError
-     */
-    public function __construct(
-        ParagonIE_Sodium_Core32_Curve25519_Fe $x = null,
-        ParagonIE_Sodium_Core32_Curve25519_Fe $y = null,
-        ParagonIE_Sodium_Core32_Curve25519_Fe $z = null,
-        ParagonIE_Sodium_Core32_Curve25519_Fe $t = null
-    ) {
-        if ($x === null) {
-            $x = ParagonIE_Sodium_Core32_Curve25519::fe_0();
-        }
-        $this->X = $x;
-        if ($y === null) {
-            $y = ParagonIE_Sodium_Core32_Curve25519::fe_0();
-        }
-        $this->Y = $y;
-        if ($z === null) {
-            $z = ParagonIE_Sodium_Core32_Curve25519::fe_0();
-        }
-        $this->Z = $z;
-        if ($t === null) {
-            $t = ParagonIE_Sodium_Core32_Curve25519::fe_0();
-        }
-        $this->T = $t;
-    }
-}

diff --git a/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core32/Curve25519/Ge/P2.php b/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core32/Curve25519/Ge/P2.php
deleted file mode 100644 (file)
index 8a45a91..0000000
--- a/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core32/Curve25519/Ge/P2.php
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php
-
-if (class_exists('ParagonIE_Sodium_Core32_Curve25519_Ge_P2', false)) {
-    return;
-}
-
-/**
- * Class ParagonIE_Sodium_Core32_Curve25519_Ge_P2
- */
-class ParagonIE_Sodium_Core32_Curve25519_Ge_P2
-{
-    /**
-     * @var ParagonIE_Sodium_Core32_Curve25519_Fe
-     */
-    public $X;
-
-    /**
-     * @var ParagonIE_Sodium_Core32_Curve25519_Fe
-     */
-    public $Y;
-
-    /**
-     * @var ParagonIE_Sodium_Core32_Curve25519_Fe
-     */
-    public $Z;
-
-    /**
-     * ParagonIE_Sodium_Core32_Curve25519_Ge_P2 constructor.
-     *
-     * @internal You should not use this directly from another application
-     *
-     * @param ParagonIE_Sodium_Core32_Curve25519_Fe|null $x
-     * @param ParagonIE_Sodium_Core32_Curve25519_Fe|null $y
-     * @param ParagonIE_Sodium_Core32_Curve25519_Fe|null $z
-     */
-    public function __construct(
-        ParagonIE_Sodium_Core32_Curve25519_Fe $x = null,
-        ParagonIE_Sodium_Core32_Curve25519_Fe $y = null,
-        ParagonIE_Sodium_Core32_Curve25519_Fe $z = null
-    ) {
-        if ($x === null) {
-            $x = new ParagonIE_Sodium_Core32_Curve25519_Fe();
-        }
-        $this->X = $x;
-        if ($y === null) {
-            $y = new ParagonIE_Sodium_Core32_Curve25519_Fe();
-        }
-        $this->Y = $y;
-        if ($z === null) {
-            $z = new ParagonIE_Sodium_Core32_Curve25519_Fe();
-        }
-        $this->Z = $z;
-    }
-}

diff --git a/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core32/Curve25519/Ge/P3.php b/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core32/Curve25519/Ge/P3.php
deleted file mode 100644 (file)
index c9e4b16..0000000
--- a/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core32/Curve25519/Ge/P3.php
+++ /dev/null
@@ -1,65 +0,0 @@
-<?php
-
-if (class_exists('ParagonIE_Sodium_Core32_Curve25519_Ge_P3', false)) {
-    return;
-}
-
-/**
- * Class ParagonIE_Sodium_Core32_Curve25519_Ge_P3
- */
-class ParagonIE_Sodium_Core32_Curve25519_Ge_P3
-{
-    /**
-     * @var ParagonIE_Sodium_Core32_Curve25519_Fe
-     */
-    public $X;
-
-    /**
-     * @var ParagonIE_Sodium_Core32_Curve25519_Fe
-     */
-    public $Y;
-
-    /**
-     * @var ParagonIE_Sodium_Core32_Curve25519_Fe
-     */
-    public $Z;
-
-    /**
-     * @var ParagonIE_Sodium_Core32_Curve25519_Fe
-     */
-    public $T;
-
-    /**
-     * ParagonIE_Sodium_Core32_Curve25519_Ge_P3 constructor.
-     *
-     * @internal You should not use this directly from another application
-     *
-     * @param ParagonIE_Sodium_Core32_Curve25519_Fe|null $x
-     * @param ParagonIE_Sodium_Core32_Curve25519_Fe|null $y
-     * @param ParagonIE_Sodium_Core32_Curve25519_Fe|null $z
-     * @param ParagonIE_Sodium_Core32_Curve25519_Fe|null $t
-     */
-    public function __construct(
-        ParagonIE_Sodium_Core32_Curve25519_Fe $x = null,
-        ParagonIE_Sodium_Core32_Curve25519_Fe $y = null,
-        ParagonIE_Sodium_Core32_Curve25519_Fe $z = null,
-        ParagonIE_Sodium_Core32_Curve25519_Fe $t = null
-    ) {
-        if ($x === null) {
-            $x = new ParagonIE_Sodium_Core32_Curve25519_Fe();
-        }
-        $this->X = $x;
-        if ($y === null) {
-            $y = new ParagonIE_Sodium_Core32_Curve25519_Fe();
-        }
-        $this->Y = $y;
-        if ($z === null) {
-            $z = new ParagonIE_Sodium_Core32_Curve25519_Fe();
-        }
-        $this->Z = $z;
-        if ($t === null) {
-            $t = new ParagonIE_Sodium_Core32_Curve25519_Fe();
-        }
-        $this->T = $t;
-    }
-}

diff --git a/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core32/Curve25519/Ge/Precomp.php b/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core32/Curve25519/Ge/Precomp.php
deleted file mode 100644 (file)
index b590b75..0000000
--- a/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core32/Curve25519/Ge/Precomp.php
+++ /dev/null
@@ -1,56 +0,0 @@
-<?php
-
-if (class_exists('ParagonIE_Sodium_Core32_Curve25519_Ge_Precomp', false)) {
-    return;
-}
-
-/**
- * Class ParagonIE_Sodium_Core32_Curve25519_Ge_Precomp
- */
-class ParagonIE_Sodium_Core32_Curve25519_Ge_Precomp
-{
-    /**
-     * @var ParagonIE_Sodium_Core32_Curve25519_Fe
-     */
-    public $yplusx;
-
-    /**
-     * @var ParagonIE_Sodium_Core32_Curve25519_Fe
-     */
-    public $yminusx;
-
-    /**
-     * @var ParagonIE_Sodium_Core32_Curve25519_Fe
-     */
-    public $xy2d;
-
-    /**
-     * ParagonIE_Sodium_Core32_Curve25519_Ge_Precomp constructor.
-     *
-     * @internal You should not use this directly from another application
-     *
-     * @param ParagonIE_Sodium_Core32_Curve25519_Fe $yplusx
-     * @param ParagonIE_Sodium_Core32_Curve25519_Fe $yminusx
-     * @param ParagonIE_Sodium_Core32_Curve25519_Fe $xy2d
-     * @throws SodiumException
-     * @throws TypeError
-     */
-    public function __construct(
-        ParagonIE_Sodium_Core32_Curve25519_Fe $yplusx = null,
-        ParagonIE_Sodium_Core32_Curve25519_Fe $yminusx = null,
-        ParagonIE_Sodium_Core32_Curve25519_Fe $xy2d = null
-    ) {
-        if ($yplusx === null) {
-            $yplusx = ParagonIE_Sodium_Core32_Curve25519::fe_0();
-        }
-        $this->yplusx = $yplusx;
-        if ($yminusx === null) {
-            $yminusx = ParagonIE_Sodium_Core32_Curve25519::fe_0();
-        }
-        $this->yminusx = $yminusx;
-        if ($xy2d === null) {
-            $xy2d = ParagonIE_Sodium_Core32_Curve25519::fe_0();
-        }
-        $this->xy2d = $xy2d;
-    }
-}

diff --git a/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core32/Curve25519/H.php b/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core32/Curve25519/H.php
deleted file mode 100644 (file)
index 48c999a..0000000
--- a/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core32/Curve25519/H.php
+++ /dev/null
@@ -1,1467 +0,0 @@
-<?php
-
-if (class_exists('ParagonIE_Sodium_Core32_Curve25519_H', false)) {
-    return;
-}
-
-/**
- * Class ParagonIE_Sodium_Core32_Curve25519_H
- *
- * This just contains the constants in the ref10/base.h file
- */
-class ParagonIE_Sodium_Core32_Curve25519_H extends ParagonIE_Sodium_Core32_Util
-{
-    /**
-     * See: libsodium's crypto_core/curve25519/ref10/base.h
-     *
-     * @var array<int, array<int, array<int, array<int, int>>>> Basically, int[32][8][3][10]
-     */
-    protected static $base = array(
-        array(
-            array(
-                array(25967493, -14356035, 29566456, 3660896, -12694345, 4014787, 27544626, -11754271, -6079156, 2047605),
-                array(-12545711, 934262, -2722910, 3049990, -727428, 9406986, 12720692, 5043384, 19500929, -15469378),
-                array(-8738181, 4489570, 9688441, -14785194, 10184609, -12363380, 29287919, 11864899, -24514362, -4438546),
-            ),
-            array(
-                array(-12815894, -12976347, -21581243, 11784320, -25355658, -2750717, -11717903, -3814571, -358445, -10211303),
-                array(-21703237, 6903825, 27185491, 6451973, -29577724, -9554005, -15616551, 11189268, -26829678, -5319081),
-                array(26966642, 11152617, 32442495, 15396054, 14353839, -12752335, -3128826, -9541118, -15472047, -4166697),
-            ),
-            array(
-                array(15636291, -9688557, 24204773, -7912398, 616977, -16685262, 27787600, -14772189, 28944400, -1550024),
-                array(16568933, 4717097, -11556148, -1102322, 15682896, -11807043, 16354577, -11775962, 7689662, 11199574),
-                array(30464156, -5976125, -11779434, -15670865, 23220365, 15915852, 7512774, 10017326, -17749093, -9920357),
-            ),
-            array(
-                array(-17036878, 13921892, 10945806, -6033431, 27105052, -16084379, -28926210, 15006023, 3284568, -6276540),
-                array(23599295, -8306047, -11193664, -7687416, 13236774, 10506355, 7464579, 9656445, 13059162, 10374397),
-                array(7798556, 16710257, 3033922, 2874086, 28997861, 2835604, 32406664, -3839045, -641708, -101325),
-            ),
-            array(
-                array(10861363, 11473154, 27284546, 1981175, -30064349, 12577861, 32867885, 14515107, -15438304, 10819380),
-                array(4708026, 6336745, 20377586, 9066809, -11272109, 6594696, -25653668, 12483688, -12668491, 5581306),
-                array(19563160, 16186464, -29386857, 4097519, 10237984, -4348115, 28542350, 13850243, -23678021, -15815942),
-            ),
-            array(
-                array(-15371964, -12862754, 32573250, 4720197, -26436522, 5875511, -19188627, -15224819, -9818940, -12085777),
-                array(-8549212, 109983, 15149363, 2178705, 22900618, 4543417, 3044240, -15689887, 1762328, 14866737),
-                array(-18199695, -15951423, -10473290, 1707278, -17185920, 3916101, -28236412, 3959421, 27914454, 4383652),
-            ),
-            array(
-                array(5153746, 9909285, 1723747, -2777874, 30523605, 5516873, 19480852, 5230134, -23952439, -15175766),
-                array(-30269007, -3463509, 7665486, 10083793, 28475525, 1649722, 20654025, 16520125, 30598449, 7715701),
-                array(28881845, 14381568, 9657904, 3680757, -20181635, 7843316, -31400660, 1370708, 29794553, -1409300),
-            ),
-            array(
-                array(14499471, -2729599, -33191113, -4254652, 28494862, 14271267, 30290735, 10876454, -33154098, 2381726),
-                array(-7195431, -2655363, -14730155, 462251, -27724326, 3941372, -6236617, 3696005, -32300832, 15351955),
-                array(27431194, 8222322, 16448760, -3907995, -18707002, 11938355, -32961401, -2970515, 29551813, 10109425),
-            ),
-        ),
-        array(
-            array(
-                array(-13657040, -13155431, -31283750, 11777098, 21447386, 6519384, -2378284, -1627556, 10092783, -4764171),
-                array(27939166, 14210322, 4677035, 16277044, -22964462, -12398139, -32508754, 12005538, -17810127, 12803510),
-                array(17228999, -15661624, -1233527, 300140, -1224870, -11714777, 30364213, -9038194, 18016357, 4397660),
-            ),
-            array(
-                array(-10958843, -7690207, 4776341, -14954238, 27850028, -15602212, -26619106, 14544525, -17477504, 982639),
-                array(29253598, 15796703, -2863982, -9908884, 10057023, 3163536, 7332899, -4120128, -21047696, 9934963),
-                array(5793303, 16271923, -24131614, -10116404, 29188560, 1206517, -14747930, 4559895, -30123922, -10897950),
-            ),
-            array(
-                array(-27643952, -11493006, 16282657, -11036493, 28414021, -15012264, 24191034, 4541697, -13338309, 5500568),
-                array(12650548, -1497113, 9052871, 11355358, -17680037, -8400164, -17430592, 12264343, 10874051, 13524335),
-                array(25556948, -3045990, 714651, 2510400, 23394682, -10415330, 33119038, 5080568, -22528059, 5376628),
-            ),
-            array(
-                array(-26088264, -4011052, -17013699, -3537628, -6726793, 1920897, -22321305, -9447443, 4535768, 1569007),
-                array(-2255422, 14606630, -21692440, -8039818, 28430649, 8775819, -30494562, 3044290, 31848280, 12543772),
-                array(-22028579, 2943893, -31857513, 6777306, 13784462, -4292203, -27377195, -2062731, 7718482, 14474653),
-            ),
-            array(
-                array(2385315, 2454213, -22631320, 46603, -4437935, -15680415, 656965, -7236665, 24316168, -5253567),
-                array(13741529, 10911568, -33233417, -8603737, -20177830, -1033297, 33040651, -13424532, -20729456, 8321686),
-                array(21060490, -2212744, 15712757, -4336099, 1639040, 10656336, 23845965, -11874838, -9984458, 608372),
-            ),
-            array(
-                array(-13672732, -15087586, -10889693, -7557059, -6036909, 11305547, 1123968, -6780577, 27229399, 23887),
-                array(-23244140, -294205, -11744728, 14712571, -29465699, -2029617, 12797024, -6440308, -1633405, 16678954),
-                array(-29500620, 4770662, -16054387, 14001338, 7830047, 9564805, -1508144, -4795045, -17169265, 4904953),
-            ),
-            array(
-                array(24059557, 14617003, 19037157, -15039908, 19766093, -14906429, 5169211, 16191880, 2128236, -4326833),
-                array(-16981152, 4124966, -8540610, -10653797, 30336522, -14105247, -29806336, 916033, -6882542, -2986532),
-                array(-22630907, 12419372, -7134229, -7473371, -16478904, 16739175, 285431, 2763829, 15736322, 4143876),
-            ),
-            array(
-                array(2379352, 11839345, -4110402, -5988665, 11274298, 794957, 212801, -14594663, 23527084, -16458268),
-                array(33431127, -11130478, -17838966, -15626900, 8909499, 8376530, -32625340, 4087881, -15188911, -14416214),
-                array(1767683, 7197987, -13205226, -2022635, -13091350, 448826, 5799055, 4357868, -4774191, -16323038),
-            ),
-        ),
-        array(
-            array(
-                array(6721966, 13833823, -23523388, -1551314, 26354293, -11863321, 23365147, -3949732, 7390890, 2759800),
-                array(4409041, 2052381, 23373853, 10530217, 7676779, -12885954, 21302353, -4264057, 1244380, -12919645),
-                array(-4421239, 7169619, 4982368, -2957590, 30256825, -2777540, 14086413, 9208236, 15886429, 16489664),
-            ),
-            array(
-                array(1996075, 10375649, 14346367, 13311202, -6874135, -16438411, -13693198, 398369, -30606455, -712933),
-                array(-25307465, 9795880, -2777414, 14878809, -33531835, 14780363, 13348553, 12076947, -30836462, 5113182),
-                array(-17770784, 11797796, 31950843, 13929123, -25888302, 12288344, -30341101, -7336386, 13847711, 5387222),
-            ),
-            array(
-                array(-18582163, -3416217, 17824843, -2340966, 22744343, -10442611, 8763061, 3617786, -19600662, 10370991),
-                array(20246567, -14369378, 22358229, -543712, 18507283, -10413996, 14554437, -8746092, 32232924, 16763880),
-                array(9648505, 10094563, 26416693, 14745928, -30374318, -6472621, 11094161, 15689506, 3140038, -16510092),
-            ),
-            array(
-                array(-16160072, 5472695, 31895588, 4744994, 8823515, 10365685, -27224800, 9448613, -28774454, 366295),
-                array(19153450, 11523972, -11096490, -6503142, -24647631, 5420647, 28344573, 8041113, 719605, 11671788),
-                array(8678025, 2694440, -6808014, 2517372, 4964326, 11152271, -15432916, -15266516, 27000813, -10195553),
-            ),
-            array(
-                array(-15157904, 7134312, 8639287, -2814877, -7235688, 10421742, 564065, 5336097, 6750977, -14521026),
-                array(11836410, -3979488, 26297894, 16080799, 23455045, 15735944, 1695823, -8819122, 8169720, 16220347),
-                array(-18115838, 8653647, 17578566, -6092619, -8025777, -16012763, -11144307, -2627664, -5990708, -14166033),
-            ),
-            array(
-                array(-23308498, -10968312, 15213228, -10081214, -30853605, -11050004, 27884329, 2847284, 2655861, 1738395),
-                array(-27537433, -14253021, -25336301, -8002780, -9370762, 8129821, 21651608, -3239336, -19087449, -11005278),
-                array(1533110, 3437855, 23735889, 459276, 29970501, 11335377, 26030092, 5821408, 10478196, 8544890),
-            ),
-            array(
-                array(32173121, -16129311, 24896207, 3921497, 22579056, -3410854, 19270449, 12217473, 17789017, -3395995),
-                array(-30552961, -2228401, -15578829, -10147201, 13243889, 517024, 15479401, -3853233, 30460520, 1052596),
-                array(-11614875, 13323618, 32618793, 8175907, -15230173, 12596687, 27491595, -4612359, 3179268, -9478891),
-            ),
-            array(
-                array(31947069, -14366651, -4640583, -15339921, -15125977, -6039709, -14756777, -16411740, 19072640, -9511060),
-                array(11685058, 11822410, 3158003, -13952594, 33402194, -4165066, 5977896, -5215017, 473099, 5040608),
-                array(-20290863, 8198642, -27410132, 11602123, 1290375, -2799760, 28326862, 1721092, -19558642, -3131606),
-            ),
-        ),
-        array(
-            array(
-                array(7881532, 10687937, 7578723, 7738378, -18951012, -2553952, 21820786, 8076149, -27868496, 11538389),
-                array(-19935666, 3899861, 18283497, -6801568, -15728660, -11249211, 8754525, 7446702, -5676054, 5797016),
-                array(-11295600, -3793569, -15782110, -7964573, 12708869, -8456199, 2014099, -9050574, -2369172, -5877341),
-            ),
-            array(
-                array(-22472376, -11568741, -27682020, 1146375, 18956691, 16640559, 1192730, -3714199, 15123619, 10811505),
-                array(14352098, -3419715, -18942044, 10822655, 32750596, 4699007, -70363, 15776356, -28886779, -11974553),
-                array(-28241164, -8072475, -4978962, -5315317, 29416931, 1847569, -20654173, -16484855, 4714547, -9600655),
-            ),
-            array(
-                array(15200332, 8368572, 19679101, 15970074, -31872674, 1959451, 24611599, -4543832, -11745876, 12340220),
-                array(12876937, -10480056, 33134381, 6590940, -6307776, 14872440, 9613953, 8241152, 15370987, 9608631),
-                array(-4143277, -12014408, 8446281, -391603, 4407738, 13629032, -7724868, 15866074, -28210621, -8814099),
-            ),
-            array(
-                array(26660628, -15677655, 8393734, 358047, -7401291, 992988, -23904233, 858697, 20571223, 8420556),
-                array(14620715, 13067227, -15447274, 8264467, 14106269, 15080814, 33531827, 12516406, -21574435, -12476749),
-                array(236881, 10476226, 57258, -14677024, 6472998, 2466984, 17258519, 7256740, 8791136, 15069930),
-            ),
-            array(
-                array(1276410, -9371918, 22949635, -16322807, -23493039, -5702186, 14711875, 4874229, -30663140, -2331391),
-                array(5855666, 4990204, -13711848, 7294284, -7804282, 1924647, -1423175, -7912378, -33069337, 9234253),
-                array(20590503, -9018988, 31529744, -7352666, -2706834, 10650548, 31559055, -11609587, 18979186, 13396066),
-            ),
-            array(
-                array(24474287, 4968103, 22267082, 4407354, 24063882, -8325180, -18816887, 13594782, 33514650, 7021958),
-                array(-11566906, -6565505, -21365085, 15928892, -26158305, 4315421, -25948728, -3916677, -21480480, 12868082),
-                array(-28635013, 13504661, 19988037, -2132761, 21078225, 6443208, -21446107, 2244500, -12455797, -8089383),
-            ),
-            array(
-                array(-30595528, 13793479, -5852820, 319136, -25723172, -6263899, 33086546, 8957937, -15233648, 5540521),
-                array(-11630176, -11503902, -8119500, -7643073, 2620056, 1022908, -23710744, -1568984, -16128528, -14962807),
-                array(23152971, 775386, 27395463, 14006635, -9701118, 4649512, 1689819, 892185, -11513277, -15205948),
-            ),
-            array(
-                array(9770129, 9586738, 26496094, 4324120, 1556511, -3550024, 27453819, 4763127, -19179614, 5867134),
-                array(-32765025, 1927590, 31726409, -4753295, 23962434, -16019500, 27846559, 5931263, -29749703, -16108455),
-                array(27461885, -2977536, 22380810, 1815854, -23033753, -3031938, 7283490, -15148073, -19526700, 7734629),
-            ),
-        ),
-        array(
-            array(
-                array(-8010264, -9590817, -11120403, 6196038, 29344158, -13430885, 7585295, -3176626, 18549497, 15302069),
-                array(-32658337, -6171222, -7672793, -11051681, 6258878, 13504381, 10458790, -6418461, -8872242, 8424746),
-                array(24687205, 8613276, -30667046, -3233545, 1863892, -1830544, 19206234, 7134917, -11284482, -828919),
-            ),
-            array(
-                array(11334899, -9218022, 8025293, 12707519, 17523892, -10476071, 10243738, -14685461, -5066034, 16498837),
-                array(8911542, 6887158, -9584260, -6958590, 11145641, -9543680, 17303925, -14124238, 6536641, 10543906),
-                array(-28946384, 15479763, -17466835, 568876, -1497683, 11223454, -2669190, -16625574, -27235709, 8876771),
-            ),
-            array(
-                array(-25742899, -12566864, -15649966, -846607, -33026686, -796288, -33481822, 15824474, -604426, -9039817),
-                array(10330056, 70051, 7957388, -9002667, 9764902, 15609756, 27698697, -4890037, 1657394, 3084098),
-                array(10477963, -7470260, 12119566, -13250805, 29016247, -5365589, 31280319, 14396151, -30233575, 15272409),
-            ),
-            array(
-                array(-12288309, 3169463, 28813183, 16658753, 25116432, -5630466, -25173957, -12636138, -25014757, 1950504),
-                array(-26180358, 9489187, 11053416, -14746161, -31053720, 5825630, -8384306, -8767532, 15341279, 8373727),
-                array(28685821, 7759505, -14378516, -12002860, -31971820, 4079242, 298136, -10232602, -2878207, 15190420),
-            ),
-            array(
-                array(-32932876, 13806336, -14337485, -15794431, -24004620, 10940928, 8669718, 2742393, -26033313, -6875003),
-                array(-1580388, -11729417, -25979658, -11445023, -17411874, -10912854, 9291594, -16247779, -12154742, 6048605),
-                array(-30305315, 14843444, 1539301, 11864366, 20201677, 1900163, 13934231, 5128323, 11213262, 9168384),
-            ),
-            array(
-                array(-26280513, 11007847, 19408960, -940758, -18592965, -4328580, -5088060, -11105150, 20470157, -16398701),
-                array(-23136053, 9282192, 14855179, -15390078, -7362815, -14408560, -22783952, 14461608, 14042978, 5230683),
-                array(29969567, -2741594, -16711867, -8552442, 9175486, -2468974, 21556951, 3506042, -5933891, -12449708),
-            ),
-            array(
-                array(-3144746, 8744661, 19704003, 4581278, -20430686, 6830683, -21284170, 8971513, -28539189, 15326563),
-                array(-19464629, 10110288, -17262528, -3503892, -23500387, 1355669, -15523050, 15300988, -20514118, 9168260),
-                array(-5353335, 4488613, -23803248, 16314347, 7780487, -15638939, -28948358, 9601605, 33087103, -9011387),
-            ),
-            array(
-                array(-19443170, -15512900, -20797467, -12445323, -29824447, 10229461, -27444329, -15000531, -5996870, 15664672),
-                array(23294591, -16632613, -22650781, -8470978, 27844204, 11461195, 13099750, -2460356, 18151676, 13417686),
-                array(-24722913, -4176517, -31150679, 5988919, -26858785, 6685065, 1661597, -12551441, 15271676, -15452665),
-            ),
-        ),
-        array(
-            array(
-                array(11433042, -13228665, 8239631, -5279517, -1985436, -725718, -18698764, 2167544, -6921301, -13440182),
-                array(-31436171, 15575146, 30436815, 12192228, -22463353, 9395379, -9917708, -8638997, 12215110, 12028277),
-                array(14098400, 6555944, 23007258, 5757252, -15427832, -12950502, 30123440, 4617780, -16900089, -655628),
-            ),
-            array(
-                array(-4026201, -15240835, 11893168, 13718664, -14809462, 1847385, -15819999, 10154009, 23973261, -12684474),
-                array(-26531820, -3695990, -1908898, 2534301, -31870557, -16550355, 18341390, -11419951, 32013174, -10103539),
-                array(-25479301, 10876443, -11771086, -14625140, -12369567, 1838104, 21911214, 6354752, 4425632, -837822),
-            ),
-            array(
-                array(-10433389, -14612966, 22229858, -3091047, -13191166, 776729, -17415375, -12020462, 4725005, 14044970),
-                array(19268650, -7304421, 1555349, 8692754, -21474059, -9910664, 6347390, -1411784, -19522291, -16109756),
-                array(-24864089, 12986008, -10898878, -5558584, -11312371, -148526, 19541418, 8180106, 9282262, 10282508),
-            ),
-            array(
-                array(-26205082, 4428547, -8661196, -13194263, 4098402, -14165257, 15522535, 8372215, 5542595, -10702683),
-                array(-10562541, 14895633, 26814552, -16673850, -17480754, -2489360, -2781891, 6993761, -18093885, 10114655),
-                array(-20107055, -929418, 31422704, 10427861, -7110749, 6150669, -29091755, -11529146, 25953725, -106158),
-            ),
-            array(
-                array(-4234397, -8039292, -9119125, 3046000, 2101609, -12607294, 19390020, 6094296, -3315279, 12831125),
-                array(-15998678, 7578152, 5310217, 14408357, -33548620, -224739, 31575954, 6326196, 7381791, -2421839),
-                array(-20902779, 3296811, 24736065, -16328389, 18374254, 7318640, 6295303, 8082724, -15362489, 12339664),
-            ),
-            array(
-                array(27724736, 2291157, 6088201, -14184798, 1792727, 5857634, 13848414, 15768922, 25091167, 14856294),
-                array(-18866652, 8331043, 24373479, 8541013, -701998, -9269457, 12927300, -12695493, -22182473, -9012899),
-                array(-11423429, -5421590, 11632845, 3405020, 30536730, -11674039, -27260765, 13866390, 30146206, 9142070),
-            ),
-            array(
-                array(3924129, -15307516, -13817122, -10054960, 12291820, -668366, -27702774, 9326384, -8237858, 4171294),
-                array(-15921940, 16037937, 6713787, 16606682, -21612135, 2790944, 26396185, 3731949, 345228, -5462949),
-                array(-21327538, 13448259, 25284571, 1143661, 20614966, -8849387, 2031539, -12391231, -16253183, -13582083),
-            ),
-            array(
-                array(31016211, -16722429, 26371392, -14451233, -5027349, 14854137, 17477601, 3842657, 28012650, -16405420),
-                array(-5075835, 9368966, -8562079, -4600902, -15249953, 6970560, -9189873, 16292057, -8867157, 3507940),
-                array(29439664, 3537914, 23333589, 6997794, -17555561, -11018068, -15209202, -15051267, -9164929, 6580396),
-            ),
-        ),
-        array(
-            array(
-                array(-12185861, -7679788, 16438269, 10826160, -8696817, -6235611, 17860444, -9273846, -2095802, 9304567),
-                array(20714564, -4336911, 29088195, 7406487, 11426967, -5095705, 14792667, -14608617, 5289421, -477127),
-                array(-16665533, -10650790, -6160345, -13305760, 9192020, -1802462, 17271490, 12349094, 26939669, -3752294),
-            ),
-            array(
-                array(-12889898, 9373458, 31595848, 16374215, 21471720, 13221525, -27283495, -12348559, -3698806, 117887),
-                array(22263325, -6560050, 3984570, -11174646, -15114008, -566785, 28311253, 5358056, -23319780, 541964),
-                array(16259219, 3261970, 2309254, -15534474, -16885711, -4581916, 24134070, -16705829, -13337066, -13552195),
-            ),
-            array(
-                array(9378160, -13140186, -22845982, -12745264, 28198281, -7244098, -2399684, -717351, 690426, 14876244),
-                array(24977353, -314384, -8223969, -13465086, 28432343, -1176353, -13068804, -12297348, -22380984, 6618999),
-                array(-1538174, 11685646, 12944378, 13682314, -24389511, -14413193, 8044829, -13817328, 32239829, -5652762),
-            ),
-            array(
-                array(-18603066, 4762990, -926250, 8885304, -28412480, -3187315, 9781647, -10350059, 32779359, 5095274),
-                array(-33008130, -5214506, -32264887, -3685216, 9460461, -9327423, -24601656, 14506724, 21639561, -2630236),
-                array(-16400943, -13112215, 25239338, 15531969, 3987758, -4499318, -1289502, -6863535, 17874574, 558605),
-            ),
-            array(
-                array(-13600129, 10240081, 9171883, 16131053, -20869254, 9599700, 33499487, 5080151, 2085892, 5119761),
-                array(-22205145, -2519528, -16381601, 414691, -25019550, 2170430, 30634760, -8363614, -31999993, -5759884),
-                array(-6845704, 15791202, 8550074, -1312654, 29928809, -12092256, 27534430, -7192145, -22351378, 12961482),
-            ),
-            array(
-                array(-24492060, -9570771, 10368194, 11582341, -23397293, -2245287, 16533930, 8206996, -30194652, -5159638),
-                array(-11121496, -3382234, 2307366, 6362031, -135455, 8868177, -16835630, 7031275, 7589640, 8945490),
-                array(-32152748, 8917967, 6661220, -11677616, -1192060, -15793393, 7251489, -11182180, 24099109, -14456170),
-            ),
-            array(
-                array(5019558, -7907470, 4244127, -14714356, -26933272, 6453165, -19118182, -13289025, -6231896, -10280736),
-                array(10853594, 10721687, 26480089, 5861829, -22995819, 1972175, -1866647, -10557898, -3363451, -6441124),
-                array(-17002408, 5906790, 221599, -6563147, 7828208, -13248918, 24362661, -2008168, -13866408, 7421392),
-            ),
-            array(
-                array(8139927, -6546497, 32257646, -5890546, 30375719, 1886181, -21175108, 15441252, 28826358, -4123029),
-                array(6267086, 9695052, 7709135, -16603597, -32869068, -1886135, 14795160, -7840124, 13746021, -1742048),
-                array(28584902, 7787108, -6732942, -15050729, 22846041, -7571236, -3181936, -363524, 4771362, -8419958),
-            ),
-        ),
-        array(
-            array(
-                array(24949256, 6376279, -27466481, -8174608, -18646154, -9930606, 33543569, -12141695, 3569627, 11342593),
-                array(26514989, 4740088, 27912651, 3697550, 19331575, -11472339, 6809886, 4608608, 7325975, -14801071),
-                array(-11618399, -14554430, -24321212, 7655128, -1369274, 5214312, -27400540, 10258390, -17646694, -8186692),
-            ),
-            array(
-                array(11431204, 15823007, 26570245, 14329124, 18029990, 4796082, -31446179, 15580664, 9280358, -3973687),
-                array(-160783, -10326257, -22855316, -4304997, -20861367, -13621002, -32810901, -11181622, -15545091, 4387441),
-                array(-20799378, 12194512, 3937617, -5805892, -27154820, 9340370, -24513992, 8548137, 20617071, -7482001),
-            ),
-            array(
-                array(-938825, -3930586, -8714311, 16124718, 24603125, -6225393, -13775352, -11875822, 24345683, 10325460),
-                array(-19855277, -1568885, -22202708, 8714034, 14007766, 6928528, 16318175, -1010689, 4766743, 3552007),
-                array(-21751364, -16730916, 1351763, -803421, -4009670, 3950935, 3217514, 14481909, 10988822, -3994762),
-            ),
-            array(
-                array(15564307, -14311570, 3101243, 5684148, 30446780, -8051356, 12677127, -6505343, -8295852, 13296005),
-                array(-9442290, 6624296, -30298964, -11913677, -4670981, -2057379, 31521204, 9614054, -30000824, 12074674),
-                array(4771191, -135239, 14290749, -13089852, 27992298, 14998318, -1413936, -1556716, 29832613, -16391035),
-            ),
-            array(
-                array(7064884, -7541174, -19161962, -5067537, -18891269, -2912736, 25825242, 5293297, -27122660, 13101590),
-                array(-2298563, 2439670, -7466610, 1719965, -27267541, -16328445, 32512469, -5317593, -30356070, -4190957),
-                array(-30006540, 10162316, -33180176, 3981723, -16482138, -13070044, 14413974, 9515896, 19568978, 9628812),
-            ),
-            array(
-                array(33053803, 199357, 15894591, 1583059, 27380243, -4580435, -17838894, -6106839, -6291786, 3437740),
-                array(-18978877, 3884493, 19469877, 12726490, 15913552, 13614290, -22961733, 70104, 7463304, 4176122),
-                array(-27124001, 10659917, 11482427, -16070381, 12771467, -6635117, -32719404, -5322751, 24216882, 5944158),
-            ),
-            array(
-                array(8894125, 7450974, -2664149, -9765752, -28080517, -12389115, 19345746, 14680796, 11632993, 5847885),
-                array(26942781, -2315317, 9129564, -4906607, 26024105, 11769399, -11518837, 6367194, -9727230, 4782140),
-                array(19916461, -4828410, -22910704, -11414391, 25606324, -5972441, 33253853, 8220911, 6358847, -1873857),
-            ),
-            array(
-                array(801428, -2081702, 16569428, 11065167, 29875704, 96627, 7908388, -4480480, -13538503, 1387155),
-                array(19646058, 5720633, -11416706, 12814209, 11607948, 12749789, 14147075, 15156355, -21866831, 11835260),
-                array(19299512, 1155910, 28703737, 14890794, 2925026, 7269399, 26121523, 15467869, -26560550, 5052483),
-            ),
-        ),
-        array(
-            array(
-                array(-3017432, 10058206, 1980837, 3964243, 22160966, 12322533, -6431123, -12618185, 12228557, -7003677),
-                array(32944382, 14922211, -22844894, 5188528, 21913450, -8719943, 4001465, 13238564, -6114803, 8653815),
-                array(22865569, -4652735, 27603668, -12545395, 14348958, 8234005, 24808405, 5719875, 28483275, 2841751),
-            ),
-            array(
-                array(-16420968, -1113305, -327719, -12107856, 21886282, -15552774, -1887966, -315658, 19932058, -12739203),
-                array(-11656086, 10087521, -8864888, -5536143, -19278573, -3055912, 3999228, 13239134, -4777469, -13910208),
-                array(1382174, -11694719, 17266790, 9194690, -13324356, 9720081, 20403944, 11284705, -14013818, 3093230),
-            ),
-            array(
-                array(16650921, -11037932, -1064178, 1570629, -8329746, 7352753, -302424, 16271225, -24049421, -6691850),
-                array(-21911077, -5927941, -4611316, -5560156, -31744103, -10785293, 24123614, 15193618, -21652117, -16739389),
-                array(-9935934, -4289447, -25279823, 4372842, 2087473, 10399484, 31870908, 14690798, 17361620, 11864968),
-            ),
-            array(
-                array(-11307610, 6210372, 13206574, 5806320, -29017692, -13967200, -12331205, -7486601, -25578460, -16240689),
-                array(14668462, -12270235, 26039039, 15305210, 25515617, 4542480, 10453892, 6577524, 9145645, -6443880),
-                array(5974874, 3053895, -9433049, -10385191, -31865124, 3225009, -7972642, 3936128, -5652273, -3050304),
-            ),
-            array(
-                array(30625386, -4729400, -25555961, -12792866, -20484575, 7695099, 17097188, -16303496, -27999779, 1803632),
-                array(-3553091, 9865099, -5228566, 4272701, -5673832, -16689700, 14911344, 12196514, -21405489, 7047412),
-                array(20093277, 9920966, -11138194, -5343857, 13161587, 12044805, -32856851, 4124601, -32343828, -10257566),
-            ),
-            array(
-                array(-20788824, 14084654, -13531713, 7842147, 19119038, -13822605, 4752377, -8714640, -21679658, 2288038),
-                array(-26819236, -3283715, 29965059, 3039786, -14473765, 2540457, 29457502, 14625692, -24819617, 12570232),
-                array(-1063558, -11551823, 16920318, 12494842, 1278292, -5869109, -21159943, -3498680, -11974704, 4724943),
-            ),
-            array(
-                array(17960970, -11775534, -4140968, -9702530, -8876562, -1410617, -12907383, -8659932, -29576300, 1903856),
-                array(23134274, -14279132, -10681997, -1611936, 20684485, 15770816, -12989750, 3190296, 26955097, 14109738),
-                array(15308788, 5320727, -30113809, -14318877, 22902008, 7767164, 29425325, -11277562, 31960942, 11934971),
-            ),
-            array(
-                array(-27395711, 8435796, 4109644, 12222639, -24627868, 14818669, 20638173, 4875028, 10491392, 1379718),
-                array(-13159415, 9197841, 3875503, -8936108, -1383712, -5879801, 33518459, 16176658, 21432314, 12180697),
-                array(-11787308, 11500838, 13787581, -13832590, -22430679, 10140205, 1465425, 12689540, -10301319, -13872883),
-            ),
-        ),
-        array(
-            array(
-                array(5414091, -15386041, -21007664, 9643570, 12834970, 1186149, -2622916, -1342231, 26128231, 6032912),
-                array(-26337395, -13766162, 32496025, -13653919, 17847801, -12669156, 3604025, 8316894, -25875034, -10437358),
-                array(3296484, 6223048, 24680646, -12246460, -23052020, 5903205, -8862297, -4639164, 12376617, 3188849),
-            ),
-            array(
-                array(29190488, -14659046, 27549113, -1183516, 3520066, -10697301, 32049515, -7309113, -16109234, -9852307),
-                array(-14744486, -9309156, 735818, -598978, -20407687, -5057904, 25246078, -15795669, 18640741, -960977),
-                array(-6928835, -16430795, 10361374, 5642961, 4910474, 12345252, -31638386, -494430, 10530747, 1053335),
-            ),
-            array(
-                array(-29265967, -14186805, -13538216, -12117373, -19457059, -10655384, -31462369, -2948985, 24018831, 15026644),
-                array(-22592535, -3145277, -2289276, 5953843, -13440189, 9425631, 25310643, 13003497, -2314791, -15145616),
-                array(-27419985, -603321, -8043984, -1669117, -26092265, 13987819, -27297622, 187899, -23166419, -2531735),
-            ),
-            array(
-                array(-21744398, -13810475, 1844840, 5021428, -10434399, -15911473, 9716667, 16266922, -5070217, 726099),
-                array(29370922, -6053998, 7334071, -15342259, 9385287, 2247707, -13661962, -4839461, 30007388, -15823341),
-                array(-936379, 16086691, 23751945, -543318, -1167538, -5189036, 9137109, 730663, 9835848, 4555336),
-            ),
-            array(
-                array(-23376435, 1410446, -22253753, -12899614, 30867635, 15826977, 17693930, 544696, -11985298, 12422646),
-                array(31117226, -12215734, -13502838, 6561947, -9876867, -12757670, -5118685, -4096706, 29120153, 13924425),
-                array(-17400879, -14233209, 19675799, -2734756, -11006962, -5858820, -9383939, -11317700, 7240931, -237388),
-            ),
-            array(
-                array(-31361739, -11346780, -15007447, -5856218, -22453340, -12152771, 1222336, 4389483, 3293637, -15551743),
-                array(-16684801, -14444245, 11038544, 11054958, -13801175, -3338533, -24319580, 7733547, 12796905, -6335822),
-                array(-8759414, -10817836, -25418864, 10783769, -30615557, -9746811, -28253339, 3647836, 3222231, -11160462),
-            ),
-            array(
-                array(18606113, 1693100, -25448386, -15170272, 4112353, 10045021, 23603893, -2048234, -7550776, 2484985),
-                array(9255317, -3131197, -12156162, -1004256, 13098013, -9214866, 16377220, -2102812, -19802075, -3034702),
-                array(-22729289, 7496160, -5742199, 11329249, 19991973, -3347502, -31718148, 9936966, -30097688, -10618797),
-            ),
-            array(
-                array(21878590, -5001297, 4338336, 13643897, -3036865, 13160960, 19708896, 5415497, -7360503, -4109293),
-                array(27736861, 10103576, 12500508, 8502413, -3413016, -9633558, 10436918, -1550276, -23659143, -8132100),
-                array(19492550, -12104365, -29681976, -852630, -3208171, 12403437, 30066266, 8367329, 13243957, 8709688),
-            ),
-        ),
-        array(
-            array(
-                array(12015105, 2801261, 28198131, 10151021, 24818120, -4743133, -11194191, -5645734, 5150968, 7274186),
-                array(2831366, -12492146, 1478975, 6122054, 23825128, -12733586, 31097299, 6083058, 31021603, -9793610),
-                array(-2529932, -2229646, 445613, 10720828, -13849527, -11505937, -23507731, 16354465, 15067285, -14147707),
-            ),
-            array(
-                array(7840942, 14037873, -33364863, 15934016, -728213, -3642706, 21403988, 1057586, -19379462, -12403220),
-                array(915865, -16469274, 15608285, -8789130, -24357026, 6060030, -17371319, 8410997, -7220461, 16527025),
-                array(32922597, -556987, 20336074, -16184568, 10903705, -5384487, 16957574, 52992, 23834301, 6588044),
-            ),
-            array(
-                array(32752030, 11232950, 3381995, -8714866, 22652988, -10744103, 17159699, 16689107, -20314580, -1305992),
-                array(-4689649, 9166776, -25710296, -10847306, 11576752, 12733943, 7924251, -2752281, 1976123, -7249027),
-                array(21251222, 16309901, -2983015, -6783122, 30810597, 12967303, 156041, -3371252, 12331345, -8237197),
-            ),
-            array(
-                array(8651614, -4477032, -16085636, -4996994, 13002507, 2950805, 29054427, -5106970, 10008136, -4667901),
-                array(31486080, 15114593, -14261250, 12951354, 14369431, -7387845, 16347321, -13662089, 8684155, -10532952),
-                array(19443825, 11385320, 24468943, -9659068, -23919258, 2187569, -26263207, -6086921, 31316348, 14219878),
-            ),
-            array(
-                array(-28594490, 1193785, 32245219, 11392485, 31092169, 15722801, 27146014, 6992409, 29126555, 9207390),
-                array(32382935, 1110093, 18477781, 11028262, -27411763, -7548111, -4980517, 10843782, -7957600, -14435730),
-                array(2814918, 7836403, 27519878, -7868156, -20894015, -11553689, -21494559, 8550130, 28346258, 1994730),
-            ),
-            array(
-                array(-19578299, 8085545, -14000519, -3948622, 2785838, -16231307, -19516951, 7174894, 22628102, 8115180),
-                array(-30405132, 955511, -11133838, -15078069, -32447087, -13278079, -25651578, 3317160, -9943017, 930272),
-                array(-15303681, -6833769, 28856490, 1357446, 23421993, 1057177, 24091212, -1388970, -22765376, -10650715),
-            ),
-            array(
-                array(-22751231, -5303997, -12907607, -12768866, -15811511, -7797053, -14839018, -16554220, -1867018, 8398970),
-                array(-31969310, 2106403, -4736360, 1362501, 12813763, 16200670, 22981545, -6291273, 18009408, -15772772),
-                array(-17220923, -9545221, -27784654, 14166835, 29815394, 7444469, 29551787, -3727419, 19288549, 1325865),
-            ),
-            array(
-                array(15100157, -15835752, -23923978, -1005098, -26450192, 15509408, 12376730, -3479146, 33166107, -8042750),
-                array(20909231, 13023121, -9209752, 16251778, -5778415, -8094914, 12412151, 10018715, 2213263, -13878373),
-                array(32529814, -11074689, 30361439, -16689753, -9135940, 1513226, 22922121, 6382134, -5766928, 8371348),
-            ),
-        ),
-        array(
-            array(
-                array(9923462, 11271500, 12616794, 3544722, -29998368, -1721626, 12891687, -8193132, -26442943, 10486144),
-                array(-22597207, -7012665, 8587003, -8257861, 4084309, -12970062, 361726, 2610596, -23921530, -11455195),
-                array(5408411, -1136691, -4969122, 10561668, 24145918, 14240566, 31319731, -4235541, 19985175, -3436086),
-            ),
-            array(
-                array(-13994457, 16616821, 14549246, 3341099, 32155958, 13648976, -17577068, 8849297, 65030, 8370684),
-                array(-8320926, -12049626, 31204563, 5839400, -20627288, -1057277, -19442942, 6922164, 12743482, -9800518),
-                array(-2361371, 12678785, 28815050, 4759974, -23893047, 4884717, 23783145, 11038569, 18800704, 255233),
-            ),
-            array(
-                array(-5269658, -1773886, 13957886, 7990715, 23132995, 728773, 13393847, 9066957, 19258688, -14753793),
-                array(-2936654, -10827535, -10432089, 14516793, -3640786, 4372541, -31934921, 2209390, -1524053, 2055794),
-                array(580882, 16705327, 5468415, -2683018, -30926419, -14696000, -7203346, -8994389, -30021019, 7394435),
-            ),
-            array(
-                array(23838809, 1822728, -15738443, 15242727, 8318092, -3733104, -21672180, -3492205, -4821741, 14799921),
-                array(13345610, 9759151, 3371034, -16137791, 16353039, 8577942, 31129804, 13496856, -9056018, 7402518),
-                array(2286874, -4435931, -20042458, -2008336, -13696227, 5038122, 11006906, -15760352, 8205061, 1607563),
-            ),
-            array(
-                array(14414086, -8002132, 3331830, -3208217, 22249151, -5594188, 18364661, -2906958, 30019587, -9029278),
-                array(-27688051, 1585953, -10775053, 931069, -29120221, -11002319, -14410829, 12029093, 9944378, 8024),
-                array(4368715, -3709630, 29874200, -15022983, -20230386, -11410704, -16114594, -999085, -8142388, 5640030),
-            ),
-            array(
-                array(10299610, 13746483, 11661824, 16234854, 7630238, 5998374, 9809887, -16694564, 15219798, -14327783),
-                array(27425505, -5719081, 3055006, 10660664, 23458024, 595578, -15398605, -1173195, -18342183, 9742717),
-                array(6744077, 2427284, 26042789, 2720740, -847906, 1118974, 32324614, 7406442, 12420155, 1994844),
-            ),
-            array(
-                array(14012521, -5024720, -18384453, -9578469, -26485342, -3936439, -13033478, -10909803, 24319929, -6446333),
-                array(16412690, -4507367, 10772641, 15929391, -17068788, -4658621, 10555945, -10484049, -30102368, -4739048),
-                array(22397382, -7767684, -9293161, -12792868, 17166287, -9755136, -27333065, 6199366, 21880021, -12250760),
-            ),
-            array(
-                array(-4283307, 5368523, -31117018, 8163389, -30323063, 3209128, 16557151, 8890729, 8840445, 4957760),
-                array(-15447727, 709327, -6919446, -10870178, -29777922, 6522332, -21720181, 12130072, -14796503, 5005757),
-                array(-2114751, -14308128, 23019042, 15765735, -25269683, 6002752, 10183197, -13239326, -16395286, -2176112),
-            ),
-        ),
-        array(
-            array(
-                array(-19025756, 1632005, 13466291, -7995100, -23640451, 16573537, -32013908, -3057104, 22208662, 2000468),
-                array(3065073, -1412761, -25598674, -361432, -17683065, -5703415, -8164212, 11248527, -3691214, -7414184),
-                array(10379208, -6045554, 8877319, 1473647, -29291284, -12507580, 16690915, 2553332, -3132688, 16400289),
-            ),
-            array(
-                array(15716668, 1254266, -18472690, 7446274, -8448918, 6344164, -22097271, -7285580, 26894937, 9132066),
-                array(24158887, 12938817, 11085297, -8177598, -28063478, -4457083, -30576463, 64452, -6817084, -2692882),
-                array(13488534, 7794716, 22236231, 5989356, 25426474, -12578208, 2350710, -3418511, -4688006, 2364226),
-            ),
-            array(
-                array(16335052, 9132434, 25640582, 6678888, 1725628, 8517937, -11807024, -11697457, 15445875, -7798101),
-                array(29004207, -7867081, 28661402, -640412, -12794003, -7943086, 31863255, -4135540, -278050, -15759279),
-                array(-6122061, -14866665, -28614905, 14569919, -10857999, -3591829, 10343412, -6976290, -29828287, -10815811),
-            ),
-            array(
-                array(27081650, 3463984, 14099042, -4517604, 1616303, -6205604, 29542636, 15372179, 17293797, 960709),
-                array(20263915, 11434237, -5765435, 11236810, 13505955, -10857102, -16111345, 6493122, -19384511, 7639714),
-                array(-2830798, -14839232, 25403038, -8215196, -8317012, -16173699, 18006287, -16043750, 29994677, -15808121),
-            ),
-            array(
-                array(9769828, 5202651, -24157398, -13631392, -28051003, -11561624, -24613141, -13860782, -31184575, 709464),
-                array(12286395, 13076066, -21775189, -1176622, -25003198, 4057652, -32018128, -8890874, 16102007, 13205847),
-                array(13733362, 5599946, 10557076, 3195751, -5557991, 8536970, -25540170, 8525972, 10151379, 10394400),
-            ),
-            array(
-                array(4024660, -16137551, 22436262, 12276534, -9099015, -2686099, 19698229, 11743039, -33302334, 8934414),
-                array(-15879800, -4525240, -8580747, -2934061, 14634845, -698278, -9449077, 3137094, -11536886, 11721158),
-                array(17555939, -5013938, 8268606, 2331751, -22738815, 9761013, 9319229, 8835153, -9205489, -1280045),
-            ),
-            array(
-                array(-461409, -7830014, 20614118, 16688288, -7514766, -4807119, 22300304, 505429, 6108462, -6183415),
-                array(-5070281, 12367917, -30663534, 3234473, 32617080, -8422642, 29880583, -13483331, -26898490, -7867459),
-                array(-31975283, 5726539, 26934134, 10237677, -3173717, -605053, 24199304, 3795095, 7592688, -14992079),
-            ),
-            array(
-                array(21594432, -14964228, 17466408, -4077222, 32537084, 2739898, 6407723, 12018833, -28256052, 4298412),
-                array(-20650503, -11961496, -27236275, 570498, 3767144, -1717540, 13891942, -1569194, 13717174, 10805743),
-                array(-14676630, -15644296, 15287174, 11927123, 24177847, -8175568, -796431, 14860609, -26938930, -5863836),
-            ),
-        ),
-        array(
-            array(
-                array(12962541, 5311799, -10060768, 11658280, 18855286, -7954201, 13286263, -12808704, -4381056, 9882022),
-                array(18512079, 11319350, -20123124, 15090309, 18818594, 5271736, -22727904, 3666879, -23967430, -3299429),
-                array(-6789020, -3146043, 16192429, 13241070, 15898607, -14206114, -10084880, -6661110, -2403099, 5276065),
-            ),
-            array(
-                array(30169808, -5317648, 26306206, -11750859, 27814964, 7069267, 7152851, 3684982, 1449224, 13082861),
-                array(10342826, 3098505, 2119311, 193222, 25702612, 12233820, 23697382, 15056736, -21016438, -8202000),
-                array(-33150110, 3261608, 22745853, 7948688, 19370557, -15177665, -26171976, 6482814, -10300080, -11060101),
-            ),
-            array(
-                array(32869458, -5408545, 25609743, 15678670, -10687769, -15471071, 26112421, 2521008, -22664288, 6904815),
-                array(29506923, 4457497, 3377935, -9796444, -30510046, 12935080, 1561737, 3841096, -29003639, -6657642),
-                array(10340844, -6630377, -18656632, -2278430, 12621151, -13339055, 30878497, -11824370, -25584551, 5181966),
-            ),
-            array(
-                array(25940115, -12658025, 17324188, -10307374, -8671468, 15029094, 24396252, -16450922, -2322852, -12388574),
-                array(-21765684, 9916823, -1300409, 4079498, -1028346, 11909559, 1782390, 12641087, 20603771, -6561742),
-                array(-18882287, -11673380, 24849422, 11501709, 13161720, -4768874, 1925523, 11914390, 4662781, 7820689),
-            ),
-            array(
-                array(12241050, -425982, 8132691, 9393934, 32846760, -1599620, 29749456, 12172924, 16136752, 15264020),
-                array(-10349955, -14680563, -8211979, 2330220, -17662549, -14545780, 10658213, 6671822, 19012087, 3772772),
-                array(3753511, -3421066, 10617074, 2028709, 14841030, -6721664, 28718732, -15762884, 20527771, 12988982),
-            ),
-            array(
-                array(-14822485, -5797269, -3707987, 12689773, -898983, -10914866, -24183046, -10564943, 3299665, -12424953),
-                array(-16777703, -15253301, -9642417, 4978983, 3308785, 8755439, 6943197, 6461331, -25583147, 8991218),
-                array(-17226263, 1816362, -1673288, -6086439, 31783888, -8175991, -32948145, 7417950, -30242287, 1507265),
-            ),
-            array(
-                array(29692663, 6829891, -10498800, 4334896, 20945975, -11906496, -28887608, 8209391, 14606362, -10647073),
-                array(-3481570, 8707081, 32188102, 5672294, 22096700, 1711240, -33020695, 9761487, 4170404, -2085325),
-                array(-11587470, 14855945, -4127778, -1531857, -26649089, 15084046, 22186522, 16002000, -14276837, -8400798),
-            ),
-            array(
-                array(-4811456, 13761029, -31703877, -2483919, -3312471, 7869047, -7113572, -9620092, 13240845, 10965870),
-                array(-7742563, -8256762, -14768334, -13656260, -23232383, 12387166, 4498947, 14147411, 29514390, 4302863),
-                array(-13413405, -12407859, 20757302, -13801832, 14785143, 8976368, -5061276, -2144373, 17846988, -13971927),
-            ),
-        ),
-        array(
-            array(
-                array(-2244452, -754728, -4597030, -1066309, -6247172, 1455299, -21647728, -9214789, -5222701, 12650267),
-                array(-9906797, -16070310, 21134160, 12198166, -27064575, 708126, 387813, 13770293, -19134326, 10958663),
-                array(22470984, 12369526, 23446014, -5441109, -21520802, -9698723, -11772496, -11574455, -25083830, 4271862),
-            ),
-            array(
-                array(-25169565, -10053642, -19909332, 15361595, -5984358, 2159192, 75375, -4278529, -32526221, 8469673),
-                array(15854970, 4148314, -8893890, 7259002, 11666551, 13824734, -30531198, 2697372, 24154791, -9460943),
-                array(15446137, -15806644, 29759747, 14019369, 30811221, -9610191, -31582008, 12840104, 24913809, 9815020),
-            ),
-            array(
-                array(-4709286, -5614269, -31841498, -12288893, -14443537, 10799414, -9103676, 13438769, 18735128, 9466238),
-                array(11933045, 9281483, 5081055, -5183824, -2628162, -4905629, -7727821, -10896103, -22728655, 16199064),
-                array(14576810, 379472, -26786533, -8317236, -29426508, -10812974, -102766, 1876699, 30801119, 2164795),
-            ),
-            array(
-                array(15995086, 3199873, 13672555, 13712240, -19378835, -4647646, -13081610, -15496269, -13492807, 1268052),
-                array(-10290614, -3659039, -3286592, 10948818, 23037027, 3794475, -3470338, -12600221, -17055369, 3565904),
-                array(29210088, -9419337, -5919792, -4952785, 10834811, -13327726, -16512102, -10820713, -27162222, -14030531),
-            ),
-            array(
-                array(-13161890, 15508588, 16663704, -8156150, -28349942, 9019123, -29183421, -3769423, 2244111, -14001979),
-                array(-5152875, -3800936, -9306475, -6071583, 16243069, 14684434, -25673088, -16180800, 13491506, 4641841),
-                array(10813417, 643330, -19188515, -728916, 30292062, -16600078, 27548447, -7721242, 14476989, -12767431),
-            ),
-            array(
-                array(10292079, 9984945, 6481436, 8279905, -7251514, 7032743, 27282937, -1644259, -27912810, 12651324),
-                array(-31185513, -813383, 22271204, 11835308, 10201545, 15351028, 17099662, 3988035, 21721536, -3148940),
-                array(10202177, -6545839, -31373232, -9574638, -32150642, -8119683, -12906320, 3852694, 13216206, 14842320),
-            ),
-            array(
-                array(-15815640, -10601066, -6538952, -7258995, -6984659, -6581778, -31500847, 13765824, -27434397, 9900184),
-                array(14465505, -13833331, -32133984, -14738873, -27443187, 12990492, 33046193, 15796406, -7051866, -8040114),
-                array(30924417, -8279620, 6359016, -12816335, 16508377, 9071735, -25488601, 15413635, 9524356, -7018878),
-            ),
-            array(
-                array(12274201, -13175547, 32627641, -1785326, 6736625, 13267305, 5237659, -5109483, 15663516, 4035784),
-                array(-2951309, 8903985, 17349946, 601635, -16432815, -4612556, -13732739, -15889334, -22258478, 4659091),
-                array(-16916263, -4952973, -30393711, -15158821, 20774812, 15897498, 5736189, 15026997, -2178256, -13455585),
-            ),
-        ),
-        array(
-            array(
-                array(-8858980, -2219056, 28571666, -10155518, -474467, -10105698, -3801496, 278095, 23440562, -290208),
-                array(10226241, -5928702, 15139956, 120818, -14867693, 5218603, 32937275, 11551483, -16571960, -7442864),
-                array(17932739, -12437276, -24039557, 10749060, 11316803, 7535897, 22503767, 5561594, -3646624, 3898661),
-            ),
-            array(
-                array(7749907, -969567, -16339731, -16464, -25018111, 15122143, -1573531, 7152530, 21831162, 1245233),
-                array(26958459, -14658026, 4314586, 8346991, -5677764, 11960072, -32589295, -620035, -30402091, -16716212),
-                array(-12165896, 9166947, 33491384, 13673479, 29787085, 13096535, 6280834, 14587357, -22338025, 13987525),
-            ),
-            array(
-                array(-24349909, 7778775, 21116000, 15572597, -4833266, -5357778, -4300898, -5124639, -7469781, -2858068),
-                array(9681908, -6737123, -31951644, 13591838, -6883821, 386950, 31622781, 6439245, -14581012, 4091397),
-                array(-8426427, 1470727, -28109679, -1596990, 3978627, -5123623, -19622683, 12092163, 29077877, -14741988),
-            ),
-            array(
-                array(5269168, -6859726, -13230211, -8020715, 25932563, 1763552, -5606110, -5505881, -20017847, 2357889),
-                array(32264008, -15407652, -5387735, -1160093, -2091322, -3946900, 23104804, -12869908, 5727338, 189038),
-                array(14609123, -8954470, -6000566, -16622781, -14577387, -7743898, -26745169, 10942115, -25888931, -14884697),
-            ),
-            array(
-                array(20513500, 5557931, -15604613, 7829531, 26413943, -2019404, -21378968, 7471781, 13913677, -5137875),
-                array(-25574376, 11967826, 29233242, 12948236, -6754465, 4713227, -8940970, 14059180, 12878652, 8511905),
-                array(-25656801, 3393631, -2955415, -7075526, -2250709, 9366908, -30223418, 6812974, 5568676, -3127656),
-            ),
-            array(
-                array(11630004, 12144454, 2116339, 13606037, 27378885, 15676917, -17408753, -13504373, -14395196, 8070818),
-                array(27117696, -10007378, -31282771, -5570088, 1127282, 12772488, -29845906, 10483306, -11552749, -1028714),
-                array(10637467, -5688064, 5674781, 1072708, -26343588, -6982302, -1683975, 9177853, -27493162, 15431203),
-            ),
-            array(
-                array(20525145, 10892566, -12742472, 12779443, -29493034, 16150075, -28240519, 14943142, -15056790, -7935931),
-                array(-30024462, 5626926, -551567, -9981087, 753598, 11981191, 25244767, -3239766, -3356550, 9594024),
-                array(-23752644, 2636870, -5163910, -10103818, 585134, 7877383, 11345683, -6492290, 13352335, -10977084),
-            ),
-            array(
-                array(-1931799, -5407458, 3304649, -12884869, 17015806, -4877091, -29783850, -7752482, -13215537, -319204),
-                array(20239939, 6607058, 6203985, 3483793, -18386976, -779229, -20723742, 15077870, -22750759, 14523817),
-                array(27406042, -6041657, 27423596, -4497394, 4996214, 10002360, -28842031, -4545494, -30172742, -4805667),
-            ),
-        ),
-        array(
-            array(
-                array(11374242, 12660715, 17861383, -12540833, 10935568, 1099227, -13886076, -9091740, -27727044, 11358504),
-                array(-12730809, 10311867, 1510375, 10778093, -2119455, -9145702, 32676003, 11149336, -26123651, 4985768),
-                array(-19096303, 341147, -6197485, -239033, 15756973, -8796662, -983043, 13794114, -19414307, -15621255),
-            ),
-            array(
-                array(6490081, 11940286, 25495923, -7726360, 8668373, -8751316, 3367603, 6970005, -1691065, -9004790),
-                array(1656497, 13457317, 15370807, 6364910, 13605745, 8362338, -19174622, -5475723, -16796596, -5031438),
-                array(-22273315, -13524424, -64685, -4334223, -18605636, -10921968, -20571065, -7007978, -99853, -10237333),
-            ),
-            array(
-                array(17747465, 10039260, 19368299, -4050591, -20630635, -16041286, 31992683, -15857976, -29260363, -5511971),
-                array(31932027, -4986141, -19612382, 16366580, 22023614, 88450, 11371999, -3744247, 4882242, -10626905),
-                array(29796507, 37186, 19818052, 10115756, -11829032, 3352736, 18551198, 3272828, -5190932, -4162409),
-            ),
-            array(
-                array(12501286, 4044383, -8612957, -13392385, -32430052, 5136599, -19230378, -3529697, 330070, -3659409),
-                array(6384877, 2899513, 17807477, 7663917, -2358888, 12363165, 25366522, -8573892, -271295, 12071499),
-                array(-8365515, -4042521, 25133448, -4517355, -6211027, 2265927, -32769618, 1936675, -5159697, 3829363),
-            ),
-            array(
-                array(28425966, -5835433, -577090, -4697198, -14217555, 6870930, 7921550, -6567787, 26333140, 14267664),
-                array(-11067219, 11871231, 27385719, -10559544, -4585914, -11189312, 10004786, -8709488, -21761224, 8930324),
-                array(-21197785, -16396035, 25654216, -1725397, 12282012, 11008919, 1541940, 4757911, -26491501, -16408940),
-            ),
-            array(
-                array(13537262, -7759490, -20604840, 10961927, -5922820, -13218065, -13156584, 6217254, -15943699, 13814990),
-                array(-17422573, 15157790, 18705543, 29619, 24409717, -260476, 27361681, 9257833, -1956526, -1776914),
-                array(-25045300, -10191966, 15366585, 15166509, -13105086, 8423556, -29171540, 12361135, -18685978, 4578290),
-            ),
-            array(
-                array(24579768, 3711570, 1342322, -11180126, -27005135, 14124956, -22544529, 14074919, 21964432, 8235257),
-                array(-6528613, -2411497, 9442966, -5925588, 12025640, -1487420, -2981514, -1669206, 13006806, 2355433),
-                array(-16304899, -13605259, -6632427, -5142349, 16974359, -10911083, 27202044, 1719366, 1141648, -12796236),
-            ),
-            array(
-                array(-12863944, -13219986, -8318266, -11018091, -6810145, -4843894, 13475066, -3133972, 32674895, 13715045),
-                array(11423335, -5468059, 32344216, 8962751, 24989809, 9241752, -13265253, 16086212, -28740881, -15642093),
-                array(-1409668, 12530728, -6368726, 10847387, 19531186, -14132160, -11709148, 7791794, -27245943, 4383347),
-            ),
-        ),
-        array(
-            array(
-                array(-28970898, 5271447, -1266009, -9736989, -12455236, 16732599, -4862407, -4906449, 27193557, 6245191),
-                array(-15193956, 5362278, -1783893, 2695834, 4960227, 12840725, 23061898, 3260492, 22510453, 8577507),
-                array(-12632451, 11257346, -32692994, 13548177, -721004, 10879011, 31168030, 13952092, -29571492, -3635906),
-            ),
-            array(
-                array(3877321, -9572739, 32416692, 5405324, -11004407, -13656635, 3759769, 11935320, 5611860, 8164018),
-                array(-16275802, 14667797, 15906460, 12155291, -22111149, -9039718, 32003002, -8832289, 5773085, -8422109),
-                array(-23788118, -8254300, 1950875, 8937633, 18686727, 16459170, -905725, 12376320, 31632953, 190926),
-            ),
-            array(
-                array(-24593607, -16138885, -8423991, 13378746, 14162407, 6901328, -8288749, 4508564, -25341555, -3627528),
-                array(8884438, -5884009, 6023974, 10104341, -6881569, -4941533, 18722941, -14786005, -1672488, 827625),
-                array(-32720583, -16289296, -32503547, 7101210, 13354605, 2659080, -1800575, -14108036, -24878478, 1541286),
-            ),
-            array(
-                array(2901347, -1117687, 3880376, -10059388, -17620940, -3612781, -21802117, -3567481, 20456845, -1885033),
-                array(27019610, 12299467, -13658288, -1603234, -12861660, -4861471, -19540150, -5016058, 29439641, 15138866),
-                array(21536104, -6626420, -32447818, -10690208, -22408077, 5175814, -5420040, -16361163, 7779328, 109896),
-            ),
-            array(
-                array(30279744, 14648750, -8044871, 6425558, 13639621, -743509, 28698390, 12180118, 23177719, -554075),
-                array(26572847, 3405927, -31701700, 12890905, -19265668, 5335866, -6493768, 2378492, 4439158, -13279347),
-                array(-22716706, 3489070, -9225266, -332753, 18875722, -1140095, 14819434, -12731527, -17717757, -5461437),
-            ),
-            array(
-                array(-5056483, 16566551, 15953661, 3767752, -10436499, 15627060, -820954, 2177225, 8550082, -15114165),
-                array(-18473302, 16596775, -381660, 15663611, 22860960, 15585581, -27844109, -3582739, -23260460, -8428588),
-                array(-32480551, 15707275, -8205912, -5652081, 29464558, 2713815, -22725137, 15860482, -21902570, 1494193),
-            ),
-            array(
-                array(-19562091, -14087393, -25583872, -9299552, 13127842, 759709, 21923482, 16529112, 8742704, 12967017),
-                array(-28464899, 1553205, 32536856, -10473729, -24691605, -406174, -8914625, -2933896, -29903758, 15553883),
-                array(21877909, 3230008, 9881174, 10539357, -4797115, 2841332, 11543572, 14513274, 19375923, -12647961),
-            ),
-            array(
-                array(8832269, -14495485, 13253511, 5137575, 5037871, 4078777, 24880818, -6222716, 2862653, 9455043),
-                array(29306751, 5123106, 20245049, -14149889, 9592566, 8447059, -2077124, -2990080, 15511449, 4789663),
-                array(-20679756, 7004547, 8824831, -9434977, -4045704, -3750736, -5754762, 108893, 23513200, 16652362),
-            ),
-        ),
-        array(
-            array(
-                array(-33256173, 4144782, -4476029, -6579123, 10770039, -7155542, -6650416, -12936300, -18319198, 10212860),
-                array(2756081, 8598110, 7383731, -6859892, 22312759, -1105012, 21179801, 2600940, -9988298, -12506466),
-                array(-24645692, 13317462, -30449259, -15653928, 21365574, -10869657, 11344424, 864440, -2499677, -16710063),
-            ),
-            array(
-                array(-26432803, 6148329, -17184412, -14474154, 18782929, -275997, -22561534, 211300, 2719757, 4940997),
-                array(-1323882, 3911313, -6948744, 14759765, -30027150, 7851207, 21690126, 8518463, 26699843, 5276295),
-                array(-13149873, -6429067, 9396249, 365013, 24703301, -10488939, 1321586, 149635, -15452774, 7159369),
-            ),
-            array(
-                array(9987780, -3404759, 17507962, 9505530, 9731535, -2165514, 22356009, 8312176, 22477218, -8403385),
-                array(18155857, -16504990, 19744716, 9006923, 15154154, -10538976, 24256460, -4864995, -22548173, 9334109),
-                array(2986088, -4911893, 10776628, -3473844, 10620590, -7083203, -21413845, 14253545, -22587149, 536906),
-            ),
-            array(
-                array(4377756, 8115836, 24567078, 15495314, 11625074, 13064599, 7390551, 10589625, 10838060, -15420424),
-                array(-19342404, 867880, 9277171, -3218459, -14431572, -1986443, 19295826, -15796950, 6378260, 699185),
-                array(7895026, 4057113, -7081772, -13077756, -17886831, -323126, -716039, 15693155, -5045064, -13373962),
-            ),
-            array(
-                array(-7737563, -5869402, -14566319, -7406919, 11385654, 13201616, 31730678, -10962840, -3918636, -9669325),
-                array(10188286, -15770834, -7336361, 13427543, 22223443, 14896287, 30743455, 7116568, -21786507, 5427593),
-                array(696102, 13206899, 27047647, -10632082, 15285305, -9853179, 10798490, -4578720, 19236243, 12477404),
-            ),
-            array(
-                array(-11229439, 11243796, -17054270, -8040865, -788228, -8167967, -3897669, 11180504, -23169516, 7733644),
-                array(17800790, -14036179, -27000429, -11766671, 23887827, 3149671, 23466177, -10538171, 10322027, 15313801),
-                array(26246234, 11968874, 32263343, -5468728, 6830755, -13323031, -15794704, -101982, -24449242, 10890804),
-            ),
-            array(
-                array(-31365647, 10271363, -12660625, -6267268, 16690207, -13062544, -14982212, 16484931, 25180797, -5334884),
-                array(-586574, 10376444, -32586414, -11286356, 19801893, 10997610, 2276632, 9482883, 316878, 13820577),
-                array(-9882808, -4510367, -2115506, 16457136, -11100081, 11674996, 30756178, -7515054, 30696930, -3712849),
-            ),
-            array(
-                array(32988917, -9603412, 12499366, 7910787, -10617257, -11931514, -7342816, -9985397, -32349517, 7392473),
-                array(-8855661, 15927861, 9866406, -3649411, -2396914, -16655781, -30409476, -9134995, 25112947, -2926644),
-                array(-2504044, -436966, 25621774, -5678772, 15085042, -5479877, -24884878, -13526194, 5537438, -13914319),
-            ),
-        ),
-        array(
-            array(
-                array(-11225584, 2320285, -9584280, 10149187, -33444663, 5808648, -14876251, -1729667, 31234590, 6090599),
-                array(-9633316, 116426, 26083934, 2897444, -6364437, -2688086, 609721, 15878753, -6970405, -9034768),
-                array(-27757857, 247744, -15194774, -9002551, 23288161, -10011936, -23869595, 6503646, 20650474, 1804084),
-            ),
-            array(
-                array(-27589786, 15456424, 8972517, 8469608, 15640622, 4439847, 3121995, -10329713, 27842616, -202328),
-                array(-15306973, 2839644, 22530074, 10026331, 4602058, 5048462, 28248656, 5031932, -11375082, 12714369),
-                array(20807691, -7270825, 29286141, 11421711, -27876523, -13868230, -21227475, 1035546, -19733229, 12796920),
-            ),
-            array(
-                array(12076899, -14301286, -8785001, -11848922, -25012791, 16400684, -17591495, -12899438, 3480665, -15182815),
-                array(-32361549, 5457597, 28548107, 7833186, 7303070, -11953545, -24363064, -15921875, -33374054, 2771025),
-                array(-21389266, 421932, 26597266, 6860826, 22486084, -6737172, -17137485, -4210226, -24552282, 15673397),
-            ),
-            array(
-                array(-20184622, 2338216, 19788685, -9620956, -4001265, -8740893, -20271184, 4733254, 3727144, -12934448),
-                array(6120119, 814863, -11794402, -622716, 6812205, -15747771, 2019594, 7975683, 31123697, -10958981),
-                array(30069250, -11435332, 30434654, 2958439, 18399564, -976289, 12296869, 9204260, -16432438, 9648165),
-            ),
-            array(
-                array(32705432, -1550977, 30705658, 7451065, -11805606, 9631813, 3305266, 5248604, -26008332, -11377501),
-                array(17219865, 2375039, -31570947, -5575615, -19459679, 9219903, 294711, 15298639, 2662509, -16297073),
-                array(-1172927, -7558695, -4366770, -4287744, -21346413, -8434326, 32087529, -1222777, 32247248, -14389861),
-            ),
-            array(
-                array(14312628, 1221556, 17395390, -8700143, -4945741, -8684635, -28197744, -9637817, -16027623, -13378845),
-                array(-1428825, -9678990, -9235681, 6549687, -7383069, -468664, 23046502, 9803137, 17597934, 2346211),
-                array(18510800, 15337574, 26171504, 981392, -22241552, 7827556, -23491134, -11323352, 3059833, -11782870),
-            ),
-            array(
-                array(10141598, 6082907, 17829293, -1947643, 9830092, 13613136, -25556636, -5544586, -33502212, 3592096),
-                array(33114168, -15889352, -26525686, -13343397, 33076705, 8716171, 1151462, 1521897, -982665, -6837803),
-                array(-32939165, -4255815, 23947181, -324178, -33072974, -12305637, -16637686, 3891704, 26353178, 693168),
-            ),
-            array(
-                array(30374239, 1595580, -16884039, 13186931, 4600344, 406904, 9585294, -400668, 31375464, 14369965),
-                array(-14370654, -7772529, 1510301, 6434173, -18784789, -6262728, 32732230, -13108839, 17901441, 16011505),
-                array(18171223, -11934626, -12500402, 15197122, -11038147, -15230035, -19172240, -16046376, 8764035, 12309598),
-            ),
-        ),
-        array(
-            array(
-                array(5975908, -5243188, -19459362, -9681747, -11541277, 14015782, -23665757, 1228319, 17544096, -10593782),
-                array(5811932, -1715293, 3442887, -2269310, -18367348, -8359541, -18044043, -15410127, -5565381, 12348900),
-                array(-31399660, 11407555, 25755363, 6891399, -3256938, 14872274, -24849353, 8141295, -10632534, -585479),
-            ),
-            array(
-                array(-12675304, 694026, -5076145, 13300344, 14015258, -14451394, -9698672, -11329050, 30944593, 1130208),
-                array(8247766, -6710942, -26562381, -7709309, -14401939, -14648910, 4652152, 2488540, 23550156, -271232),
-                array(17294316, -3788438, 7026748, 15626851, 22990044, 113481, 2267737, -5908146, -408818, -137719),
-            ),
-            array(
-                array(16091085, -16253926, 18599252, 7340678, 2137637, -1221657, -3364161, 14550936, 3260525, -7166271),
-                array(-4910104, -13332887, 18550887, 10864893, -16459325, -7291596, -23028869, -13204905, -12748722, 2701326),
-                array(-8574695, 16099415, 4629974, -16340524, -20786213, -6005432, -10018363, 9276971, 11329923, 1862132),
-            ),
-            array(
-                array(14763076, -15903608, -30918270, 3689867, 3511892, 10313526, -21951088, 12219231, -9037963, -940300),
-                array(8894987, -3446094, 6150753, 3013931, 301220, 15693451, -31981216, -2909717, -15438168, 11595570),
-                array(15214962, 3537601, -26238722, -14058872, 4418657, -15230761, 13947276, 10730794, -13489462, -4363670),
-            ),
-            array(
-                array(-2538306, 7682793, 32759013, 263109, -29984731, -7955452, -22332124, -10188635, 977108, 699994),
-                array(-12466472, 4195084, -9211532, 550904, -15565337, 12917920, 19118110, -439841, -30534533, -14337913),
-                array(31788461, -14507657, 4799989, 7372237, 8808585, -14747943, 9408237, -10051775, 12493932, -5409317),
-            ),
-            array(
-                array(-25680606, 5260744, -19235809, -6284470, -3695942, 16566087, 27218280, 2607121, 29375955, 6024730),
-                array(842132, -2794693, -4763381, -8722815, 26332018, -12405641, 11831880, 6985184, -9940361, 2854096),
-                array(-4847262, -7969331, 2516242, -5847713, 9695691, -7221186, 16512645, 960770, 12121869, 16648078),
-            ),
-            array(
-                array(-15218652, 14667096, -13336229, 2013717, 30598287, -464137, -31504922, -7882064, 20237806, 2838411),
-                array(-19288047, 4453152, 15298546, -16178388, 22115043, -15972604, 12544294, -13470457, 1068881, -12499905),
-                array(-9558883, -16518835, 33238498, 13506958, 30505848, -1114596, -8486907, -2630053, 12521378, 4845654),
-            ),
-            array(
-                array(-28198521, 10744108, -2958380, 10199664, 7759311, -13088600, 3409348, -873400, -6482306, -12885870),
-                array(-23561822, 6230156, -20382013, 10655314, -24040585, -11621172, 10477734, -1240216, -3113227, 13974498),
-                array(12966261, 15550616, -32038948, -1615346, 21025980, -629444, 5642325, 7188737, 18895762, 12629579),
-            ),
-        ),
-        array(
-            array(
-                array(14741879, -14946887, 22177208, -11721237, 1279741, 8058600, 11758140, 789443, 32195181, 3895677),
-                array(10758205, 15755439, -4509950, 9243698, -4879422, 6879879, -2204575, -3566119, -8982069, 4429647),
-                array(-2453894, 15725973, -20436342, -10410672, -5803908, -11040220, -7135870, -11642895, 18047436, -15281743),
-            ),
-            array(
-                array(-25173001, -11307165, 29759956, 11776784, -22262383, -15820455, 10993114, -12850837, -17620701, -9408468),
-                array(21987233, 700364, -24505048, 14972008, -7774265, -5718395, 32155026, 2581431, -29958985, 8773375),
-                array(-25568350, 454463, -13211935, 16126715, 25240068, 8594567, 20656846, 12017935, -7874389, -13920155),
-            ),
-            array(
-                array(6028182, 6263078, -31011806, -11301710, -818919, 2461772, -31841174, -5468042, -1721788, -2776725),
-                array(-12278994, 16624277, 987579, -5922598, 32908203, 1248608, 7719845, -4166698, 28408820, 6816612),
-                array(-10358094, -8237829, 19549651, -12169222, 22082623, 16147817, 20613181, 13982702, -10339570, 5067943),
-            ),
-            array(
-                array(-30505967, -3821767, 12074681, 13582412, -19877972, 2443951, -19719286, 12746132, 5331210, -10105944),
-                array(30528811, 3601899, -1957090, 4619785, -27361822, -15436388, 24180793, -12570394, 27679908, -1648928),
-                array(9402404, -13957065, 32834043, 10838634, -26580150, -13237195, 26653274, -8685565, 22611444, -12715406),
-            ),
-            array(
-                array(22190590, 1118029, 22736441, 15130463, -30460692, -5991321, 19189625, -4648942, 4854859, 6622139),
-                array(-8310738, -2953450, -8262579, -3388049, -10401731, -271929, 13424426, -3567227, 26404409, 13001963),
-                array(-31241838, -15415700, -2994250, 8939346, 11562230, -12840670, -26064365, -11621720, -15405155, 11020693),
-            ),
-            array(
-                array(1866042, -7949489, -7898649, -10301010, 12483315, 13477547, 3175636, -12424163, 28761762, 1406734),
-                array(-448555, -1777666, 13018551, 3194501, -9580420, -11161737, 24760585, -4347088, 25577411, -13378680),
-                array(-24290378, 4759345, -690653, -1852816, 2066747, 10693769, -29595790, 9884936, -9368926, 4745410),
-            ),
-            array(
-                array(-9141284, 6049714, -19531061, -4341411, -31260798, 9944276, -15462008, -11311852, 10931924, -11931931),
-                array(-16561513, 14112680, -8012645, 4817318, -8040464, -11414606, -22853429, 10856641, -20470770, 13434654),
-                array(22759489, -10073434, -16766264, -1871422, 13637442, -10168091, 1765144, -12654326, 28445307, -5364710),
-            ),
-            array(
-                array(29875063, 12493613, 2795536, -3786330, 1710620, 15181182, -10195717, -8788675, 9074234, 1167180),
-                array(-26205683, 11014233, -9842651, -2635485, -26908120, 7532294, -18716888, -9535498, 3843903, 9367684),
-                array(-10969595, -6403711, 9591134, 9582310, 11349256, 108879, 16235123, 8601684, -139197, 4242895),
-            ),
-        ),
-        array(
-            array(
-                array(22092954, -13191123, -2042793, -11968512, 32186753, -11517388, -6574341, 2470660, -27417366, 16625501),
-                array(-11057722, 3042016, 13770083, -9257922, 584236, -544855, -7770857, 2602725, -27351616, 14247413),
-                array(6314175, -10264892, -32772502, 15957557, -10157730, 168750, -8618807, 14290061, 27108877, -1180880),
-            ),
-            array(
-                array(-8586597, -7170966, 13241782, 10960156, -32991015, -13794596, 33547976, -11058889, -27148451, 981874),
-                array(22833440, 9293594, -32649448, -13618667, -9136966, 14756819, -22928859, -13970780, -10479804, -16197962),
-                array(-7768587, 3326786, -28111797, 10783824, 19178761, 14905060, 22680049, 13906969, -15933690, 3797899),
-            ),
-            array(
-                array(21721356, -4212746, -12206123, 9310182, -3882239, -13653110, 23740224, -2709232, 20491983, -8042152),
-                array(9209270, -15135055, -13256557, -6167798, -731016, 15289673, 25947805, 15286587, 30997318, -6703063),
-                array(7392032, 16618386, 23946583, -8039892, -13265164, -1533858, -14197445, -2321576, 17649998, -250080),
-            ),
-            array(
-                array(-9301088, -14193827, 30609526, -3049543, -25175069, -1283752, -15241566, -9525724, -2233253, 7662146),
-                array(-17558673, 1763594, -33114336, 15908610, -30040870, -12174295, 7335080, -8472199, -3174674, 3440183),
-                array(-19889700, -5977008, -24111293, -9688870, 10799743, -16571957, 40450, -4431835, 4862400, 1133),
-            ),
-            array(
-                array(-32856209, -7873957, -5422389, 14860950, -16319031, 7956142, 7258061, 311861, -30594991, -7379421),
-                array(-3773428, -1565936, 28985340, 7499440, 24445838, 9325937, 29727763, 16527196, 18278453, 15405622),
-                array(-4381906, 8508652, -19898366, -3674424, -5984453, 15149970, -13313598, 843523, -21875062, 13626197),
-            ),
-            array(
-                array(2281448, -13487055, -10915418, -2609910, 1879358, 16164207, -10783882, 3953792, 13340839, 15928663),
-                array(31727126, -7179855, -18437503, -8283652, 2875793, -16390330, -25269894, -7014826, -23452306, 5964753),
-                array(4100420, -5959452, -17179337, 6017714, -18705837, 12227141, -26684835, 11344144, 2538215, -7570755),
-            ),
-            array(
-                array(-9433605, 6123113, 11159803, -2156608, 30016280, 14966241, -20474983, 1485421, -629256, -15958862),
-                array(-26804558, 4260919, 11851389, 9658551, -32017107, 16367492, -20205425, -13191288, 11659922, -11115118),
-                array(26180396, 10015009, -30844224, -8581293, 5418197, 9480663, 2231568, -10170080, 33100372, -1306171),
-            ),
-            array(
-                array(15121113, -5201871, -10389905, 15427821, -27509937, -15992507, 21670947, 4486675, -5931810, -14466380),
-                array(16166486, -9483733, -11104130, 6023908, -31926798, -1364923, 2340060, -16254968, -10735770, -10039824),
-                array(28042865, -3557089, -12126526, 12259706, -3717498, -6945899, 6766453, -8689599, 18036436, 5803270),
-            ),
-        ),
-        array(
-            array(
-                array(-817581, 6763912, 11803561, 1585585, 10958447, -2671165, 23855391, 4598332, -6159431, -14117438),
-                array(-31031306, -14256194, 17332029, -2383520, 31312682, -5967183, 696309, 50292, -20095739, 11763584),
-                array(-594563, -2514283, -32234153, 12643980, 12650761, 14811489, 665117, -12613632, -19773211, -10713562),
-            ),
-            array(
-                array(30464590, -11262872, -4127476, -12734478, 19835327, -7105613, -24396175, 2075773, -17020157, 992471),
-                array(18357185, -6994433, 7766382, 16342475, -29324918, 411174, 14578841, 8080033, -11574335, -10601610),
-                array(19598397, 10334610, 12555054, 2555664, 18821899, -10339780, 21873263, 16014234, 26224780, 16452269),
-            ),
-            array(
-                array(-30223925, 5145196, 5944548, 16385966, 3976735, 2009897, -11377804, -7618186, -20533829, 3698650),
-                array(14187449, 3448569, -10636236, -10810935, -22663880, -3433596, 7268410, -10890444, 27394301, 12015369),
-                array(19695761, 16087646, 28032085, 12999827, 6817792, 11427614, 20244189, -1312777, -13259127, -3402461),
-            ),
-            array(
-                array(30860103, 12735208, -1888245, -4699734, -16974906, 2256940, -8166013, 12298312, -8550524, -10393462),
-                array(-5719826, -11245325, -1910649, 15569035, 26642876, -7587760, -5789354, -15118654, -4976164, 12651793),
-                array(-2848395, 9953421, 11531313, -5282879, 26895123, -12697089, -13118820, -16517902, 9768698, -2533218),
-            ),
-            array(
-                array(-24719459, 1894651, -287698, -4704085, 15348719, -8156530, 32767513, 12765450, 4940095, 10678226),
-                array(18860224, 15980149, -18987240, -1562570, -26233012, -11071856, -7843882, 13944024, -24372348, 16582019),
-                array(-15504260, 4970268, -29893044, 4175593, -20993212, -2199756, -11704054, 15444560, -11003761, 7989037),
-            ),
-            array(
-                array(31490452, 5568061, -2412803, 2182383, -32336847, 4531686, -32078269, 6200206, -19686113, -14800171),
-                array(-17308668, -15879940, -31522777, -2831, -32887382, 16375549, 8680158, -16371713, 28550068, -6857132),
-                array(-28126887, -5688091, 16837845, -1820458, -6850681, 12700016, -30039981, 4364038, 1155602, 5988841),
-            ),
-            array(
-                array(21890435, -13272907, -12624011, 12154349, -7831873, 15300496, 23148983, -4470481, 24618407, 8283181),
-                array(-33136107, -10512751, 9975416, 6841041, -31559793, 16356536, 3070187, -7025928, 1466169, 10740210),
-                array(-1509399, -15488185, -13503385, -10655916, 32799044, 909394, -13938903, -5779719, -32164649, -15327040),
-            ),
-            array(
-                array(3960823, -14267803, -28026090, -15918051, -19404858, 13146868, 15567327, 951507, -3260321, -573935),
-                array(24740841, 5052253, -30094131, 8961361, 25877428, 6165135, -24368180, 14397372, -7380369, -6144105),
-                array(-28888365, 3510803, -28103278, -1158478, -11238128, -10631454, -15441463, -14453128, -1625486, -6494814),
-            ),
-        ),
-        array(
-            array(
-                array(793299, -9230478, 8836302, -6235707, -27360908, -2369593, 33152843, -4885251, -9906200, -621852),
-                array(5666233, 525582, 20782575, -8038419, -24538499, 14657740, 16099374, 1468826, -6171428, -15186581),
-                array(-4859255, -3779343, -2917758, -6748019, 7778750, 11688288, -30404353, -9871238, -1558923, -9863646),
-            ),
-            array(
-                array(10896332, -7719704, 824275, 472601, -19460308, 3009587, 25248958, 14783338, -30581476, -15757844),
-                array(10566929, 12612572, -31944212, 11118703, -12633376, 12362879, 21752402, 8822496, 24003793, 14264025),
-                array(27713862, -7355973, -11008240, 9227530, 27050101, 2504721, 23886875, -13117525, 13958495, -5732453),
-            ),
-            array(
-                array(-23481610, 4867226, -27247128, 3900521, 29838369, -8212291, -31889399, -10041781, 7340521, -15410068),
-                array(4646514, -8011124, -22766023, -11532654, 23184553, 8566613, 31366726, -1381061, -15066784, -10375192),
-                array(-17270517, 12723032, -16993061, 14878794, 21619651, -6197576, 27584817, 3093888, -8843694, 3849921),
-            ),
-            array(
-                array(-9064912, 2103172, 25561640, -15125738, -5239824, 9582958, 32477045, -9017955, 5002294, -15550259),
-                array(-12057553, -11177906, 21115585, -13365155, 8808712, -12030708, 16489530, 13378448, -25845716, 12741426),
-                array(-5946367, 10645103, -30911586, 15390284, -3286982, -7118677, 24306472, 15852464, 28834118, -7646072),
-            ),
-            array(
-                array(-17335748, -9107057, -24531279, 9434953, -8472084, -583362, -13090771, 455841, 20461858, 5491305),
-                array(13669248, -16095482, -12481974, -10203039, -14569770, -11893198, -24995986, 11293807, -28588204, -9421832),
-                array(28497928, 6272777, -33022994, 14470570, 8906179, -1225630, 18504674, -14165166, 29867745, -8795943),
-            ),
-            array(
-                array(-16207023, 13517196, -27799630, -13697798, 24009064, -6373891, -6367600, -13175392, 22853429, -4012011),
-                array(24191378, 16712145, -13931797, 15217831, 14542237, 1646131, 18603514, -11037887, 12876623, -2112447),
-                array(17902668, 4518229, -411702, -2829247, 26878217, 5258055, -12860753, 608397, 16031844, 3723494),
-            ),
-            array(
-                array(-28632773, 12763728, -20446446, 7577504, 33001348, -13017745, 17558842, -7872890, 23896954, -4314245),
-                array(-20005381, -12011952, 31520464, 605201, 2543521, 5991821, -2945064, 7229064, -9919646, -8826859),
-                array(28816045, 298879, -28165016, -15920938, 19000928, -1665890, -12680833, -2949325, -18051778, -2082915),
-            ),
-            array(
-                array(16000882, -344896, 3493092, -11447198, -29504595, -13159789, 12577740, 16041268, -19715240, 7847707),
-                array(10151868, 10572098, 27312476, 7922682, 14825339, 4723128, -32855931, -6519018, -10020567, 3852848),
-                array(-11430470, 15697596, -21121557, -4420647, 5386314, 15063598, 16514493, -15932110, 29330899, -15076224),
-            ),
-        ),
-        array(
-            array(
-                array(-25499735, -4378794, -15222908, -6901211, 16615731, 2051784, 3303702, 15490, -27548796, 12314391),
-                array(15683520, -6003043, 18109120, -9980648, 15337968, -5997823, -16717435, 15921866, 16103996, -3731215),
-                array(-23169824, -10781249, 13588192, -1628807, -3798557, -1074929, -19273607, 5402699, -29815713, -9841101),
-            ),
-            array(
-                array(23190676, 2384583, -32714340, 3462154, -29903655, -1529132, -11266856, 8911517, -25205859, 2739713),
-                array(21374101, -3554250, -33524649, 9874411, 15377179, 11831242, -33529904, 6134907, 4931255, 11987849),
-                array(-7732, -2978858, -16223486, 7277597, 105524, -322051, -31480539, 13861388, -30076310, 10117930),
-            ),
-            array(
-                array(-29501170, -10744872, -26163768, 13051539, -25625564, 5089643, -6325503, 6704079, 12890019, 15728940),
-                array(-21972360, -11771379, -951059, -4418840, 14704840, 2695116, 903376, -10428139, 12885167, 8311031),
-                array(-17516482, 5352194, 10384213, -13811658, 7506451, 13453191, 26423267, 4384730, 1888765, -5435404),
-            ),
-            array(
-                array(-25817338, -3107312, -13494599, -3182506, 30896459, -13921729, -32251644, -12707869, -19464434, -3340243),
-                array(-23607977, -2665774, -526091, 4651136, 5765089, 4618330, 6092245, 14845197, 17151279, -9854116),
-                array(-24830458, -12733720, -15165978, 10367250, -29530908, -265356, 22825805, -7087279, -16866484, 16176525),
-            ),
-            array(
-                array(-23583256, 6564961, 20063689, 3798228, -4740178, 7359225, 2006182, -10363426, -28746253, -10197509),
-                array(-10626600, -4486402, -13320562, -5125317, 3432136, -6393229, 23632037, -1940610, 32808310, 1099883),
-                array(15030977, 5768825, -27451236, -2887299, -6427378, -15361371, -15277896, -6809350, 2051441, -15225865),
-            ),
-            array(
-                array(-3362323, -7239372, 7517890, 9824992, 23555850, 295369, 5148398, -14154188, -22686354, 16633660),
-                array(4577086, -16752288, 13249841, -15304328, 19958763, -14537274, 18559670, -10759549, 8402478, -9864273),
-                array(-28406330, -1051581, -26790155, -907698, -17212414, -11030789, 9453451, -14980072, 17983010, 9967138),
-            ),
-            array(
-                array(-25762494, 6524722, 26585488, 9969270, 24709298, 1220360, -1677990, 7806337, 17507396, 3651560),
-                array(-10420457, -4118111, 14584639, 15971087, -15768321, 8861010, 26556809, -5574557, -18553322, -11357135),
-                array(2839101, 14284142, 4029895, 3472686, 14402957, 12689363, -26642121, 8459447, -5605463, -7621941),
-            ),
-            array(
-                array(-4839289, -3535444, 9744961, 2871048, 25113978, 3187018, -25110813, -849066, 17258084, -7977739),
-                array(18164541, -10595176, -17154882, -1542417, 19237078, -9745295, 23357533, -15217008, 26908270, 12150756),
-                array(-30264870, -7647865, 5112249, -7036672, -1499807, -6974257, 43168, -5537701, -32302074, 16215819),
-            ),
-        ),
-        array(
-            array(
-                array(-6898905, 9824394, -12304779, -4401089, -31397141, -6276835, 32574489, 12532905, -7503072, -8675347),
-                array(-27343522, -16515468, -27151524, -10722951, 946346, 16291093, 254968, 7168080, 21676107, -1943028),
-                array(21260961, -8424752, -16831886, -11920822, -23677961, 3968121, -3651949, -6215466, -3556191, -7913075),
-            ),
-            array(
-                array(16544754, 13250366, -16804428, 15546242, -4583003, 12757258, -2462308, -8680336, -18907032, -9662799),
-                array(-2415239, -15577728, 18312303, 4964443, -15272530, -12653564, 26820651, 16690659, 25459437, -4564609),
-                array(-25144690, 11425020, 28423002, -11020557, -6144921, -15826224, 9142795, -2391602, -6432418, -1644817),
-            ),
-            array(
-                array(-23104652, 6253476, 16964147, -3768872, -25113972, -12296437, -27457225, -16344658, 6335692, 7249989),
-                array(-30333227, 13979675, 7503222, -12368314, -11956721, -4621693, -30272269, 2682242, 25993170, -12478523),
-                array(4364628, 5930691, 32304656, -10044554, -8054781, 15091131, 22857016, -10598955, 31820368, 15075278),
-            ),
-            array(
-                array(31879134, -8918693, 17258761, 90626, -8041836, -4917709, 24162788, -9650886, -17970238, 12833045),
-                array(19073683, 14851414, -24403169, -11860168, 7625278, 11091125, -19619190, 2074449, -9413939, 14905377),
-                array(24483667, -11935567, -2518866, -11547418, -1553130, 15355506, -25282080, 9253129, 27628530, -7555480),
-            ),
-            array(
-                array(17597607, 8340603, 19355617, 552187, 26198470, -3176583, 4593324, -9157582, -14110875, 15297016),
-                array(510886, 14337390, -31785257, 16638632, 6328095, 2713355, -20217417, -11864220, 8683221, 2921426),
-                array(18606791, 11874196, 27155355, -5281482, -24031742, 6265446, -25178240, -1278924, 4674690, 13890525),
-            ),
-            array(
-                array(13609624, 13069022, -27372361, -13055908, 24360586, 9592974, 14977157, 9835105, 4389687, 288396),
-                array(9922506, -519394, 13613107, 5883594, -18758345, -434263, -12304062, 8317628, 23388070, 16052080),
-                array(12720016, 11937594, -31970060, -5028689, 26900120, 8561328, -20155687, -11632979, -14754271, -10812892),
-            ),
-            array(
-                array(15961858, 14150409, 26716931, -665832, -22794328, 13603569, 11829573, 7467844, -28822128, 929275),
-                array(11038231, -11582396, -27310482, -7316562, -10498527, -16307831, -23479533, -9371869, -21393143, 2465074),
-                array(20017163, -4323226, 27915242, 1529148, 12396362, 15675764, 13817261, -9658066, 2463391, -4622140),
-            ),
-            array(
-                array(-16358878, -12663911, -12065183, 4996454, -1256422, 1073572, 9583558, 12851107, 4003896, 12673717),
-                array(-1731589, -15155870, -3262930, 16143082, 19294135, 13385325, 14741514, -9103726, 7903886, 2348101),
-                array(24536016, -16515207, 12715592, -3862155, 1511293, 10047386, -3842346, -7129159, -28377538, 10048127),
-            ),
-        ),
-        array(
-            array(
-                array(-12622226, -6204820, 30718825, 2591312, -10617028, 12192840, 18873298, -7297090, -32297756, 15221632),
-                array(-26478122, -11103864, 11546244, -1852483, 9180880, 7656409, -21343950, 2095755, 29769758, 6593415),
-                array(-31994208, -2907461, 4176912, 3264766, 12538965, -868111, 26312345, -6118678, 30958054, 8292160),
-            ),
-            array(
-                array(31429822, -13959116, 29173532, 15632448, 12174511, -2760094, 32808831, 3977186, 26143136, -3148876),
-                array(22648901, 1402143, -22799984, 13746059, 7936347, 365344, -8668633, -1674433, -3758243, -2304625),
-                array(-15491917, 8012313, -2514730, -12702462, -23965846, -10254029, -1612713, -1535569, -16664475, 8194478),
-            ),
-            array(
-                array(27338066, -7507420, -7414224, 10140405, -19026427, -6589889, 27277191, 8855376, 28572286, 3005164),
-                array(26287124, 4821776, 25476601, -4145903, -3764513, -15788984, -18008582, 1182479, -26094821, -13079595),
-                array(-7171154, 3178080, 23970071, 6201893, -17195577, -4489192, -21876275, -13982627, 32208683, -1198248),
-            ),
-            array(
-                array(-16657702, 2817643, -10286362, 14811298, 6024667, 13349505, -27315504, -10497842, -27672585, -11539858),
-                array(15941029, -9405932, -21367050, 8062055, 31876073, -238629, -15278393, -1444429, 15397331, -4130193),
-                array(8934485, -13485467, -23286397, -13423241, -32446090, 14047986, 31170398, -1441021, -27505566, 15087184),
-            ),
-            array(
-                array(-18357243, -2156491, 24524913, -16677868, 15520427, -6360776, -15502406, 11461896, 16788528, -5868942),
-                array(-1947386, 16013773, 21750665, 3714552, -17401782, -16055433, -3770287, -10323320, 31322514, -11615635),
-                array(21426655, -5650218, -13648287, -5347537, -28812189, -4920970, -18275391, -14621414, 13040862, -12112948),
-            ),
-            array(
-                array(11293895, 12478086, -27136401, 15083750, -29307421, 14748872, 14555558, -13417103, 1613711, 4896935),
-                array(-25894883, 15323294, -8489791, -8057900, 25967126, -13425460, 2825960, -4897045, -23971776, -11267415),
-                array(-15924766, -5229880, -17443532, 6410664, 3622847, 10243618, 20615400, 12405433, -23753030, -8436416),
-            ),
-            array(
-                array(-7091295, 12556208, -20191352, 9025187, -17072479, 4333801, 4378436, 2432030, 23097949, -566018),
-                array(4565804, -16025654, 20084412, -7842817, 1724999, 189254, 24767264, 10103221, -18512313, 2424778),
-                array(366633, -11976806, 8173090, -6890119, 30788634, 5745705, -7168678, 1344109, -3642553, 12412659),
-            ),
-            array(
-                array(-24001791, 7690286, 14929416, -168257, -32210835, -13412986, 24162697, -15326504, -3141501, 11179385),
-                array(18289522, -14724954, 8056945, 16430056, -21729724, 7842514, -6001441, -1486897, -18684645, -11443503),
-                array(476239, 6601091, -6152790, -9723375, 17503545, -4863900, 27672959, 13403813, 11052904, 5219329),
-            ),
-        ),
-        array(
-            array(
-                array(20678546, -8375738, -32671898, 8849123, -5009758, 14574752, 31186971, -3973730, 9014762, -8579056),
-                array(-13644050, -10350239, -15962508, 5075808, -1514661, -11534600, -33102500, 9160280, 8473550, -3256838),
-                array(24900749, 14435722, 17209120, -15292541, -22592275, 9878983, -7689309, -16335821, -24568481, 11788948),
-            ),
-            array(
-                array(-3118155, -11395194, -13802089, 14797441, 9652448, -6845904, -20037437, 10410733, -24568470, -1458691),
-                array(-15659161, 16736706, -22467150, 10215878, -9097177, 7563911, 11871841, -12505194, -18513325, 8464118),
-                array(-23400612, 8348507, -14585951, -861714, -3950205, -6373419, 14325289, 8628612, 33313881, -8370517),
-            ),
-            array(
-                array(-20186973, -4967935, 22367356, 5271547, -1097117, -4788838, -24805667, -10236854, -8940735, -5818269),
-                array(-6948785, -1795212, -32625683, -16021179, 32635414, -7374245, 15989197, -12838188, 28358192, -4253904),
-                array(-23561781, -2799059, -32351682, -1661963, -9147719, 10429267, -16637684, 4072016, -5351664, 5596589),
-            ),
-            array(
-                array(-28236598, -3390048, 12312896, 6213178, 3117142, 16078565, 29266239, 2557221, 1768301, 15373193),
-                array(-7243358, -3246960, -4593467, -7553353, -127927, -912245, -1090902, -4504991, -24660491, 3442910),
-                array(-30210571, 5124043, 14181784, 8197961, 18964734, -11939093, 22597931, 7176455, -18585478, 13365930),
-            ),
-            array(
-                array(-7877390, -1499958, 8324673, 4690079, 6261860, 890446, 24538107, -8570186, -9689599, -3031667),
-                array(25008904, -10771599, -4305031, -9638010, 16265036, 15721635, 683793, -11823784, 15723479, -15163481),
-                array(-9660625, 12374379, -27006999, -7026148, -7724114, -12314514, 11879682, 5400171, 519526, -1235876),
-            ),
-            array(
-                array(22258397, -16332233, -7869817, 14613016, -22520255, -2950923, -20353881, 7315967, 16648397, 7605640),
-                array(-8081308, -8464597, -8223311, 9719710, 19259459, -15348212, 23994942, -5281555, -9468848, 4763278),
-                array(-21699244, 9220969, -15730624, 1084137, -25476107, -2852390, 31088447, -7764523, -11356529, 728112),
-            ),
-            array(
-                array(26047220, -11751471, -6900323, -16521798, 24092068, 9158119, -4273545, -12555558, -29365436, -5498272),
-                array(17510331, -322857, 5854289, 8403524, 17133918, -3112612, -28111007, 12327945, 10750447, 10014012),
-                array(-10312768, 3936952, 9156313, -8897683, 16498692, -994647, -27481051, -666732, 3424691, 7540221),
-            ),
-            array(
-                array(30322361, -6964110, 11361005, -4143317, 7433304, 4989748, -7071422, -16317219, -9244265, 15258046),
-                array(13054562, -2779497, 19155474, 469045, -12482797, 4566042, 5631406, 2711395, 1062915, -5136345),
-                array(-19240248, -11254599, -29509029, -7499965, -5835763, 13005411, -6066489, 12194497, 32960380, 1459310),
-            ),
-        ),
-        array(
-            array(
-                array(19852034, 7027924, 23669353, 10020366, 8586503, -6657907, 394197, -6101885, 18638003, -11174937),
-                array(31395534, 15098109, 26581030, 8030562, -16527914, -5007134, 9012486, -7584354, -6643087, -5442636),
-                array(-9192165, -2347377, -1997099, 4529534, 25766844, 607986, -13222, 9677543, -32294889, -6456008),
-            ),
-            array(
-                array(-2444496, -149937, 29348902, 8186665, 1873760, 12489863, -30934579, -7839692, -7852844, -8138429),
-                array(-15236356, -15433509, 7766470, 746860, 26346930, -10221762, -27333451, 10754588, -9431476, 5203576),
-                array(31834314, 14135496, -770007, 5159118, 20917671, -16768096, -7467973, -7337524, 31809243, 7347066),
-            ),
-            array(
-                array(-9606723, -11874240, 20414459, 13033986, 13716524, -11691881, 19797970, -12211255, 15192876, -2087490),
-                array(-12663563, -2181719, 1168162, -3804809, 26747877, -14138091, 10609330, 12694420, 33473243, -13382104),
-                array(33184999, 11180355, 15832085, -11385430, -1633671, 225884, 15089336, -11023903, -6135662, 14480053),
-            ),
-            array(
-                array(31308717, -5619998, 31030840, -1897099, 15674547, -6582883, 5496208, 13685227, 27595050, 8737275),
-                array(-20318852, -15150239, 10933843, -16178022, 8335352, -7546022, -31008351, -12610604, 26498114, 66511),
-                array(22644454, -8761729, -16671776, 4884562, -3105614, -13559366, 30540766, -4286747, -13327787, -7515095),
-            ),
-            array(
-                array(-28017847, 9834845, 18617207, -2681312, -3401956, -13307506, 8205540, 13585437, -17127465, 15115439),
-                array(23711543, -672915, 31206561, -8362711, 6164647, -9709987, -33535882, -1426096, 8236921, 16492939),
-                array(-23910559, -13515526, -26299483, -4503841, 25005590, -7687270, 19574902, 10071562, 6708380, -6222424),
-            ),
-            array(
-                array(2101391, -4930054, 19702731, 2367575, -15427167, 1047675, 5301017, 9328700, 29955601, -11678310),
-                array(3096359, 9271816, -21620864, -15521844, -14847996, -7592937, -25892142, -12635595, -9917575, 6216608),
-                array(-32615849, 338663, -25195611, 2510422, -29213566, -13820213, 24822830, -6146567, -26767480, 7525079),
-            ),
-            array(
-                array(-23066649, -13985623, 16133487, -7896178, -3389565, 778788, -910336, -2782495, -19386633, 11994101),
-                array(21691500, -13624626, -641331, -14367021, 3285881, -3483596, -25064666, 9718258, -7477437, 13381418),
-                array(18445390, -4202236, 14979846, 11622458, -1727110, -3582980, 23111648, -6375247, 28535282, 15779576),
-            ),
-            array(
-                array(30098053, 3089662, -9234387, 16662135, -21306940, 11308411, -14068454, 12021730, 9955285, -16303356),
-                array(9734894, -14576830, -7473633, -9138735, 2060392, 11313496, -18426029, 9924399, 20194861, 13380996),
-                array(-26378102, -7965207, -22167821, 15789297, -18055342, -6168792, -1984914, 15707771, 26342023, 10146099),
-            ),
-        ),
-        array(
-            array(
-                array(-26016874, -219943, 21339191, -41388, 19745256, -2878700, -29637280, 2227040, 21612326, -545728),
-                array(-13077387, 1184228, 23562814, -5970442, -20351244, -6348714, 25764461, 12243797, -20856566, 11649658),
-                array(-10031494, 11262626, 27384172, 2271902, 26947504, -15997771, 39944, 6114064, 33514190, 2333242),
-            ),
-            array(
-                array(-21433588, -12421821, 8119782, 7219913, -21830522, -9016134, -6679750, -12670638, 24350578, -13450001),
-                array(-4116307, -11271533, -23886186, 4843615, -30088339, 690623, -31536088, -10406836, 8317860, 12352766),
-                array(18200138, -14475911, -33087759, -2696619, -23702521, -9102511, -23552096, -2287550, 20712163, 6719373),
-            ),
-            array(
-                array(26656208, 6075253, -7858556, 1886072, -28344043, 4262326, 11117530, -3763210, 26224235, -3297458),
-                array(-17168938, -14854097, -3395676, -16369877, -19954045, 14050420, 21728352, 9493610, 18620611, -16428628),
-                array(-13323321, 13325349, 11432106, 5964811, 18609221, 6062965, -5269471, -9725556, -30701573, -16479657),
-            ),
-            array(
-                array(-23860538, -11233159, 26961357, 1640861, -32413112, -16737940, 12248509, -5240639, 13735342, 1934062),
-                array(25089769, 6742589, 17081145, -13406266, 21909293, -16067981, -15136294, -3765346, -21277997, 5473616),
-                array(31883677, -7961101, 1083432, -11572403, 22828471, 13290673, -7125085, 12469656, 29111212, -5451014),
-            ),
-            array(
-                array(24244947, -15050407, -26262976, 2791540, -14997599, 16666678, 24367466, 6388839, -10295587, 452383),
-                array(-25640782, -3417841, 5217916, 16224624, 19987036, -4082269, -24236251, -5915248, 15766062, 8407814),
-                array(-20406999, 13990231, 15495425, 16395525, 5377168, 15166495, -8917023, -4388953, -8067909, 2276718),
-            ),
-            array(
-                array(30157918, 12924066, -17712050, 9245753, 19895028, 3368142, -23827587, 5096219, 22740376, -7303417),
-                array(2041139, -14256350, 7783687, 13876377, -25946985, -13352459, 24051124, 13742383, -15637599, 13295222),
-                array(33338237, -8505733, 12532113, 7977527, 9106186, -1715251, -17720195, -4612972, -4451357, -14669444),
-            ),
-            array(
-                array(-20045281, 5454097, -14346548, 6447146, 28862071, 1883651, -2469266, -4141880, 7770569, 9620597),
-                array(23208068, 7979712, 33071466, 8149229, 1758231, -10834995, 30945528, -1694323, -33502340, -14767970),
-                array(1439958, -16270480, -1079989, -793782, 4625402, 10647766, -5043801, 1220118, 30494170, -11440799),
-            ),
-            array(
-                array(-5037580, -13028295, -2970559, -3061767, 15640974, -6701666, -26739026, 926050, -1684339, -13333647),
-                array(13908495, -3549272, 30919928, -6273825, -21521863, 7989039, 9021034, 9078865, 3353509, 4033511),
-                array(-29663431, -15113610, 32259991, -344482, 24295849, -12912123, 23161163, 8839127, 27485041, 7356032),
-            ),
-        ),
-        array(
-            array(
-                array(9661027, 705443, 11980065, -5370154, -1628543, 14661173, -6346142, 2625015, 28431036, -16771834),
-                array(-23839233, -8311415, -25945511, 7480958, -17681669, -8354183, -22545972, 14150565, 15970762, 4099461),
-                array(29262576, 16756590, 26350592, -8793563, 8529671, -11208050, 13617293, -9937143, 11465739, 8317062),
-            ),
-            array(
-                array(-25493081, -6962928, 32500200, -9419051, -23038724, -2302222, 14898637, 3848455, 20969334, -5157516),
-                array(-20384450, -14347713, -18336405, 13884722, -33039454, 2842114, -21610826, -3649888, 11177095, 14989547),
-                array(-24496721, -11716016, 16959896, 2278463, 12066309, 10137771, 13515641, 2581286, -28487508, 9930240),
-            ),
-            array(
-                array(-17751622, -2097826, 16544300, -13009300, -15914807, -14949081, 18345767, -13403753, 16291481, -5314038),
-                array(-33229194, 2553288, 32678213, 9875984, 8534129, 6889387, -9676774, 6957617, 4368891, 9788741),
-                array(16660756, 7281060, -10830758, 12911820, 20108584, -8101676, -21722536, -8613148, 16250552, -11111103),
-            ),
-            array(
-                array(-19765507, 2390526, -16551031, 14161980, 1905286, 6414907, 4689584, 10604807, -30190403, 4782747),
-                array(-1354539, 14736941, -7367442, -13292886, 7710542, -14155590, -9981571, 4383045, 22546403, 437323),
-                array(31665577, -12180464, -16186830, 1491339, -18368625, 3294682, 27343084, 2786261, -30633590, -14097016),
-            ),
-            array(
-                array(-14467279, -683715, -33374107, 7448552, 19294360, 14334329, -19690631, 2355319, -19284671, -6114373),
-                array(15121312, -15796162, 6377020, -6031361, -10798111, -12957845, 18952177, 15496498, -29380133, 11754228),
-                array(-2637277, -13483075, 8488727, -14303896, 12728761, -1622493, 7141596, 11724556, 22761615, -10134141),
-            ),
-            array(
-                array(16918416, 11729663, -18083579, 3022987, -31015732, -13339659, -28741185, -12227393, 32851222, 11717399),
-                array(11166634, 7338049, -6722523, 4531520, -29468672, -7302055, 31474879, 3483633, -1193175, -4030831),
-                array(-185635, 9921305, 31456609, -13536438, -12013818, 13348923, 33142652, 6546660, -19985279, -3948376),
-            ),
-            array(
-                array(-32460596, 11266712, -11197107, -7899103, 31703694, 3855903, -8537131, -12833048, -30772034, -15486313),
-                array(-18006477, 12709068, 3991746, -6479188, -21491523, -10550425, -31135347, -16049879, 10928917, 3011958),
-                array(-6957757, -15594337, 31696059, 334240, 29576716, 14796075, -30831056, -12805180, 18008031, 10258577),
-            ),
-            array(
-                array(-22448644, 15655569, 7018479, -4410003, -30314266, -1201591, -1853465, 1367120, 25127874, 6671743),
-                array(29701166, -14373934, -10878120, 9279288, -17568, 13127210, 21382910, 11042292, 25838796, 4642684),
-                array(-20430234, 14955537, -24126347, 8124619, -5369288, -5990470, 30468147, -13900640, 18423289, 4177476),
-            ),
-        )
-    );
-
-    /**
-     * See: libsodium's crypto_core/curve25519/ref10/base2.h
-     *
-     * @var array<int, array<int, array<int, int>>> basically int[8][3]
-     */
-    protected static $base2 = array(
-        array(
-            array(25967493, -14356035, 29566456, 3660896, -12694345, 4014787, 27544626, -11754271, -6079156, 2047605),
-            array(-12545711, 934262, -2722910, 3049990, -727428, 9406986, 12720692, 5043384, 19500929, -15469378),
-            array(-8738181, 4489570, 9688441, -14785194, 10184609, -12363380, 29287919, 11864899, -24514362, -4438546),
-        ),
-        array(
-            array(15636291, -9688557, 24204773, -7912398, 616977, -16685262, 27787600, -14772189, 28944400, -1550024),
-            array(16568933, 4717097, -11556148, -1102322, 15682896, -11807043, 16354577, -11775962, 7689662, 11199574),
-            array(30464156, -5976125, -11779434, -15670865, 23220365, 15915852, 7512774, 10017326, -17749093, -9920357),
-        ),
-        array(
-            array(10861363, 11473154, 27284546, 1981175, -30064349, 12577861, 32867885, 14515107, -15438304, 10819380),
-            array(4708026, 6336745, 20377586, 9066809, -11272109, 6594696, -25653668, 12483688, -12668491, 5581306),
-            array(19563160, 16186464, -29386857, 4097519, 10237984, -4348115, 28542350, 13850243, -23678021, -15815942),
-        ),
-        array(
-            array(5153746, 9909285, 1723747, -2777874, 30523605, 5516873, 19480852, 5230134, -23952439, -15175766),
-            array(-30269007, -3463509, 7665486, 10083793, 28475525, 1649722, 20654025, 16520125, 30598449, 7715701),
-            array(28881845, 14381568, 9657904, 3680757, -20181635, 7843316, -31400660, 1370708, 29794553, -1409300),
-        ),
-        array(
-            array(-22518993, -6692182, 14201702, -8745502, -23510406, 8844726, 18474211, -1361450, -13062696, 13821877),
-            array(-6455177, -7839871, 3374702, -4740862, -27098617, -10571707, 31655028, -7212327, 18853322, -14220951),
-            array(4566830, -12963868, -28974889, -12240689, -7602672, -2830569, -8514358, -10431137, 2207753, -3209784),
-        ),
-        array(
-            array(-25154831, -4185821, 29681144, 7868801, -6854661, -9423865, -12437364, -663000, -31111463, -16132436),
-            array(25576264, -2703214, 7349804, -11814844, 16472782, 9300885, 3844789, 15725684, 171356, 6466918),
-            array(23103977, 13316479, 9739013, -16149481, 817875, -15038942, 8965339, -14088058, -30714912, 16193877),
-        ),
-        array(
-            array(-33521811, 3180713, -2394130, 14003687, -16903474, -16270840, 17238398, 4729455, -18074513, 9256800),
-            array(-25182317, -4174131, 32336398, 5036987, -21236817, 11360617, 22616405, 9761698, -19827198, 630305),
-            array(-13720693, 2639453, -24237460, -7406481, 9494427, -5774029, -6554551, -15960994, -2449256, -14291300),
-        ),
-        array(
-            array(-3151181, -5046075, 9282714, 6866145, -31907062, -863023, -18940575, 15033784, 25105118, -7894876),
-            array(-24326370, 15950226, -31801215, -14592823, -11662737, -5090925, 1573892, -2625887, 2198790, -15804619),
-            array(-3099351, 10324967, -2241613, 7453183, -5446979, -2735503, -13812022, -16236442, -32461234, -12290683),
-        )
-    );
-
-    /**
-     * 37095705934669439343138083508754565189542113879843219016388785533085940283555
-     *
-     * @var array<int, int>
-     */
-    protected static $d = array(
-        -10913610,
-        13857413,
-        -15372611,
-        6949391,
-        114729,
-        -8787816,
-        -6275908,
-        -3247719,
-        -18696448,
-        -12055116
-    );
-
-    /**
-     * 2 * d = 16295367250680780974490674513165176452449235426866156013048779062215315747161
-     *
-     * @var array<int, int>
-     */
-    protected static $d2 = array(
-        -21827239,
-        -5839606,
-        -30745221,
-        13898782,
-        229458,
-        15978800,
-        -12551817,
-        -6495438,
-        29715968,
-        9444199
-    );
-
-    /**
-     * sqrt(-1)
-     *
-     * @var array<int, int>
-     */
-    protected static $sqrtm1 = array(
-        -32595792,
-        -7943725,
-        9377950,
-        3500415,
-        12389472,
-        -272473,
-        -25146209,
-        -2005654,
-        326686,
-        11406482
-    );
-}

diff --git a/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core32/Curve25519/README.md b/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core32/Curve25519/README.md
deleted file mode 100644 (file)
index e8097fa..0000000
--- a/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core32/Curve25519/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Curve25519 Data Structures
-
-These are PHP implementation of the [structs used in the ref10 curve25519 code](https://github.com/jedisct1/libsodium/blob/master/src/libsodium/include/sodium/private/curve25519_ref10.h).

diff --git a/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core32/Ed25519.php b/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core32/Ed25519.php
deleted file mode 100644 (file)
index 1b86b67..0000000
--- a/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core32/Ed25519.php
+++ /dev/null
@@ -1,485 +0,0 @@
-<?php
-
-if (class_exists('ParagonIE_Sodium_Core32_Ed25519', false)) {
-    return;
-}
-if (!class_exists('ParagonIE_Sodium_Core32_Curve25519')) {
-    require_once dirname(__FILE__) . '/Curve25519.php';
-}
-
-/**
- * Class ParagonIE_Sodium_Core32_Ed25519
- */
-abstract class ParagonIE_Sodium_Core32_Ed25519 extends ParagonIE_Sodium_Core32_Curve25519
-{
-    const KEYPAIR_BYTES = 96;
-    const SEED_BYTES = 32;
-
-    /**
-     * @internal You should not use this directly from another application
-     *
-     * @return string (96 bytes)
-     * @throws Exception
-     * @throws SodiumException
-     * @throws TypeError
-     */
-    public static function keypair()
-    {
-        $seed = random_bytes(self::SEED_BYTES);
-        $pk = '';
-        $sk = '';
-        self::seed_keypair($pk, $sk, $seed);
-        return $sk . $pk;
-    }
-
-    /**
-     * @internal You should not use this directly from another application
-     *
-     * @param string $pk
-     * @param string $sk
-     * @param string $seed
-     * @return string
-     * @throws SodiumException
-     * @throws TypeError
-     */
-    public static function seed_keypair(&$pk, &$sk, $seed)
-    {
-        if (self::strlen($seed) !== self::SEED_BYTES) {
-            throw new RangeException('crypto_sign keypair seed must be 32 bytes long');
-        }
-
-        /** @var string $pk */
-        $pk = self::publickey_from_secretkey($seed);
-        $sk = $seed . $pk;
-        return $sk;
-    }
-
-    /**
-     * @internal You should not use this directly from another application
-     *
-     * @param string $keypair
-     * @return string
-     * @throws TypeError
-     */
-    public static function secretkey($keypair)
-    {
-        if (self::strlen($keypair) !== self::KEYPAIR_BYTES) {
-            throw new RangeException('crypto_sign keypair must be 96 bytes long');
-        }
-        return self::substr($keypair, 0, 64);
-    }
-
-    /**
-     * @internal You should not use this directly from another application
-     *
-     * @param string $keypair
-     * @return string
-     * @throws RangeException
-     * @throws TypeError
-     */
-    public static function publickey($keypair)
-    {
-        if (self::strlen($keypair) !== self::KEYPAIR_BYTES) {
-            throw new RangeException('crypto_sign keypair must be 96 bytes long');
-        }
-        return self::substr($keypair, 64, 32);
-    }
-
-    /**
-     * @internal You should not use this directly from another application
-     *
-     * @param string $sk
-     * @return string
-     * @throws SodiumException
-     * @throws TypeError
-     */
-    public static function publickey_from_secretkey($sk)
-    {
-        /** @var string $sk */
-        $sk = hash('sha512', self::substr($sk, 0, 32), true);
-        $sk[0] = self::intToChr(
-            self::chrToInt($sk[0]) & 248
-        );
-        $sk[31] = self::intToChr(
-            (self::chrToInt($sk[31]) & 63) | 64
-        );
-        return self::sk_to_pk($sk);
-    }
-
-    /**
-     * @param string $pk
-     * @return string
-     * @throws SodiumException
-     * @throws TypeError
-     */
-    public static function pk_to_curve25519($pk)
-    {
-        if (self::small_order($pk)) {
-            throw new SodiumException('Public key is on a small order');
-        }
-        $A = self::ge_frombytes_negate_vartime($pk);
-        $p1 = self::ge_mul_l($A);
-        if (!self::fe_isnonzero($p1->X)) {
-            throw new SodiumException('Unexpected zero result');
-        }
-
-        # fe_1(one_minus_y);
-        # fe_sub(one_minus_y, one_minus_y, A.Y);
-        # fe_invert(one_minus_y, one_minus_y);
-        $one_minux_y = self::fe_invert(
-            self::fe_sub(
-                self::fe_1(),
-                $A->Y
-            )
-        );
-
-
-        # fe_1(x);
-        # fe_add(x, x, A.Y);
-        # fe_mul(x, x, one_minus_y);
-        $x = self::fe_mul(
-            self::fe_add(self::fe_1(), $A->Y),
-            $one_minux_y
-        );
-
-        # fe_tobytes(curve25519_pk, x);
-        return self::fe_tobytes($x);
-    }
-
-    /**
-     * @internal You should not use this directly from another application
-     *
-     * @param string $sk
-     * @return string
-     * @throws SodiumException
-     * @throws TypeError
-     */
-    public static function sk_to_pk($sk)
-    {
-        return self::ge_p3_tobytes(
-            self::ge_scalarmult_base(
-                self::substr($sk, 0, 32)
-            )
-        );
-    }
-
-    /**
-     * @internal You should not use this directly from another application
-     *
-     * @param string $message
-     * @param string $sk
-     * @return string
-     * @throws SodiumException
-     * @throws TypeError
-     */
-    public static function sign($message, $sk)
-    {
-        /** @var string $signature */
-        $signature = self::sign_detached($message, $sk);
-        return $signature . $message;
-    }
-
-    /**
-     * @internal You should not use this directly from another application
-     *
-     * @param string $message A signed message
-     * @param string $pk      Public key
-     * @return string         Message (without signature)
-     * @throws SodiumException
-     * @throws TypeError
-     */
-    public static function sign_open($message, $pk)
-    {
-        /** @var string $signature */
-        $signature = self::substr($message, 0, 64);
-
-        /** @var string $message */
-        $message = self::substr($message, 64);
-
-        if (self::verify_detached($signature, $message, $pk)) {
-            return $message;
-        }
-        throw new SodiumException('Invalid signature');
-    }
-
-    /**
-     * @internal You should not use this directly from another application
-     *
-     * @param string $message
-     * @param string $sk
-     * @return string
-     * @throws SodiumException
-     * @throws TypeError
-     * @psalm-suppress PossiblyInvalidArgument
-     */
-    public static function sign_detached($message, $sk)
-    {
-        # crypto_hash_sha512(az, sk, 32);
-        $az =  hash('sha512', self::substr($sk, 0, 32), true);
-
-        # az[0] &= 248;
-        # az[31] &= 63;
-        # az[31] |= 64;
-        $az[0] = self::intToChr(self::chrToInt($az[0]) & 248);
-        $az[31] = self::intToChr((self::chrToInt($az[31]) & 63) | 64);
-
-        # crypto_hash_sha512_init(&hs);
-        # crypto_hash_sha512_update(&hs, az + 32, 32);
-        # crypto_hash_sha512_update(&hs, m, mlen);
-        # crypto_hash_sha512_final(&hs, nonce);
-        $hs = hash_init('sha512');
-        self::hash_update($hs, self::substr($az, 32, 32));
-        self::hash_update($hs, $message);
-        $nonceHash = hash_final($hs, true);
-
-        # memmove(sig + 32, sk + 32, 32);
-        $pk = self::substr($sk, 32, 32);
-
-        # sc_reduce(nonce);
-        # ge_scalarmult_base(&R, nonce);
-        # ge_p3_tobytes(sig, &R);
-        $nonce = self::sc_reduce($nonceHash) . self::substr($nonceHash, 32);
-        $sig = self::ge_p3_tobytes(
-            self::ge_scalarmult_base($nonce)
-        );
-
-        # crypto_hash_sha512_init(&hs);
-        # crypto_hash_sha512_update(&hs, sig, 64);
-        # crypto_hash_sha512_update(&hs, m, mlen);
-        # crypto_hash_sha512_final(&hs, hram);
-        $hs = hash_init('sha512');
-        self::hash_update($hs, self::substr($sig, 0, 32));
-        self::hash_update($hs, self::substr($pk, 0, 32));
-        self::hash_update($hs, $message);
-        $hramHash = hash_final($hs, true);
-
-        # sc_reduce(hram);
-        # sc_muladd(sig + 32, hram, az, nonce);
-        $hram = self::sc_reduce($hramHash);
-        $sigAfter = self::sc_muladd($hram, $az, $nonce);
-        $sig = self::substr($sig, 0, 32) . self::substr($sigAfter, 0, 32);
-
-        try {
-            ParagonIE_Sodium_Compat::memzero($az);
-        } catch (SodiumException $ex) {
-            $az = null;
-        }
-        return $sig;
-    }
-
-    /**
-     * @internal You should not use this directly from another application
-     *
-     * @param string $sig
-     * @param string $message
-     * @param string $pk
-     * @return bool
-     * @throws SodiumException
-     * @throws TypeError
-     */
-    public static function verify_detached($sig, $message, $pk)
-    {
-        if (self::strlen($sig) < 64) {
-            throw new SodiumException('Signature is too short');
-        }
-        if ((self::chrToInt($sig[63]) & 240) && self::check_S_lt_L(self::substr($sig, 32, 32))) {
-            throw new SodiumException('S < L - Invalid signature');
-        }
-        if (self::small_order($sig)) {
-            throw new SodiumException('Signature is on too small of an order');
-        }
-        if ((self::chrToInt($sig[63]) & 224) !== 0) {
-            throw new SodiumException('Invalid signature');
-        }
-        $d = 0;
-        for ($i = 0; $i < 32; ++$i) {
-            $d |= self::chrToInt($pk[$i]);
-        }
-        if ($d === 0) {
-            throw new SodiumException('All zero public key');
-        }
-
-        /** @var bool The original value of ParagonIE_Sodium_Compat::$fastMult */
-        $orig = ParagonIE_Sodium_Compat::$fastMult;
-
-        // Set ParagonIE_Sodium_Compat::$fastMult to true to speed up verification.
-        ParagonIE_Sodium_Compat::$fastMult = true;
-
-        /** @var ParagonIE_Sodium_Core32_Curve25519_Ge_P3 $A */
-        $A = self::ge_frombytes_negate_vartime($pk);
-
-        /** @var string $hDigest */
-        $hDigest = hash(
-            'sha512',
-            self::substr($sig, 0, 32) .
-            self::substr($pk, 0, 32) .
-            $message,
-            true
-        );
-
-        /** @var string $h */
-        $h = self::sc_reduce($hDigest) . self::substr($hDigest, 32);
-
-        /** @var ParagonIE_Sodium_Core32_Curve25519_Ge_P2 $R */
-        $R = self::ge_double_scalarmult_vartime(
-            $h,
-            $A,
-            self::substr($sig, 32)
-        );
-
-        /** @var string $rcheck */
-        $rcheck = self::ge_tobytes($R);
-
-        // Reset ParagonIE_Sodium_Compat::$fastMult to what it was before.
-        ParagonIE_Sodium_Compat::$fastMult = $orig;
-
-        return self::verify_32($rcheck, self::substr($sig, 0, 32));
-    }
-
-    /**
-     * @internal You should not use this directly from another application
-     *
-     * @param string $S
-     * @return bool
-     * @throws SodiumException
-     * @throws TypeError
-     */
-    public static function check_S_lt_L($S)
-    {
-        if (self::strlen($S) < 32) {
-            throw new SodiumException('Signature must be 32 bytes');
-        }
-        static $L = array(
-            0xed, 0xd3, 0xf5, 0x5c, 0x1a, 0x63, 0x12, 0x58,
-            0xd6, 0x9c, 0xf7, 0xa2, 0xde, 0xf9, 0xde, 0x14,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10
-        );
-        /** @var array<int, int> $L */
-        $c = 0;
-        $n = 1;
-        $i = 32;
-
-        do {
-            --$i;
-            $x = self::chrToInt($S[$i]);
-            $c |= (
-                (($x - $L[$i]) >> 8) & $n
-            );
-            $n &= (
-                (($x ^ $L[$i]) - 1) >> 8
-            );
-        } while ($i !== 0);
-
-        return $c === 0;
-    }
-
-    /**
-     * @param string $R
-     * @return bool
-     * @throws SodiumException
-     * @throws TypeError
-     */
-    public static function small_order($R)
-    {
-        static $blocklist = array(
-            /* 0 (order 4) */
-            array(
-                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-            ),
-            /* 1 (order 1) */
-            array(
-                0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-            ),
-            /* 2707385501144840649318225287225658788936804267575313519463743609750303402022 (order 8) */
-            array(
-                0x26, 0xe8, 0x95, 0x8f, 0xc2, 0xb2, 0x27, 0xb0,
-                0x45, 0xc3, 0xf4, 0x89, 0xf2, 0xef, 0x98, 0xf0,
-                0xd5, 0xdf, 0xac, 0x05, 0xd3, 0xc6, 0x33, 0x39,
-                0xb1, 0x38, 0x02, 0x88, 0x6d, 0x53, 0xfc, 0x05
-            ),
-            /* 55188659117513257062467267217118295137698188065244968500265048394206261417927 (order 8) */
-            array(
-                0xc7, 0x17, 0x6a, 0x70, 0x3d, 0x4d, 0xd8, 0x4f,
-                0xba, 0x3c, 0x0b, 0x76, 0x0d, 0x10, 0x67, 0x0f,
-                0x2a, 0x20, 0x53, 0xfa, 0x2c, 0x39, 0xcc, 0xc6,
-                0x4e, 0xc7, 0xfd, 0x77, 0x92, 0xac, 0x03, 0x7a
-            ),
-            /* p-1 (order 2) */
-            array(
-                0x13, 0xe8, 0x95, 0x8f, 0xc2, 0xb2, 0x27, 0xb0,
-                0x45, 0xc3, 0xf4, 0x89, 0xf2, 0xef, 0x98, 0xf0,
-                0xd5, 0xdf, 0xac, 0x05, 0xd3, 0xc6, 0x33, 0x39,
-                0xb1, 0x38, 0x02, 0x88, 0x6d, 0x53, 0xfc, 0x85
-            ),
-            /* p (order 4) */
-            array(
-                0xb4, 0x17, 0x6a, 0x70, 0x3d, 0x4d, 0xd8, 0x4f,
-                0xba, 0x3c, 0x0b, 0x76, 0x0d, 0x10, 0x67, 0x0f,
-                0x2a, 0x20, 0x53, 0xfa, 0x2c, 0x39, 0xcc, 0xc6,
-                0x4e, 0xc7, 0xfd, 0x77, 0x92, 0xac, 0x03, 0xfa
-            ),
-            /* p+1 (order 1) */
-            array(
-                0xec, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-                0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-                0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-                0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f
-            ),
-            /* p+2707385501144840649318225287225658788936804267575313519463743609750303402022 (order 8) */
-            array(
-                0xed, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-                0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-                0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-                0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f
-            ),
-            /* p+55188659117513257062467267217118295137698188065244968500265048394206261417927 (order 8) */
-            array(
-                0xee, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-                0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-                0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-                0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f
-            ),
-            /* 2p-1 (order 2) */
-            array(
-                0xd9, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-                0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-                0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-                0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
-            ),
-            /* 2p (order 4) */
-            array(
-                0xda, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-                0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-                0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-                0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
-            ),
-            /* 2p+1 (order 1) */
-            array(
-                0xdb, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-                0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-                0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-                0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
-            )
-        );
-        /** @var array<int, array<int, int>> $blocklist */
-        $countBlocklist = count($blocklist);
-
-        for ($i = 0; $i < $countBlocklist; ++$i) {
-            $c = 0;
-            for ($j = 0; $j < 32; ++$j) {
-                $c |= self::chrToInt($R[$j]) ^ $blocklist[$i][$j];
-            }
-            if ($c === 0) {
-                return true;
-            }
-        }
-        return false;
-    }
-}

diff --git a/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core32/HChaCha20.php b/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core32/HChaCha20.php
deleted file mode 100644 (file)
index 551d995..0000000
--- a/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core32/HChaCha20.php
+++ /dev/null
@@ -1,127 +0,0 @@
-<?php
-
-if (class_exists('ParagonIE_Sodium_Core32_HChaCha20', false)) {
-    return;
-}
-
-/**
- * Class ParagonIE_Sodium_Core_HChaCha20
- */
-class ParagonIE_Sodium_Core32_HChaCha20 extends ParagonIE_Sodium_Core32_ChaCha20
-{
-    /**
-     * @param string $in
-     * @param string $key
-     * @param string|null $c
-     * @return string
-     * @throws SodiumException
-     * @throws TypeError
-     */
-    public static function hChaCha20($in = '', $key = '', $c = null)
-    {
-        $ctx = array();
-
-        if ($c === null) {
-            $ctx[0] = new ParagonIE_Sodium_Core32_Int32(array(0x6170, 0x7865));
-            $ctx[1] = new ParagonIE_Sodium_Core32_Int32(array(0x3320, 0x646e));
-            $ctx[2] = new ParagonIE_Sodium_Core32_Int32(array(0x7962, 0x2d32));
-            $ctx[3] = new ParagonIE_Sodium_Core32_Int32(array(0x6b20, 0x6574));
-        } else {
-            $ctx[0] = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($c, 0, 4));
-            $ctx[1] = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($c, 4, 4));
-            $ctx[2] = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($c, 8, 4));
-            $ctx[3] = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($c, 12, 4));
-        }
-        $ctx[4]  = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($key, 0, 4));
-        $ctx[5]  = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($key, 4, 4));
-        $ctx[6]  = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($key, 8, 4));
-        $ctx[7]  = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($key, 12, 4));
-        $ctx[8]  = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($key, 16, 4));
-        $ctx[9]  = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($key, 20, 4));
-        $ctx[10] = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($key, 24, 4));
-        $ctx[11] = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($key, 28, 4));
-        $ctx[12] = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($in, 0, 4));
-        $ctx[13] = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($in, 4, 4));
-        $ctx[14] = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($in, 8, 4));
-        $ctx[15] = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($in, 12, 4));
-
-        return self::hChaCha20Bytes($ctx);
-    }
-
-    /**
-     * @param array $ctx
-     * @return string
-     * @throws SodiumException
-     * @throws TypeError
-     */
-    protected static function hChaCha20Bytes(array $ctx)
-    {
-        /** @var ParagonIE_Sodium_Core32_Int32 $x0 */
-        $x0  = $ctx[0];
-        /** @var ParagonIE_Sodium_Core32_Int32 $x1 */
-        $x1  = $ctx[1];
-        /** @var ParagonIE_Sodium_Core32_Int32 $x2 */
-        $x2  = $ctx[2];
-        /** @var ParagonIE_Sodium_Core32_Int32 $x3 */
-        $x3  = $ctx[3];
-        /** @var ParagonIE_Sodium_Core32_Int32 $x4 */
-        $x4  = $ctx[4];
-        /** @var ParagonIE_Sodium_Core32_Int32 $x5 */
-        $x5  = $ctx[5];
-        /** @var ParagonIE_Sodium_Core32_Int32 $x6 */
-        $x6  = $ctx[6];
-        /** @var ParagonIE_Sodium_Core32_Int32 $x7 */
-        $x7  = $ctx[7];
-        /** @var ParagonIE_Sodium_Core32_Int32 $x8 */
-        $x8  = $ctx[8];
-        /** @var ParagonIE_Sodium_Core32_Int32 $x9 */
-        $x9  = $ctx[9];
-        /** @var ParagonIE_Sodium_Core32_Int32 $x10 */
-        $x10 = $ctx[10];
-        /** @var ParagonIE_Sodium_Core32_Int32 $x11 */
-        $x11 = $ctx[11];
-        /** @var ParagonIE_Sodium_Core32_Int32 $x12 */
-        $x12 = $ctx[12];
-        /** @var ParagonIE_Sodium_Core32_Int32 $x13 */
-        $x13 = $ctx[13];
-        /** @var ParagonIE_Sodium_Core32_Int32 $x14 */
-        $x14 = $ctx[14];
-        /** @var ParagonIE_Sodium_Core32_Int32 $x15 */
-        $x15 = $ctx[15];
-
-        for ($i = 0; $i < 10; ++$i) {
-            # QUARTERROUND( x0,  x4,  x8,  x12)
-            list($x0, $x4, $x8, $x12) = self::quarterRound($x0, $x4, $x8, $x12);
-
-            # QUARTERROUND( x1,  x5,  x9,  x13)
-            list($x1, $x5, $x9, $x13) = self::quarterRound($x1, $x5, $x9, $x13);
-
-            # QUARTERROUND( x2,  x6,  x10,  x14)
-            list($x2, $x6, $x10, $x14) = self::quarterRound($x2, $x6, $x10, $x14);
-
-            # QUARTERROUND( x3,  x7,  x11,  x15)
-            list($x3, $x7, $x11, $x15) = self::quarterRound($x3, $x7, $x11, $x15);
-
-            # QUARTERROUND( x0,  x5,  x10,  x15)
-            list($x0, $x5, $x10, $x15) = self::quarterRound($x0, $x5, $x10, $x15);
-
-            # QUARTERROUND( x1,  x6,  x11,  x12)
-            list($x1, $x6, $x11, $x12) = self::quarterRound($x1, $x6, $x11, $x12);
-
-            # QUARTERROUND( x2,  x7,  x8,  x13)
-            list($x2, $x7, $x8, $x13) = self::quarterRound($x2, $x7, $x8, $x13);
-
-            # QUARTERROUND( x3,  x4,  x9,  x14)
-            list($x3, $x4, $x9, $x14) = self::quarterRound($x3, $x4, $x9, $x14);
-        }
-
-        return $x0->toReverseString() .
-            $x1->toReverseString() .
-            $x2->toReverseString() .
-            $x3->toReverseString() .
-            $x12->toReverseString() .
-            $x13->toReverseString() .
-            $x14->toReverseString() .
-            $x15->toReverseString();
-    }
-}

diff --git a/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core32/HSalsa20.php b/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core32/HSalsa20.php
deleted file mode 100644 (file)
index 39287f2..0000000
--- a/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core32/HSalsa20.php
+++ /dev/null
@@ -1,141 +0,0 @@
-<?php
-
-if (class_exists('ParagonIE_Sodium_Core32_HSalsa20', false)) {
-    return;
-}
-
-/**
- * Class ParagonIE_Sodium_Core32_HSalsa20
- */
-abstract class ParagonIE_Sodium_Core32_HSalsa20 extends ParagonIE_Sodium_Core32_Salsa20
-{
-    /**
-     * Calculate an hsalsa20 hash of a single block
-     *
-     * HSalsa20 doesn't have a counter and will never be used for more than
-     * one block (used to derive a subkey for xsalsa20).
-     *
-     * @internal You should not use this directly from another application
-     *
-     * @param string $in
-     * @param string $k
-     * @param string|null $c
-     * @return string
-     * @throws SodiumException
-     * @throws TypeError
-     */
-    public static function hsalsa20($in, $k, $c = null)
-    {
-        /**
-         * @var ParagonIE_Sodium_Core32_Int32 $x0
-         * @var ParagonIE_Sodium_Core32_Int32 $x1
-         * @var ParagonIE_Sodium_Core32_Int32 $x2
-         * @var ParagonIE_Sodium_Core32_Int32 $x3
-         * @var ParagonIE_Sodium_Core32_Int32 $x4
-         * @var ParagonIE_Sodium_Core32_Int32 $x5
-         * @var ParagonIE_Sodium_Core32_Int32 $x6
-         * @var ParagonIE_Sodium_Core32_Int32 $x7
-         * @var ParagonIE_Sodium_Core32_Int32 $x8
-         * @var ParagonIE_Sodium_Core32_Int32 $x9
-         * @var ParagonIE_Sodium_Core32_Int32 $x10
-         * @var ParagonIE_Sodium_Core32_Int32 $x11
-         * @var ParagonIE_Sodium_Core32_Int32 $x12
-         * @var ParagonIE_Sodium_Core32_Int32 $x13
-         * @var ParagonIE_Sodium_Core32_Int32 $x14
-         * @var ParagonIE_Sodium_Core32_Int32 $x15
-         * @var ParagonIE_Sodium_Core32_Int32 $j0
-         * @var ParagonIE_Sodium_Core32_Int32 $j1
-         * @var ParagonIE_Sodium_Core32_Int32 $j2
-         * @var ParagonIE_Sodium_Core32_Int32 $j3
-         * @var ParagonIE_Sodium_Core32_Int32 $j4
-         * @var ParagonIE_Sodium_Core32_Int32 $j5
-         * @var ParagonIE_Sodium_Core32_Int32 $j6
-         * @var ParagonIE_Sodium_Core32_Int32 $j7
-         * @var ParagonIE_Sodium_Core32_Int32 $j8
-         * @var ParagonIE_Sodium_Core32_Int32 $j9
-         * @var ParagonIE_Sodium_Core32_Int32 $j10
-         * @var ParagonIE_Sodium_Core32_Int32 $j11
-         * @var ParagonIE_Sodium_Core32_Int32 $j12
-         * @var ParagonIE_Sodium_Core32_Int32 $j13
-         * @var ParagonIE_Sodium_Core32_Int32 $j14
-         * @var ParagonIE_Sodium_Core32_Int32 $j15
-         */
-        if (self::strlen($k) < 32) {
-            throw new RangeException('Key must be 32 bytes long');
-        }
-        if ($c === null) {
-            $x0  = new ParagonIE_Sodium_Core32_Int32(array(0x6170, 0x7865));
-            $x5  = new ParagonIE_Sodium_Core32_Int32(array(0x3320, 0x646e));
-            $x10 = new ParagonIE_Sodium_Core32_Int32(array(0x7962, 0x2d32));
-            $x15 = new ParagonIE_Sodium_Core32_Int32(array(0x6b20, 0x6574));
-        } else {
-            $x0  = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($c, 0, 4));
-            $x5  = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($c, 4, 4));
-            $x10 = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($c, 8, 4));
-            $x15 = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($c, 12, 4));
-        }
-        $x1  = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($k, 0, 4));
-        $x2  = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($k, 4, 4));
-        $x3  = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($k, 8, 4));
-        $x4  = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($k, 12, 4));
-        $x6  = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($in, 0, 4));
-        $x7  = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($in, 4, 4));
-        $x8  = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($in, 8, 4));
-        $x9  = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($in, 12, 4));
-        $x11 = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($k, 16, 4));
-        $x12 = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($k, 20, 4));
-        $x13 = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($k, 24, 4));
-        $x14 = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($k, 28, 4));
-
-        for ($i = self::ROUNDS; $i > 0; $i -= 2) {
-            $x4  = $x4->xorInt32($x0->addInt32($x12)->rotateLeft(7));
-            $x8  = $x8->xorInt32($x4->addInt32($x0)->rotateLeft(9));
-            $x12 = $x12->xorInt32($x8->addInt32($x4)->rotateLeft(13));
-            $x0  = $x0->xorInt32($x12->addInt32($x8)->rotateLeft(18));
-
-            $x9  = $x9->xorInt32($x5->addInt32($x1)->rotateLeft(7));
-            $x13 = $x13->xorInt32($x9->addInt32($x5)->rotateLeft(9));
-            $x1  = $x1->xorInt32($x13->addInt32($x9)->rotateLeft(13));
-            $x5  = $x5->xorInt32($x1->addInt32($x13)->rotateLeft(18));
-
-            $x14 = $x14->xorInt32($x10->addInt32($x6)->rotateLeft(7));
-            $x2  = $x2->xorInt32($x14->addInt32($x10)->rotateLeft(9));
-            $x6  = $x6->xorInt32($x2->addInt32($x14)->rotateLeft(13));
-            $x10 = $x10->xorInt32($x6->addInt32($x2)->rotateLeft(18));
-
-            $x3  = $x3->xorInt32($x15->addInt32($x11)->rotateLeft(7));
-            $x7  = $x7->xorInt32($x3->addInt32($x15)->rotateLeft(9));
-            $x11 = $x11->xorInt32($x7->addInt32($x3)->rotateLeft(13));
-            $x15 = $x15->xorInt32($x11->addInt32($x7)->rotateLeft(18));
-
-            $x1  = $x1->xorInt32($x0->addInt32($x3)->rotateLeft(7));
-            $x2  = $x2->xorInt32($x1->addInt32($x0)->rotateLeft(9));
-            $x3  = $x3->xorInt32($x2->addInt32($x1)->rotateLeft(13));
-            $x0  = $x0->xorInt32($x3->addInt32($x2)->rotateLeft(18));
-
-            $x6  = $x6->xorInt32($x5->addInt32($x4)->rotateLeft(7));
-            $x7  = $x7->xorInt32($x6->addInt32($x5)->rotateLeft(9));
-            $x4  = $x4->xorInt32($x7->addInt32($x6)->rotateLeft(13));
-            $x5  = $x5->xorInt32($x4->addInt32($x7)->rotateLeft(18));
-
-            $x11 = $x11->xorInt32($x10->addInt32($x9)->rotateLeft(7));
-            $x8  = $x8->xorInt32($x11->addInt32($x10)->rotateLeft(9));
-            $x9  = $x9->xorInt32($x8->addInt32($x11)->rotateLeft(13));
-            $x10 = $x10->xorInt32($x9->addInt32($x8)->rotateLeft(18));
-
-            $x12 = $x12->xorInt32($x15->addInt32($x14)->rotateLeft(7));
-            $x13 = $x13->xorInt32($x12->addInt32($x15)->rotateLeft(9));
-            $x14 = $x14->xorInt32($x13->addInt32($x12)->rotateLeft(13));
-            $x15 = $x15->xorInt32($x14->addInt32($x13)->rotateLeft(18));
-        }
-
-        return $x0->toReverseString() .
-            $x5->toReverseString() .
-            $x10->toReverseString() .
-            $x15->toReverseString() .
-            $x6->toReverseString() .
-            $x7->toReverseString() .
-            $x8->toReverseString() .
-            $x9->toReverseString();
-    }
-}

diff --git a/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core32/Int32.php b/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core32/Int32.php
deleted file mode 100644 (file)
index 8182155..0000000
--- a/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core32/Int32.php
+++ /dev/null
@@ -1,872 +0,0 @@
-<?php
-
-/**
- * Class ParagonIE_Sodium_Core32_Int32
- *
- * Encapsulates a 32-bit integer.
- *
- * These are immutable. It always returns a new instance.
- */
-class ParagonIE_Sodium_Core32_Int32
-{
-    /**
-     * @var array<int, int> - two 16-bit integers
-     *
-     * 0 is the higher 16 bits
-     * 1 is the lower 16 bits
-     */
-    public $limbs = array(0, 0);
-
-    /**
-     * @var int
-     */
-    public $overflow = 0;
-
-    /**
-     * @var bool
-     */
-    public $unsignedInt = false;
-
-    /**
-     * ParagonIE_Sodium_Core32_Int32 constructor.
-     * @param array $array
-     * @param bool $unsignedInt
-     */
-    public function __construct($array = array(0, 0), $unsignedInt = false)
-    {
-        $this->limbs = array(
-            (int) $array[0],
-            (int) $array[1]
-        );
-        $this->overflow = 0;
-        $this->unsignedInt = $unsignedInt;
-    }
-
-    /**
-     * Adds two int32 objects
-     *
-     * @param ParagonIE_Sodium_Core32_Int32 $addend
-     * @return ParagonIE_Sodium_Core32_Int32
-     */
-    public function addInt32(ParagonIE_Sodium_Core32_Int32 $addend)
-    {
-        $i0 = $this->limbs[0];
-        $i1 = $this->limbs[1];
-        $j0 = $addend->limbs[0];
-        $j1 = $addend->limbs[1];
-
-        $r1 = $i1 + ($j1 & 0xffff);
-        $carry = $r1 >> 16;
-
-        $r0 = $i0 + ($j0 & 0xffff) + $carry;
-        $carry = $r0 >> 16;
-
-        $r0 &= 0xffff;
-        $r1 &= 0xffff;
-
-        $return = new ParagonIE_Sodium_Core32_Int32(
-            array($r0, $r1)
-        );
-        $return->overflow = $carry;
-        $return->unsignedInt = $this->unsignedInt;
-        return $return;
-    }
-
-    /**
-     * Adds a normal integer to an int32 object
-     *
-     * @param int $int
-     * @return ParagonIE_Sodium_Core32_Int32
-     * @throws SodiumException
-     * @throws TypeError
-     */
-    public function addInt($int)
-    {
-        ParagonIE_Sodium_Core32_Util::declareScalarType($int, 'int', 1);
-        /** @var int $int */
-        $int = (int) $int;
-
-        $int = (int) $int;
-
-        $i0 = $this->limbs[0];
-        $i1 = $this->limbs[1];
-
-        $r1 = $i1 + ($int & 0xffff);
-        $carry = $r1 >> 16;
-
-        $r0 = $i0 + (($int >> 16) & 0xffff) + $carry;
-        $carry = $r0 >> 16;
-        $r0 &= 0xffff;
-        $r1 &= 0xffff;
-        $return = new ParagonIE_Sodium_Core32_Int32(
-            array($r0, $r1)
-        );
-        $return->overflow = $carry;
-        $return->unsignedInt = $this->unsignedInt;
-        return $return;
-    }
-
-    /**
-     * @param int $b
-     * @return int
-     */
-    public function compareInt($b = 0)
-    {
-        $gt = 0;
-        $eq = 1;
-
-        $i = 2;
-        $j = 0;
-        while ($i > 0) {
-            --$i;
-            /** @var int $x1 */
-            $x1 = $this->limbs[$i];
-            /** @var int $x2 */
-            $x2 = ($b >> ($j << 4)) & 0xffff;
-            /** @var int $gt */
-            $gt |= (($x2 - $x1) >> 8) & $eq;
-            /** @var int $eq */
-            $eq &= (($x2 ^ $x1) - 1) >> 8;
-        }
-        return ($gt + $gt - $eq) + 1;
-    }
-
-    /**
-     * @param int $m
-     * @return ParagonIE_Sodium_Core32_Int32
-     */
-    public function mask($m = 0)
-    {
-        /** @var int $hi */
-        $hi = ((int) $m >> 16);
-        $hi &= 0xffff;
-        /** @var int $lo */
-        $lo = ((int) $m) & 0xffff;
-        return new ParagonIE_Sodium_Core32_Int32(
-            array(
-                (int) ($this->limbs[0] & $hi),
-                (int) ($this->limbs[1] & $lo)
-            ),
-            $this->unsignedInt
-        );
-    }
-
-    /**
-     * @param array<int, int> $a
-     * @param array<int, int> $b
-     * @param int $baseLog2
-     * @return array<int, int>
-     */
-    public function multiplyLong(array $a, array $b, $baseLog2 = 16)
-    {
-        $a_l = count($a);
-        $b_l = count($b);
-        /** @var array<int, int> $r */
-        $r = array_fill(0, $a_l + $b_l + 1, 0);
-        $base = 1 << $baseLog2;
-        for ($i = 0; $i < $a_l; ++$i) {
-            $a_i = $a[$i];
-            for ($j = 0; $j < $a_l; ++$j) {
-                $b_j = $b[$j];
-                $product = ($a_i * $b_j) + $r[$i + $j];
-                $carry = ((int) $product >> $baseLog2 & 0xffff);
-                $r[$i + $j] = ((int) $product - (int) ($carry * $base)) & 0xffff;
-                $r[$i + $j + 1] += $carry;
-            }
-        }
-        return array_slice($r, 0, 5);
-    }
-
-    /**
-     * @param int $int
-     * @return ParagonIE_Sodium_Core32_Int32
-     */
-    public function mulIntFast($int)
-    {
-        // Handle negative numbers
-        $aNeg = ($this->limbs[0] >> 15) & 1;
-        $bNeg = ($int >> 31) & 1;
-        $a = array_reverse($this->limbs);
-        $b = array(
-            $int & 0xffff,
-            ($int >> 16) & 0xffff
-        );
-        if ($aNeg) {
-            for ($i = 0; $i < 2; ++$i) {
-                $a[$i] = ($a[$i] ^ 0xffff) & 0xffff;
-            }
-            ++$a[0];
-        }
-        if ($bNeg) {
-            for ($i = 0; $i < 2; ++$i) {
-                $b[$i] = ($b[$i] ^ 0xffff) & 0xffff;
-            }
-            ++$b[0];
-        }
-        // Multiply
-        $res = $this->multiplyLong($a, $b);
-
-        // Re-apply negation to results
-        if ($aNeg !== $bNeg) {
-            for ($i = 0; $i < 2; ++$i) {
-                $res[$i] = (0xffff ^ $res[$i]) & 0xffff;
-            }
-            // Handle integer overflow
-            $c = 1;
-            for ($i = 0; $i < 2; ++$i) {
-                $res[$i] += $c;
-                $c = $res[$i] >> 16;
-                $res[$i] &= 0xffff;
-            }
-        }
-
-        // Return our values
-        $return = new ParagonIE_Sodium_Core32_Int32();
-        $return->limbs = array(
-            $res[1] & 0xffff,
-            $res[0] & 0xffff
-        );
-        if (count($res) > 2) {
-            $return->overflow = $res[2] & 0xffff;
-        }
-        $return->unsignedInt = $this->unsignedInt;
-        return $return;
-    }
-
-    /**
-     * @param ParagonIE_Sodium_Core32_Int32 $right
-     * @return ParagonIE_Sodium_Core32_Int32
-     */
-    public function mulInt32Fast(ParagonIE_Sodium_Core32_Int32 $right)
-    {
-        $aNeg = ($this->limbs[0] >> 15) & 1;
-        $bNeg = ($right->limbs[0] >> 15) & 1;
-
-        $a = array_reverse($this->limbs);
-        $b = array_reverse($right->limbs);
-        if ($aNeg) {
-            for ($i = 0; $i < 2; ++$i) {
-                $a[$i] = ($a[$i] ^ 0xffff) & 0xffff;
-            }
-            ++$a[0];
-        }
-        if ($bNeg) {
-            for ($i = 0; $i < 2; ++$i) {
-                $b[$i] = ($b[$i] ^ 0xffff) & 0xffff;
-            }
-            ++$b[0];
-        }
-        $res = $this->multiplyLong($a, $b);
-        if ($aNeg !== $bNeg) {
-            if ($aNeg !== $bNeg) {
-                for ($i = 0; $i < 2; ++$i) {
-                    $res[$i] = ($res[$i] ^ 0xffff) & 0xffff;
-                }
-                $c = 1;
-                for ($i = 0; $i < 2; ++$i) {
-                    $res[$i] += $c;
-                    $c = $res[$i] >> 16;
-                    $res[$i] &= 0xffff;
-                }
-            }
-        }
-        $return = new ParagonIE_Sodium_Core32_Int32();
-        $return->limbs = array(
-            $res[1] & 0xffff,
-            $res[0] & 0xffff
-        );
-        if (count($res) > 2) {
-            $return->overflow = $res[2];
-        }
-        return $return;
-    }
-
-    /**
-     * @param int $int
-     * @param int $size
-     * @return ParagonIE_Sodium_Core32_Int32
-     * @throws SodiumException
-     * @throws TypeError
-     */
-    public function mulInt($int = 0, $size = 0)
-    {
-        ParagonIE_Sodium_Core32_Util::declareScalarType($int, 'int', 1);
-        ParagonIE_Sodium_Core32_Util::declareScalarType($size, 'int', 2);
-        if (ParagonIE_Sodium_Compat::$fastMult) {
-            return $this->mulIntFast((int) $int);
-        }
-        /** @var int $int */
-        $int = (int) $int;
-        /** @var int $size */
-        $size = (int) $size;
-
-        if (!$size) {
-            $size = 31;
-        }
-        /** @var int $size */
-
-        $a = clone $this;
-        $return = new ParagonIE_Sodium_Core32_Int32();
-        $return->unsignedInt = $this->unsignedInt;
-
-        // Initialize:
-        $ret0 = 0;
-        $ret1 = 0;
-        $a0 = $a->limbs[0];
-        $a1 = $a->limbs[1];
-
-        /** @var int $size */
-        /** @var int $i */
-        for ($i = $size; $i >= 0; --$i) {
-            $m = (int) (-($int & 1));
-            $x0 = $a0 & $m;
-            $x1 = $a1 & $m;
-
-            $ret1 += $x1;
-            $c = $ret1 >> 16;
-
-            $ret0 += $x0 + $c;
-
-            $ret0 &= 0xffff;
-            $ret1 &= 0xffff;
-
-            $a1 = ($a1 << 1);
-            $x1 = $a1 >> 16;
-            $a0 = ($a0 << 1) | $x1;
-            $a0 &= 0xffff;
-            $a1 &= 0xffff;
-            $int >>= 1;
-        }
-        $return->limbs[0] = $ret0;
-        $return->limbs[1] = $ret1;
-        return $return;
-    }
-
-    /**
-     * @param ParagonIE_Sodium_Core32_Int32 $int
-     * @param int $size
-     * @return ParagonIE_Sodium_Core32_Int32
-     * @throws SodiumException
-     * @throws TypeError
-     */
-    public function mulInt32(ParagonIE_Sodium_Core32_Int32 $int, $size = 0)
-    {
-        ParagonIE_Sodium_Core32_Util::declareScalarType($size, 'int', 2);
-        if (ParagonIE_Sodium_Compat::$fastMult) {
-            return $this->mulInt32Fast($int);
-        }
-        if (!$size) {
-            $size = 31;
-        }
-        /** @var int $size */
-
-        $a = clone $this;
-        $b = clone $int;
-        $return = new ParagonIE_Sodium_Core32_Int32();
-        $return->unsignedInt = $this->unsignedInt;
-
-        // Initialize:
-        $ret0 = 0;
-        $ret1 = 0;
-        $a0 = $a->limbs[0];
-        $a1 = $a->limbs[1];
-        $b0 = $b->limbs[0];
-        $b1 = $b->limbs[1];
-
-        /** @var int $size */
-        /** @var int $i */
-        for ($i = $size; $i >= 0; --$i) {
-            $m = (int) (-($b1 & 1));
-            $x0 = $a0 & $m;
-            $x1 = $a1 & $m;
-
-            $ret1 += $x1;
-            $c = $ret1 >> 16;
-
-            $ret0 += $x0 + $c;
-
-            $ret0 &= 0xffff;
-            $ret1 &= 0xffff;
-
-            $a1 = ($a1 << 1);
-            $x1 = $a1 >> 16;
-            $a0 = ($a0 << 1) | $x1;
-            $a0 &= 0xffff;
-            $a1 &= 0xffff;
-
-            $x0 = ($b0 & 1) << 16;
-            $b0 = ($b0 >> 1);
-            $b1 = (($b1 | $x0) >> 1);
-
-            $b0 &= 0xffff;
-            $b1 &= 0xffff;
-
-        }
-        $return->limbs[0] = $ret0;
-        $return->limbs[1] = $ret1;
-
-        return $return;
-    }
-
-    /**
-     * OR this 32-bit integer with another.
-     *
-     * @param ParagonIE_Sodium_Core32_Int32 $b
-     * @return ParagonIE_Sodium_Core32_Int32
-     */
-    public function orInt32(ParagonIE_Sodium_Core32_Int32 $b)
-    {
-        $return = new ParagonIE_Sodium_Core32_Int32();
-        $return->unsignedInt = $this->unsignedInt;
-        $return->limbs = array(
-            (int) ($this->limbs[0] | $b->limbs[0]),
-            (int) ($this->limbs[1] | $b->limbs[1])
-        );
-        /** @var int overflow */
-        $return->overflow = $this->overflow | $b->overflow;
-        return $return;
-    }
-
-    /**
-     * @param int $b
-     * @return bool
-     */
-    public function isGreaterThan($b = 0)
-    {
-        return $this->compareInt($b) > 0;
-    }
-
-    /**
-     * @param int $b
-     * @return bool
-     */
-    public function isLessThanInt($b = 0)
-    {
-        return $this->compareInt($b) < 0;
-    }
-
-    /**
-     * @param int $c
-     * @return ParagonIE_Sodium_Core32_Int32
-     * @throws SodiumException
-     * @throws TypeError
-     * @psalm-suppress MixedArrayAccess
-     */
-    public function rotateLeft($c = 0)
-    {
-        ParagonIE_Sodium_Core32_Util::declareScalarType($c, 'int', 1);
-        /** @var int $c */
-        $c = (int) $c;
-
-        $return = new ParagonIE_Sodium_Core32_Int32();
-        $return->unsignedInt = $this->unsignedInt;
-        $c &= 31;
-        if ($c === 0) {
-            // NOP, but we want a copy.
-            $return->limbs = $this->limbs;
-        } else {
-            /** @var int $c */
-
-            /** @var int $idx_shift */
-            $idx_shift = ($c >> 4) & 1;
-
-            /** @var int $sub_shift */
-            $sub_shift = $c & 15;
-
-            /** @var array<int, int> $limbs */
-            $limbs =& $return->limbs;
-
-            /** @var array<int, int> $myLimbs */
-            $myLimbs =& $this->limbs;
-
-            for ($i = 1; $i >= 0; --$i) {
-                /** @var int $j */
-                $j = ($i + $idx_shift) & 1;
-                /** @var int $k */
-                $k = ($i + $idx_shift + 1) & 1;
-                $limbs[$i] = (int) (
-                    (
-                        ((int) ($myLimbs[$j]) << $sub_shift)
-                            |
-                        ((int) ($myLimbs[$k]) >> (16 - $sub_shift))
-                    ) & 0xffff
-                );
-            }
-        }
-        return $return;
-    }
-
-    /**
-     * Rotate to the right
-     *
-     * @param int $c
-     * @return ParagonIE_Sodium_Core32_Int32
-     * @throws SodiumException
-     * @throws TypeError
-     * @psalm-suppress MixedArrayAccess
-     */
-    public function rotateRight($c = 0)
-    {
-        ParagonIE_Sodium_Core32_Util::declareScalarType($c, 'int', 1);
-        /** @var int $c */
-        $c = (int) $c;
-
-        $return = new ParagonIE_Sodium_Core32_Int32();
-        $return->unsignedInt = $this->unsignedInt;
-        $c &= 31;
-        /** @var int $c */
-        if ($c === 0) {
-            // NOP, but we want a copy.
-            $return->limbs = $this->limbs;
-        } else {
-            /** @var int $c */
-
-            /** @var int $idx_shift */
-            $idx_shift = ($c >> 4) & 1;
-
-            /** @var int $sub_shift */
-            $sub_shift = $c & 15;
-
-            /** @var array<int, int> $limbs */
-            $limbs =& $return->limbs;
-
-            /** @var array<int, int> $myLimbs */
-            $myLimbs =& $this->limbs;
-
-            for ($i = 1; $i >= 0; --$i) {
-                /** @var int $j */
-                $j = ($i - $idx_shift) & 1;
-                /** @var int $k */
-                $k = ($i - $idx_shift - 1) & 1;
-                $limbs[$i] = (int) (
-                    (
-                        ((int) ($myLimbs[$j]) >> (int) ($sub_shift))
-                            |
-                        ((int) ($myLimbs[$k]) << (16 - (int) ($sub_shift)))
-                    ) & 0xffff
-                );
-            }
-        }
-        return $return;
-    }
-
-    /**
-     * @param bool $bool
-     * @return self
-     */
-    public function setUnsignedInt($bool = false)
-    {
-        $this->unsignedInt = !empty($bool);
-        return $this;
-    }
-
-    /**
-     * @param int $c
-     * @return ParagonIE_Sodium_Core32_Int32
-     * @throws SodiumException
-     * @throws TypeError
-     */
-    public function shiftLeft($c = 0)
-    {
-        ParagonIE_Sodium_Core32_Util::declareScalarType($c, 'int', 1);
-        /** @var int $c */
-        $c = (int) $c;
-
-        $return = new ParagonIE_Sodium_Core32_Int32();
-        $return->unsignedInt = $this->unsignedInt;
-        $c &= 63;
-        /** @var int $c */
-        if ($c === 0) {
-            $return->limbs = $this->limbs;
-        } elseif ($c < 0) {
-            /** @var int $c */
-            return $this->shiftRight(-$c);
-        } else {
-            /** @var int $c */
-            /** @var int $tmp */
-            $tmp = $this->limbs[1] << $c;
-            $return->limbs[1] = (int)($tmp & 0xffff);
-            /** @var int $carry */
-            $carry = $tmp >> 16;
-
-            /** @var int $tmp */
-            $tmp = ($this->limbs[0] << $c) | ($carry & 0xffff);
-            $return->limbs[0] = (int) ($tmp & 0xffff);
-        }
-        return $return;
-    }
-
-    /**
-     * @param int $c
-     * @return ParagonIE_Sodium_Core32_Int32
-     * @throws SodiumException
-     * @throws TypeError
-     * @psalm-suppress MixedAssignment
-     * @psalm-suppress MixedOperand
-     */
-    public function shiftRight($c = 0)
-    {
-        ParagonIE_Sodium_Core32_Util::declareScalarType($c, 'int', 1);
-        /** @var int $c */
-        $c = (int) $c;
-
-        $return = new ParagonIE_Sodium_Core32_Int32();
-        $return->unsignedInt = $this->unsignedInt;
-        $c &= 63;
-        /** @var int $c */
-        if ($c >= 16) {
-            $return->limbs = array(
-                (int) ($this->overflow & 0xffff),
-                (int) ($this->limbs[0])
-            );
-            $return->overflow = $this->overflow >> 16;
-            return $return->shiftRight($c & 15);
-        }
-        if ($c === 0) {
-            $return->limbs = $this->limbs;
-        } elseif ($c < 0) {
-            /** @var int $c */
-            return $this->shiftLeft(-$c);
-        } else {
-            if (!is_int($c)) {
-                throw new TypeError();
-            }
-            /** @var int $c */
-            // $return->limbs[0] = (int) (($this->limbs[0] >> $c) & 0xffff);
-            $carryLeft = (int) ($this->overflow & ((1 << ($c + 1)) - 1));
-            $return->limbs[0] = (int) ((($this->limbs[0] >> $c) | ($carryLeft << (16 - $c))) & 0xffff);
-            $carryRight = (int) ($this->limbs[0] & ((1 << ($c + 1)) - 1));
-            $return->limbs[1] = (int) ((($this->limbs[1] >> $c) | ($carryRight << (16 - $c))) & 0xffff);
-            $return->overflow >>= $c;
-        }
-        return $return;
-    }
-
-    /**
-     * Subtract a normal integer from an int32 object.
-     *
-     * @param int $int
-     * @return ParagonIE_Sodium_Core32_Int32
-     * @throws SodiumException
-     * @throws TypeError
-     */
-    public function subInt($int)
-    {
-        ParagonIE_Sodium_Core32_Util::declareScalarType($int, 'int', 1);
-        /** @var int $int */
-        $int = (int) $int;
-
-        $return = new ParagonIE_Sodium_Core32_Int32();
-        $return->unsignedInt = $this->unsignedInt;
-
-        /** @var int $tmp */
-        $tmp = $this->limbs[1] - ($int & 0xffff);
-        /** @var int $carry */
-        $carry = $tmp >> 16;
-        $return->limbs[1] = (int) ($tmp & 0xffff);
-
-        /** @var int $tmp */
-        $tmp = $this->limbs[0] - (($int >> 16) & 0xffff) + $carry;
-        $return->limbs[0] = (int) ($tmp & 0xffff);
-        return $return;
-    }
-
-    /**
-     * Subtract two int32 objects from each other
-     *
-     * @param ParagonIE_Sodium_Core32_Int32 $b
-     * @return ParagonIE_Sodium_Core32_Int32
-     */
-    public function subInt32(ParagonIE_Sodium_Core32_Int32 $b)
-    {
-        $return = new ParagonIE_Sodium_Core32_Int32();
-        $return->unsignedInt = $this->unsignedInt;
-
-        /** @var int $tmp */
-        $tmp = $this->limbs[1] - ($b->limbs[1] & 0xffff);
-        /** @var int $carry */
-        $carry = $tmp >> 16;
-        $return->limbs[1] = (int) ($tmp & 0xffff);
-
-        /** @var int $tmp */
-        $tmp = $this->limbs[0] - ($b->limbs[0] & 0xffff) + $carry;
-        $return->limbs[0] = (int) ($tmp & 0xffff);
-        return $return;
-    }
-
-    /**
-     * XOR this 32-bit integer with another.
-     *
-     * @param ParagonIE_Sodium_Core32_Int32 $b
-     * @return ParagonIE_Sodium_Core32_Int32
-     */
-    public function xorInt32(ParagonIE_Sodium_Core32_Int32 $b)
-    {
-        $return = new ParagonIE_Sodium_Core32_Int32();
-        $return->unsignedInt = $this->unsignedInt;
-        $return->limbs = array(
-            (int) ($this->limbs[0] ^ $b->limbs[0]),
-            (int) ($this->limbs[1] ^ $b->limbs[1])
-        );
-        return $return;
-    }
-
-    /**
-     * @param int $signed
-     * @return self
-     * @throws SodiumException
-     * @throws TypeError
-     */
-    public static function fromInt($signed)
-    {
-        ParagonIE_Sodium_Core32_Util::declareScalarType($signed, 'int', 1);;
-        /** @var int $signed */
-        $signed = (int) $signed;
-
-        return new ParagonIE_Sodium_Core32_Int32(
-            array(
-                (int) (($signed >> 16) & 0xffff),
-                (int) ($signed & 0xffff)
-            )
-        );
-    }
-
-    /**
-     * @param string $string
-     * @return self
-     * @throws SodiumException
-     * @throws TypeError
-     */
-    public static function fromString($string)
-    {
-        ParagonIE_Sodium_Core32_Util::declareScalarType($string, 'string', 1);
-        $string = (string) $string;
-        if (ParagonIE_Sodium_Core32_Util::strlen($string) !== 4) {
-            throw new RangeException(
-                'String must be 4 bytes; ' . ParagonIE_Sodium_Core32_Util::strlen($string) . ' given.'
-            );
-        }
-        $return = new ParagonIE_Sodium_Core32_Int32();
-
-        $return->limbs[0]  = (int) ((ParagonIE_Sodium_Core32_Util::chrToInt($string[0]) & 0xff) << 8);
-        $return->limbs[0] |= (ParagonIE_Sodium_Core32_Util::chrToInt($string[1]) & 0xff);
-        $return->limbs[1]  = (int) ((ParagonIE_Sodium_Core32_Util::chrToInt($string[2]) & 0xff) << 8);
-        $return->limbs[1] |= (ParagonIE_Sodium_Core32_Util::chrToInt($string[3]) & 0xff);
-        return $return;
-    }
-
-    /**
-     * @param string $string
-     * @return self
-     * @throws SodiumException
-     * @throws TypeError
-     */
-    public static function fromReverseString($string)
-    {
-        ParagonIE_Sodium_Core32_Util::declareScalarType($string, 'string', 1);
-        $string = (string) $string;
-        if (ParagonIE_Sodium_Core32_Util::strlen($string) !== 4) {
-            throw new RangeException(
-                'String must be 4 bytes; ' . ParagonIE_Sodium_Core32_Util::strlen($string) . ' given.'
-            );
-        }
-        $return = new ParagonIE_Sodium_Core32_Int32();
-
-        $return->limbs[0]  = (int) ((ParagonIE_Sodium_Core32_Util::chrToInt($string[3]) & 0xff) << 8);
-        $return->limbs[0] |= (ParagonIE_Sodium_Core32_Util::chrToInt($string[2]) & 0xff);
-        $return->limbs[1]  = (int) ((ParagonIE_Sodium_Core32_Util::chrToInt($string[1]) & 0xff) << 8);
-        $return->limbs[1] |= (ParagonIE_Sodium_Core32_Util::chrToInt($string[0]) & 0xff);
-        return $return;
-    }
-
-    /**
-     * @return array<int, int>
-     */
-    public function toArray()
-    {
-        return array((int) ($this->limbs[0] << 16 | $this->limbs[1]));
-    }
-
-    /**
-     * @return string
-     * @throws TypeError
-     */
-    public function toString()
-    {
-        return
-            ParagonIE_Sodium_Core32_Util::intToChr(($this->limbs[0] >> 8) & 0xff) .
-            ParagonIE_Sodium_Core32_Util::intToChr($this->limbs[0] & 0xff) .
-            ParagonIE_Sodium_Core32_Util::intToChr(($this->limbs[1] >> 8) & 0xff) .
-            ParagonIE_Sodium_Core32_Util::intToChr($this->limbs[1] & 0xff);
-    }
-
-    /**
-     * @return int
-     */
-    public function toInt()
-    {
-        return (int) (
-            (($this->limbs[0] & 0xffff) << 16)
-                |
-            ($this->limbs[1] & 0xffff)
-        );
-    }
-
-    /**
-     * @return ParagonIE_Sodium_Core32_Int32
-     */
-    public function toInt32()
-    {
-        $return = new ParagonIE_Sodium_Core32_Int32();
-        $return->limbs[0] = (int) ($this->limbs[0] & 0xffff);
-        $return->limbs[1] = (int) ($this->limbs[1] & 0xffff);
-        $return->unsignedInt = $this->unsignedInt;
-        $return->overflow = (int) ($this->overflow & 0x7fffffff);
-        return $return;
-    }
-
-    /**
-     * @return ParagonIE_Sodium_Core32_Int64
-     */
-    public function toInt64()
-    {
-        $return = new ParagonIE_Sodium_Core32_Int64();
-        $return->unsignedInt = $this->unsignedInt;
-        if ($this->unsignedInt) {
-            $return->limbs[0] += (($this->overflow >> 16) & 0xffff);
-            $return->limbs[1] += (($this->overflow) & 0xffff);
-        } else {
-            $neg = -(($this->limbs[0] >> 15) & 1);
-            $return->limbs[0] = (int)($neg & 0xffff);
-            $return->limbs[1] = (int)($neg & 0xffff);
-        }
-        $return->limbs[2] = (int) ($this->limbs[0] & 0xffff);
-        $return->limbs[3] = (int) ($this->limbs[1] & 0xffff);
-        return $return;
-    }
-
-    /**
-     * @return string
-     * @throws TypeError
-     */
-    public function toReverseString()
-    {
-        return ParagonIE_Sodium_Core32_Util::intToChr($this->limbs[1] & 0xff) .
-            ParagonIE_Sodium_Core32_Util::intToChr(($this->limbs[1] >> 8) & 0xff) .
-            ParagonIE_Sodium_Core32_Util::intToChr($this->limbs[0] & 0xff) .
-            ParagonIE_Sodium_Core32_Util::intToChr(($this->limbs[0] >> 8) & 0xff);
-    }
-
-    /**
-     * @return string
-     */
-    public function __toString()
-    {
-        try {
-            return $this->toString();
-        } catch (TypeError $ex) {
-            // PHP engine can't handle exceptions from __toString()
-            return '';
-        }
-    }
-}

diff --git a/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core32/Int64.php b/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core32/Int64.php
deleted file mode 100644 (file)
index e94d798..0000000
--- a/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core32/Int64.php
+++ /dev/null
@@ -1,1066 +0,0 @@
-<?php
-
-/**
- * Class ParagonIE_Sodium_Core32_Int64
- *
- * Encapsulates a 64-bit integer.
- *
- * These are immutable. It always returns a new instance.
- */
-class ParagonIE_Sodium_Core32_Int64
-{
-    /**
-     * @var array<int, int> - four 16-bit integers
-     */
-    public $limbs = array(0, 0, 0, 0);
-
-    /**
-     * @var int
-     */
-    public $overflow = 0;
-
-    /**
-     * @var bool
-     */
-    public $unsignedInt = false;
-
-    /**
-     * ParagonIE_Sodium_Core32_Int64 constructor.
-     * @param array $array
-     * @param bool $unsignedInt
-     */
-    public function __construct($array = array(0, 0, 0, 0), $unsignedInt = false)
-    {
-        $this->limbs = array(
-            (int) $array[0],
-            (int) $array[1],
-            (int) $array[2],
-            (int) $array[3]
-        );
-        $this->overflow = 0;
-        $this->unsignedInt = $unsignedInt;
-    }
-
-    /**
-     * Adds two int64 objects
-     *
-     * @param ParagonIE_Sodium_Core32_Int64 $addend
-     * @return ParagonIE_Sodium_Core32_Int64
-     */
-    public function addInt64(ParagonIE_Sodium_Core32_Int64 $addend)
-    {
-        $i0 = $this->limbs[0];
-        $i1 = $this->limbs[1];
-        $i2 = $this->limbs[2];
-        $i3 = $this->limbs[3];
-        $j0 = $addend->limbs[0];
-        $j1 = $addend->limbs[1];
-        $j2 = $addend->limbs[2];
-        $j3 = $addend->limbs[3];
-
-        $r3 = $i3 + ($j3 & 0xffff);
-        $carry = $r3 >> 16;
-
-        $r2 = $i2 + ($j2 & 0xffff) + $carry;
-        $carry = $r2 >> 16;
-
-        $r1 = $i1 + ($j1 & 0xffff) + $carry;
-        $carry = $r1 >> 16;
-
-        $r0 = $i0 + ($j0 & 0xffff) + $carry;
-        $carry = $r0 >> 16;
-
-        $r0 &= 0xffff;
-        $r1 &= 0xffff;
-        $r2 &= 0xffff;
-        $r3 &= 0xffff;
-
-        $return = new ParagonIE_Sodium_Core32_Int64(
-            array($r0, $r1, $r2, $r3)
-        );
-        $return->overflow = $carry;
-        $return->unsignedInt = $this->unsignedInt;
-        return $return;
-    }
-
-    /**
-     * Adds a normal integer to an int64 object
-     *
-     * @param int $int
-     * @return ParagonIE_Sodium_Core32_Int64
-     * @throws SodiumException
-     * @throws TypeError
-     */
-    public function addInt($int)
-    {
-        ParagonIE_Sodium_Core32_Util::declareScalarType($int, 'int', 1);
-        /** @var int $int */
-        $int = (int) $int;
-
-        $i0 = $this->limbs[0];
-        $i1 = $this->limbs[1];
-        $i2 = $this->limbs[2];
-        $i3 = $this->limbs[3];
-
-        $r3 = $i3 + ($int & 0xffff);
-        $carry = $r3 >> 16;
-
-        $r2 = $i2 + (($int >> 16) & 0xffff) + $carry;
-        $carry = $r2 >> 16;
-
-        $r1 = $i1 + $carry;
-        $carry = $r1 >> 16;
-
-        $r0 = $i0 + $carry;
-        $carry = $r0 >> 16;
-
-        $r0 &= 0xffff;
-        $r1 &= 0xffff;
-        $r2 &= 0xffff;
-        $r3 &= 0xffff;
-        $return = new ParagonIE_Sodium_Core32_Int64(
-            array($r0, $r1, $r2, $r3)
-        );
-        $return->overflow = $carry;
-        $return->unsignedInt = $this->unsignedInt;
-        return $return;
-    }
-
-    /**
-     * @param int $b
-     * @return int
-     */
-    public function compareInt($b = 0)
-    {
-        $gt = 0;
-        $eq = 1;
-
-        $i = 4;
-        $j = 0;
-        while ($i > 0) {
-            --$i;
-            /** @var int $x1 */
-            $x1 = $this->limbs[$i];
-            /** @var int $x2 */
-            $x2 = ($b >> ($j << 4)) & 0xffff;
-            /** int */
-            $gt |= (($x2 - $x1) >> 8) & $eq;
-            /** int */
-            $eq &= (($x2 ^ $x1) - 1) >> 8;
-        }
-        return ($gt + $gt - $eq) + 1;
-    }
-
-    /**
-     * @param int $b
-     * @return bool
-     */
-    public function isGreaterThan($b = 0)
-    {
-        return $this->compareInt($b) > 0;
-    }
-
-    /**
-     * @param int $b
-     * @return bool
-     */
-    public function isLessThanInt($b = 0)
-    {
-        return $this->compareInt($b) < 0;
-    }
-
-    /**
-     * @param int $hi
-     * @param int $lo
-     * @return ParagonIE_Sodium_Core32_Int64
-     */
-    public function mask64($hi = 0, $lo = 0)
-    {
-        /** @var int $a */
-        $a = ($hi >> 16) & 0xffff;
-        /** @var int $b */
-        $b = ($hi) & 0xffff;
-        /** @var int $c */
-        $c = ($lo >> 16) & 0xffff;
-        /** @var int $d */
-        $d = ($lo & 0xffff);
-        return new ParagonIE_Sodium_Core32_Int64(
-            array(
-                $this->limbs[0] & $a,
-                $this->limbs[1] & $b,
-                $this->limbs[2] & $c,
-                $this->limbs[3] & $d
-            ),
-            $this->unsignedInt
-        );
-    }
-
-    /**
-     * @param int $int
-     * @param int $size
-     * @return ParagonIE_Sodium_Core32_Int64
-     * @throws SodiumException
-     * @throws TypeError
-     * @psalm-suppress MixedAssignment
-     */
-    public function mulInt($int = 0, $size = 0)
-    {
-        if (ParagonIE_Sodium_Compat::$fastMult) {
-            return $this->mulIntFast($int);
-        }
-        ParagonIE_Sodium_Core32_Util::declareScalarType($int, 'int', 1);
-        ParagonIE_Sodium_Core32_Util::declareScalarType($size, 'int', 2);
-        /** @var int $int */
-        $int = (int) $int;
-        /** @var int $size */
-        $size = (int) $size;
-
-        if (!$size) {
-            $size = 63;
-        }
-
-        $a = clone $this;
-        $return = new ParagonIE_Sodium_Core32_Int64();
-        $return->unsignedInt = $this->unsignedInt;
-
-        // Initialize:
-        $ret0 = 0;
-        $ret1 = 0;
-        $ret2 = 0;
-        $ret3 = 0;
-        $a0 = $a->limbs[0];
-        $a1 = $a->limbs[1];
-        $a2 = $a->limbs[2];
-        $a3 = $a->limbs[3];
-
-        /** @var int $size */
-        /** @var int $i */
-        for ($i = $size; $i >= 0; --$i) {
-            $mask = -($int & 1);
-            $x0 = $a0 & $mask;
-            $x1 = $a1 & $mask;
-            $x2 = $a2 & $mask;
-            $x3 = $a3 & $mask;
-
-            $ret3 += $x3;
-            $c = $ret3 >> 16;
-
-            $ret2 += $x2 + $c;
-            $c = $ret2 >> 16;
-
-            $ret1 += $x1 + $c;
-            $c = $ret1 >> 16;
-
-            $ret0 += $x0 + $c;
-
-            $ret0 &= 0xffff;
-            $ret1 &= 0xffff;
-            $ret2 &= 0xffff;
-            $ret3 &= 0xffff;
-
-            $a3 = $a3 << 1;
-            $x3 = $a3 >> 16;
-            $a2 = ($a2 << 1) | $x3;
-            $x2 = $a2 >> 16;
-            $a1 = ($a1 << 1) | $x2;
-            $x1 = $a1 >> 16;
-            $a0 = ($a0 << 1) | $x1;
-            $a0 &= 0xffff;
-            $a1 &= 0xffff;
-            $a2 &= 0xffff;
-            $a3 &= 0xffff;
-
-            $int >>= 1;
-        }
-        $return->limbs[0] = $ret0;
-        $return->limbs[1] = $ret1;
-        $return->limbs[2] = $ret2;
-        $return->limbs[3] = $ret3;
-        return $return;
-    }
-
-    /**
-     * @param ParagonIE_Sodium_Core32_Int64 $A
-     * @param ParagonIE_Sodium_Core32_Int64 $B
-     * @return array<int, ParagonIE_Sodium_Core32_Int64>
-     * @throws SodiumException
-     * @throws TypeError
-     * @psalm-suppress MixedInferredReturnType
-     */
-    public static function ctSelect(
-        ParagonIE_Sodium_Core32_Int64 $A,
-        ParagonIE_Sodium_Core32_Int64 $B
-    ) {
-        $a = clone $A;
-        $b = clone $B;
-        /** @var int $aNeg */
-        $aNeg = ($a->limbs[0] >> 15) & 1;
-        /** @var int $bNeg */
-        $bNeg = ($b->limbs[0] >> 15) & 1;
-        /** @var int $m */
-        $m = (-($aNeg & $bNeg)) | 1;
-        /** @var int $swap */
-        $swap = $bNeg & ~$aNeg;
-        /** @var int $d */
-        $d = -$swap;
-
-        /*
-        if ($bNeg && !$aNeg) {
-            $a = clone $int;
-            $b = clone $this;
-        } elseif($bNeg && $aNeg) {
-            $a = $this->mulInt(-1);
-            $b = $int->mulInt(-1);
-        }
-         */
-        $x = $a->xorInt64($b)->mask64($d, $d);
-        return array(
-            $a->xorInt64($x)->mulInt($m),
-            $b->xorInt64($x)->mulInt($m)
-        );
-    }
-
-    /**
-     * @param array<int, int> $a
-     * @param array<int, int> $b
-     * @param int $baseLog2
-     * @return array<int, int>
-     */
-    public function multiplyLong(array $a, array $b, $baseLog2 = 16)
-    {
-        $a_l = count($a);
-        $b_l = count($b);
-        /** @var array<int, int> $r */
-        $r = array_fill(0, $a_l + $b_l + 1, 0);
-        $base = 1 << $baseLog2;
-        for ($i = 0; $i < $a_l; ++$i) {
-            $a_i = $a[$i];
-            for ($j = 0; $j < $a_l; ++$j) {
-                $b_j = $b[$j];
-                $product = (($a_i * $b_j) + $r[$i + $j]);
-                $carry = (((int) $product >> $baseLog2) & 0xffff);
-                $r[$i + $j] = ((int) $product - (int) ($carry * $base)) & 0xffff;
-                $r[$i + $j + 1] += $carry;
-            }
-        }
-        return array_slice($r, 0, 5);
-    }
-
-    /**
-     * @param int $int
-     * @return ParagonIE_Sodium_Core32_Int64
-     */
-    public function mulIntFast($int)
-    {
-        // Handle negative numbers
-        $aNeg = ($this->limbs[0] >> 15) & 1;
-        $bNeg = ($int >> 31) & 1;
-        $a = array_reverse($this->limbs);
-        $b = array(
-            $int & 0xffff,
-            ($int >> 16) & 0xffff,
-            -$bNeg & 0xffff,
-            -$bNeg & 0xffff
-        );
-        if ($aNeg) {
-            for ($i = 0; $i < 4; ++$i) {
-                $a[$i] = ($a[$i] ^ 0xffff) & 0xffff;
-            }
-            ++$a[0];
-        }
-        if ($bNeg) {
-            for ($i = 0; $i < 4; ++$i) {
-                $b[$i] = ($b[$i] ^ 0xffff) & 0xffff;
-            }
-            ++$b[0];
-        }
-        // Multiply
-        $res = $this->multiplyLong($a, $b);
-
-        // Re-apply negation to results
-        if ($aNeg !== $bNeg) {
-            for ($i = 0; $i < 4; ++$i) {
-                $res[$i] = (0xffff ^ $res[$i]) & 0xffff;
-            }
-            // Handle integer overflow
-            $c = 1;
-            for ($i = 0; $i < 4; ++$i) {
-                $res[$i] += $c;
-                $c = $res[$i] >> 16;
-                $res[$i] &= 0xffff;
-            }
-        }
-
-        // Return our values
-        $return = new ParagonIE_Sodium_Core32_Int64();
-        $return->limbs = array(
-            $res[3] & 0xffff,
-            $res[2] & 0xffff,
-            $res[1] & 0xffff,
-            $res[0] & 0xffff
-        );
-        if (count($res) > 4) {
-            $return->overflow = $res[4] & 0xffff;
-        }
-        $return->unsignedInt = $this->unsignedInt;
-        return $return;
-    }
-
-    /**
-     * @param ParagonIE_Sodium_Core32_Int64 $right
-     * @return ParagonIE_Sodium_Core32_Int64
-     */
-    public function mulInt64Fast(ParagonIE_Sodium_Core32_Int64 $right)
-    {
-        $aNeg = ($this->limbs[0] >> 15) & 1;
-        $bNeg = ($right->limbs[0] >> 15) & 1;
-
-        $a = array_reverse($this->limbs);
-        $b = array_reverse($right->limbs);
-        if ($aNeg) {
-            for ($i = 0; $i < 4; ++$i) {
-                $a[$i] = ($a[$i] ^ 0xffff) & 0xffff;
-            }
-            ++$a[0];
-        }
-        if ($bNeg) {
-            for ($i = 0; $i < 4; ++$i) {
-                $b[$i] = ($b[$i] ^ 0xffff) & 0xffff;
-            }
-            ++$b[0];
-        }
-        $res = $this->multiplyLong($a, $b);
-        if ($aNeg !== $bNeg) {
-            if ($aNeg !== $bNeg) {
-                for ($i = 0; $i < 4; ++$i) {
-                    $res[$i] = ($res[$i] ^ 0xffff) & 0xffff;
-                }
-                $c = 1;
-                for ($i = 0; $i < 4; ++$i) {
-                    $res[$i] += $c;
-                    $c = $res[$i] >> 16;
-                    $res[$i] &= 0xffff;
-                }
-            }
-        }
-        $return = new ParagonIE_Sodium_Core32_Int64();
-        $return->limbs = array(
-            $res[3] & 0xffff,
-            $res[2] & 0xffff,
-            $res[1] & 0xffff,
-            $res[0] & 0xffff
-        );
-        if (count($res) > 4) {
-            $return->overflow = $res[4];
-        }
-        return $return;
-    }
-
-    /**
-     * @param ParagonIE_Sodium_Core32_Int64 $int
-     * @param int $size
-     * @return ParagonIE_Sodium_Core32_Int64
-     * @throws SodiumException
-     * @throws TypeError
-     * @psalm-suppress MixedAssignment
-     */
-    public function mulInt64(ParagonIE_Sodium_Core32_Int64 $int, $size = 0)
-    {
-        if (ParagonIE_Sodium_Compat::$fastMult) {
-            return $this->mulInt64Fast($int);
-        }
-        ParagonIE_Sodium_Core32_Util::declareScalarType($size, 'int', 2);
-        if (!$size) {
-            $size = 63;
-        }
-        list($a, $b) = self::ctSelect($this, $int);
-
-        $return = new ParagonIE_Sodium_Core32_Int64();
-        $return->unsignedInt = $this->unsignedInt;
-
-        // Initialize:
-        $ret0 = 0;
-        $ret1 = 0;
-        $ret2 = 0;
-        $ret3 = 0;
-        $a0 = $a->limbs[0];
-        $a1 = $a->limbs[1];
-        $a2 = $a->limbs[2];
-        $a3 = $a->limbs[3];
-        $b0 = $b->limbs[0];
-        $b1 = $b->limbs[1];
-        $b2 = $b->limbs[2];
-        $b3 = $b->limbs[3];
-
-        /** @var int $size */
-        /** @var int $i */
-        for ($i = (int) $size; $i >= 0; --$i) {
-            $mask = -($b3 & 1);
-            $x0 = $a0 & $mask;
-            $x1 = $a1 & $mask;
-            $x2 = $a2 & $mask;
-            $x3 = $a3 & $mask;
-
-            $ret3 += $x3;
-            $c = $ret3 >> 16;
-
-            $ret2 += $x2 + $c;
-            $c = $ret2 >> 16;
-
-            $ret1 += $x1 + $c;
-            $c = $ret1 >> 16;
-
-            $ret0 += $x0 + $c;
-
-            $ret0 &= 0xffff;
-            $ret1 &= 0xffff;
-            $ret2 &= 0xffff;
-            $ret3 &= 0xffff;
-
-            $a3 = $a3 << 1;
-            $x3 = $a3 >> 16;
-            $a2 = ($a2 << 1) | $x3;
-            $x2 = $a2 >> 16;
-            $a1 = ($a1 << 1) | $x2;
-            $x1 = $a1 >> 16;
-            $a0 = ($a0 << 1) | $x1;
-            $a0 &= 0xffff;
-            $a1 &= 0xffff;
-            $a2 &= 0xffff;
-            $a3 &= 0xffff;
-
-            $x0 = ($b0 & 1) << 16;
-            $x1 = ($b1 & 1) << 16;
-            $x2 = ($b2 & 1) << 16;
-
-            $b0 = ($b0 >> 1);
-            $b1 = (($b1 | $x0) >> 1);
-            $b2 = (($b2 | $x1) >> 1);
-            $b3 = (($b3 | $x2) >> 1);
-
-            $b0 &= 0xffff;
-            $b1 &= 0xffff;
-            $b2 &= 0xffff;
-            $b3 &= 0xffff;
-
-        }
-        $return->limbs[0] = $ret0;
-        $return->limbs[1] = $ret1;
-        $return->limbs[2] = $ret2;
-        $return->limbs[3] = $ret3;
-
-        return $return;
-    }
-
-    /**
-     * OR this 64-bit integer with another.
-     *
-     * @param ParagonIE_Sodium_Core32_Int64 $b
-     * @return ParagonIE_Sodium_Core32_Int64
-     */
-    public function orInt64(ParagonIE_Sodium_Core32_Int64 $b)
-    {
-        $return = new ParagonIE_Sodium_Core32_Int64();
-        $return->unsignedInt = $this->unsignedInt;
-        $return->limbs = array(
-            (int) ($this->limbs[0] | $b->limbs[0]),
-            (int) ($this->limbs[1] | $b->limbs[1]),
-            (int) ($this->limbs[2] | $b->limbs[2]),
-            (int) ($this->limbs[3] | $b->limbs[3])
-        );
-        return $return;
-    }
-
-    /**
-     * @param int $c
-     * @return ParagonIE_Sodium_Core32_Int64
-     * @throws SodiumException
-     * @throws TypeError
-     * @psalm-suppress MixedArrayAccess
-     */
-    public function rotateLeft($c = 0)
-    {
-        ParagonIE_Sodium_Core32_Util::declareScalarType($c, 'int', 1);
-        /** @var int $c */
-        $c = (int) $c;
-
-        $return = new ParagonIE_Sodium_Core32_Int64();
-        $return->unsignedInt = $this->unsignedInt;
-        $c &= 63;
-        if ($c === 0) {
-            // NOP, but we want a copy.
-            $return->limbs = $this->limbs;
-        } else {
-            /** @var array<int, int> $limbs */
-            $limbs =& $return->limbs;
-
-            /** @var array<int, int> $myLimbs */
-            $myLimbs =& $this->limbs;
-
-            /** @var int $idx_shift */
-            $idx_shift = ($c >> 4) & 3;
-            /** @var int $sub_shift */
-            $sub_shift = $c & 15;
-
-            for ($i = 3; $i >= 0; --$i) {
-                /** @var int $j */
-                $j = ($i + $idx_shift) & 3;
-                /** @var int $k */
-                $k = ($i + $idx_shift + 1) & 3;
-                $limbs[$i] = (int) (
-                    (
-                        ((int) ($myLimbs[$j]) << $sub_shift)
-                            |
-                        ((int) ($myLimbs[$k]) >> (16 - $sub_shift))
-                    ) & 0xffff
-                );
-            }
-        }
-        return $return;
-    }
-
-    /**
-     * Rotate to the right
-     *
-     * @param int $c
-     * @return ParagonIE_Sodium_Core32_Int64
-     * @throws SodiumException
-     * @throws TypeError
-     * @psalm-suppress MixedArrayAccess
-     */
-    public function rotateRight($c = 0)
-    {
-        ParagonIE_Sodium_Core32_Util::declareScalarType($c, 'int', 1);
-        /** @var int $c */
-        $c = (int) $c;
-
-        /** @var ParagonIE_Sodium_Core32_Int64 $return */
-        $return = new ParagonIE_Sodium_Core32_Int64();
-        $return->unsignedInt = $this->unsignedInt;
-        $c &= 63;
-        /** @var int $c */
-        if ($c === 0) {
-            // NOP, but we want a copy.
-            $return->limbs = $this->limbs;
-        } else {
-            /** @var array<int, int> $limbs */
-            $limbs =& $return->limbs;
-
-            /** @var array<int, int> $myLimbs */
-            $myLimbs =& $this->limbs;
-
-            /** @var int $idx_shift */
-            $idx_shift = ($c >> 4) & 3;
-            /** @var int $sub_shift */
-            $sub_shift = $c & 15;
-
-            for ($i = 3; $i >= 0; --$i) {
-                /** @var int $j */
-                $j = ($i - $idx_shift) & 3;
-                /** @var int $k */
-                $k = ($i - $idx_shift - 1) & 3;
-                $limbs[$i] = (int) (
-                    (
-                        ((int) ($myLimbs[$j]) >> (int) ($sub_shift))
-                            |
-                        ((int) ($myLimbs[$k]) << (16 - (int) ($sub_shift)))
-                    ) & 0xffff
-                );
-            }
-        }
-        return $return;
-    }
-    /**
-     * @param int $c
-     * @return ParagonIE_Sodium_Core32_Int64
-     * @throws SodiumException
-     * @throws TypeError
-     */
-    public function shiftLeft($c = 0)
-    {
-        ParagonIE_Sodium_Core32_Util::declareScalarType($c, 'int', 1);
-        /** @var int $c */
-        $c = (int) $c;
-
-        $return = new ParagonIE_Sodium_Core32_Int64();
-        $return->unsignedInt = $this->unsignedInt;
-        $c &= 63;
-
-        if ($c >= 16) {
-            if ($c >= 48) {
-                $return->limbs = array(
-                    $this->limbs[3], 0, 0, 0
-                );
-            } elseif ($c >= 32) {
-                $return->limbs = array(
-                    $this->limbs[2], $this->limbs[3], 0, 0
-                );
-            } else {
-                $return->limbs = array(
-                    $this->limbs[1], $this->limbs[2], $this->limbs[3], 0
-                );
-            }
-            return $return->shiftLeft($c & 15);
-        }
-        if ($c === 0) {
-            $return->limbs = $this->limbs;
-        } elseif ($c < 0) {
-            /** @var int $c */
-            return $this->shiftRight(-$c);
-        } else {
-            if (!is_int($c)) {
-                throw new TypeError();
-            }
-            /** @var int $carry */
-            $carry = 0;
-            for ($i = 3; $i >= 0; --$i) {
-                /** @var int $tmp */
-                $tmp = ($this->limbs[$i] << $c) | ($carry & 0xffff);
-                $return->limbs[$i] = (int) ($tmp & 0xffff);
-                /** @var int $carry */
-                $carry = $tmp >> 16;
-            }
-        }
-        return $return;
-    }
-
-    /**
-     * @param int $c
-     * @return ParagonIE_Sodium_Core32_Int64
-     * @throws SodiumException
-     * @throws TypeError
-     */
-    public function shiftRight($c = 0)
-    {
-        ParagonIE_Sodium_Core32_Util::declareScalarType($c, 'int', 1);
-        $c = (int) $c;
-        /** @var int $c */
-        $return = new ParagonIE_Sodium_Core32_Int64();
-        $return->unsignedInt = $this->unsignedInt;
-        $c &= 63;
-
-        $negative = -(($this->limbs[0] >> 15) & 1);
-        if ($c >= 16) {
-            if ($c >= 48) {
-                $return->limbs = array(
-                    (int) ($negative & 0xffff),
-                    (int) ($negative & 0xffff),
-                    (int) ($negative & 0xffff),
-                    (int) $this->limbs[0]
-                );
-            } elseif ($c >= 32) {
-                $return->limbs = array(
-                    (int) ($negative & 0xffff),
-                    (int) ($negative & 0xffff),
-                    (int) $this->limbs[0],
-                    (int) $this->limbs[1]
-                );
-            } else {
-                $return->limbs = array(
-                    (int) ($negative & 0xffff),
-                    (int) $this->limbs[0],
-                    (int) $this->limbs[1],
-                    (int) $this->limbs[2]
-                );
-            }
-            return $return->shiftRight($c & 15);
-        }
-
-        if ($c === 0) {
-            $return->limbs = $this->limbs;
-        } elseif ($c < 0) {
-            return $this->shiftLeft(-$c);
-        } else {
-            if (!is_int($c)) {
-                throw new TypeError();
-            }
-            /** @var int $carryRight */
-            $carryRight = ($negative & 0xffff);
-            $mask = (int) (((1 << ($c + 1)) - 1) & 0xffff);
-            for ($i = 0; $i < 4; ++$i) {
-                $return->limbs[$i] = (int) (
-                    (($this->limbs[$i] >> $c) | ($carryRight << (16 - $c))) & 0xffff
-                );
-                $carryRight = (int) ($this->limbs[$i] & $mask);
-            }
-        }
-        return $return;
-    }
-
-
-    /**
-     * Subtract a normal integer from an int64 object.
-     *
-     * @param int $int
-     * @return ParagonIE_Sodium_Core32_Int64
-     * @throws SodiumException
-     * @throws TypeError
-     */
-    public function subInt($int)
-    {
-        ParagonIE_Sodium_Core32_Util::declareScalarType($int, 'int', 1);
-        $int = (int) $int;
-
-        $return = new ParagonIE_Sodium_Core32_Int64();
-        $return->unsignedInt = $this->unsignedInt;
-
-        /** @var int $carry */
-        $carry = 0;
-        for ($i = 3; $i >= 0; --$i) {
-            /** @var int $tmp */
-            $tmp = $this->limbs[$i] - (($int >> 16) & 0xffff) + $carry;
-            /** @var int $carry */
-            $carry = $tmp >> 16;
-            $return->limbs[$i] = (int) ($tmp & 0xffff);
-        }
-        return $return;
-    }
-
-    /**
-     * The difference between two Int64 objects.
-     *
-     * @param ParagonIE_Sodium_Core32_Int64 $b
-     * @return ParagonIE_Sodium_Core32_Int64
-     */
-    public function subInt64(ParagonIE_Sodium_Core32_Int64 $b)
-    {
-        $return = new ParagonIE_Sodium_Core32_Int64();
-        $return->unsignedInt = $this->unsignedInt;
-        /** @var int $carry */
-        $carry = 0;
-        for ($i = 3; $i >= 0; --$i) {
-            /** @var int $tmp */
-            $tmp = $this->limbs[$i] - $b->limbs[$i] + $carry;
-            /** @var int $carry */
-            $carry = ($tmp >> 16);
-            $return->limbs[$i] = (int) ($tmp & 0xffff);
-        }
-        return $return;
-    }
-
-    /**
-     * XOR this 64-bit integer with another.
-     *
-     * @param ParagonIE_Sodium_Core32_Int64 $b
-     * @return ParagonIE_Sodium_Core32_Int64
-     */
-    public function xorInt64(ParagonIE_Sodium_Core32_Int64 $b)
-    {
-        $return = new ParagonIE_Sodium_Core32_Int64();
-        $return->unsignedInt = $this->unsignedInt;
-        $return->limbs = array(
-            (int) ($this->limbs[0] ^ $b->limbs[0]),
-            (int) ($this->limbs[1] ^ $b->limbs[1]),
-            (int) ($this->limbs[2] ^ $b->limbs[2]),
-            (int) ($this->limbs[3] ^ $b->limbs[3])
-        );
-        return $return;
-    }
-
-    /**
-     * @param int $low
-     * @param int $high
-     * @return self
-     * @throws SodiumException
-     * @throws TypeError
-     */
-    public static function fromInts($low, $high)
-    {
-        ParagonIE_Sodium_Core32_Util::declareScalarType($low, 'int', 1);
-        ParagonIE_Sodium_Core32_Util::declareScalarType($high, 'int', 2);
-
-        $high = (int) $high;
-        $low = (int) $low;
-        return new ParagonIE_Sodium_Core32_Int64(
-            array(
-                (int) (($high >> 16) & 0xffff),
-                (int) ($high & 0xffff),
-                (int) (($low >> 16) & 0xffff),
-                (int) ($low & 0xffff)
-            )
-        );
-    }
-
-    /**
-     * @param int $low
-     * @return self
-     * @throws SodiumException
-     * @throws TypeError
-     */
-    public static function fromInt($low)
-    {
-        ParagonIE_Sodium_Core32_Util::declareScalarType($low, 'int', 1);
-        $low = (int) $low;
-
-        return new ParagonIE_Sodium_Core32_Int64(
-            array(
-                0,
-                0,
-                (int) (($low >> 16) & 0xffff),
-                (int) ($low & 0xffff)
-            )
-        );
-    }
-
-    /**
-     * @return int
-     */
-    public function toInt()
-    {
-        return (int) (
-            (($this->limbs[2] & 0xffff) << 16)
-                |
-            ($this->limbs[3] & 0xffff)
-        );
-    }
-
-    /**
-     * @param string $string
-     * @return self
-     * @throws SodiumException
-     * @throws TypeError
-     */
-    public static function fromString($string)
-    {
-        ParagonIE_Sodium_Core32_Util::declareScalarType($string, 'string', 1);
-        $string = (string) $string;
-        if (ParagonIE_Sodium_Core32_Util::strlen($string) !== 8) {
-            throw new RangeException(
-                'String must be 8 bytes; ' . ParagonIE_Sodium_Core32_Util::strlen($string) . ' given.'
-            );
-        }
-        $return = new ParagonIE_Sodium_Core32_Int64();
-
-        $return->limbs[0]  = (int) ((ParagonIE_Sodium_Core32_Util::chrToInt($string[0]) & 0xff) << 8);
-        $return->limbs[0] |= (ParagonIE_Sodium_Core32_Util::chrToInt($string[1]) & 0xff);
-        $return->limbs[1]  = (int) ((ParagonIE_Sodium_Core32_Util::chrToInt($string[2]) & 0xff) << 8);
-        $return->limbs[1] |= (ParagonIE_Sodium_Core32_Util::chrToInt($string[3]) & 0xff);
-        $return->limbs[2]  = (int) ((ParagonIE_Sodium_Core32_Util::chrToInt($string[4]) & 0xff) << 8);
-        $return->limbs[2] |= (ParagonIE_Sodium_Core32_Util::chrToInt($string[5]) & 0xff);
-        $return->limbs[3]  = (int) ((ParagonIE_Sodium_Core32_Util::chrToInt($string[6]) & 0xff) << 8);
-        $return->limbs[3] |= (ParagonIE_Sodium_Core32_Util::chrToInt($string[7]) & 0xff);
-        return $return;
-    }
-
-    /**
-     * @param string $string
-     * @return self
-     * @throws SodiumException
-     * @throws TypeError
-     */
-    public static function fromReverseString($string)
-    {
-        ParagonIE_Sodium_Core32_Util::declareScalarType($string, 'string', 1);
-        $string = (string) $string;
-        if (ParagonIE_Sodium_Core32_Util::strlen($string) !== 8) {
-            throw new RangeException(
-                'String must be 8 bytes; ' . ParagonIE_Sodium_Core32_Util::strlen($string) . ' given.'
-            );
-        }
-        $return = new ParagonIE_Sodium_Core32_Int64();
-
-        $return->limbs[0]  = (int) ((ParagonIE_Sodium_Core32_Util::chrToInt($string[7]) & 0xff) << 8);
-        $return->limbs[0] |= (ParagonIE_Sodium_Core32_Util::chrToInt($string[6]) & 0xff);
-        $return->limbs[1]  = (int) ((ParagonIE_Sodium_Core32_Util::chrToInt($string[5]) & 0xff) << 8);
-        $return->limbs[1] |= (ParagonIE_Sodium_Core32_Util::chrToInt($string[4]) & 0xff);
-        $return->limbs[2]  = (int) ((ParagonIE_Sodium_Core32_Util::chrToInt($string[3]) & 0xff) << 8);
-        $return->limbs[2] |= (ParagonIE_Sodium_Core32_Util::chrToInt($string[2]) & 0xff);
-        $return->limbs[3]  = (int) ((ParagonIE_Sodium_Core32_Util::chrToInt($string[1]) & 0xff) << 8);
-        $return->limbs[3] |= (ParagonIE_Sodium_Core32_Util::chrToInt($string[0]) & 0xff);
-        return $return;
-    }
-
-    /**
-     * @return array<int, int>
-     */
-    public function toArray()
-    {
-        return array(
-            (int) ((($this->limbs[0] & 0xffff) << 16) | ($this->limbs[1] & 0xffff)),
-            (int) ((($this->limbs[2] & 0xffff) << 16) | ($this->limbs[3] & 0xffff))
-        );
-    }
-
-    /**
-     * @return ParagonIE_Sodium_Core32_Int32
-     */
-    public function toInt32()
-    {
-        $return = new ParagonIE_Sodium_Core32_Int32();
-        $return->limbs[0] = (int) ($this->limbs[2]);
-        $return->limbs[1] = (int) ($this->limbs[3]);
-        $return->unsignedInt = $this->unsignedInt;
-        $return->overflow = (int) (ParagonIE_Sodium_Core32_Util::abs($this->limbs[1], 16) & 0xffff);
-        return $return;
-    }
-
-    /**
-     * @return ParagonIE_Sodium_Core32_Int64
-     */
-    public function toInt64()
-    {
-        $return = new ParagonIE_Sodium_Core32_Int64();
-        $return->limbs[0] = (int) ($this->limbs[0]);
-        $return->limbs[1] = (int) ($this->limbs[1]);
-        $return->limbs[2] = (int) ($this->limbs[2]);
-        $return->limbs[3] = (int) ($this->limbs[3]);
-        $return->unsignedInt = $this->unsignedInt;
-        $return->overflow = ParagonIE_Sodium_Core32_Util::abs($this->overflow);
-        return $return;
-    }
-
-    /**
-     * @param bool $bool
-     * @return self
-     */
-    public function setUnsignedInt($bool = false)
-    {
-        $this->unsignedInt = !empty($bool);
-        return $this;
-    }
-
-    /**
-     * @return string
-     * @throws TypeError
-     */
-    public function toString()
-    {
-        return ParagonIE_Sodium_Core32_Util::intToChr(($this->limbs[0] >> 8) & 0xff) .
-            ParagonIE_Sodium_Core32_Util::intToChr($this->limbs[0] & 0xff) .
-            ParagonIE_Sodium_Core32_Util::intToChr(($this->limbs[1] >> 8) & 0xff) .
-            ParagonIE_Sodium_Core32_Util::intToChr($this->limbs[1] & 0xff) .
-            ParagonIE_Sodium_Core32_Util::intToChr(($this->limbs[2] >> 8) & 0xff) .
-            ParagonIE_Sodium_Core32_Util::intToChr($this->limbs[2] & 0xff) .
-            ParagonIE_Sodium_Core32_Util::intToChr(($this->limbs[3] >> 8) & 0xff) .
-            ParagonIE_Sodium_Core32_Util::intToChr($this->limbs[3] & 0xff);
-    }
-
-    /**
-     * @return string
-     * @throws TypeError
-     */
-    public function toReverseString()
-    {
-        return ParagonIE_Sodium_Core32_Util::intToChr($this->limbs[3] & 0xff) .
-            ParagonIE_Sodium_Core32_Util::intToChr(($this->limbs[3] >> 8) & 0xff) .
-            ParagonIE_Sodium_Core32_Util::intToChr($this->limbs[2] & 0xff) .
-            ParagonIE_Sodium_Core32_Util::intToChr(($this->limbs[2] >> 8) & 0xff) .
-            ParagonIE_Sodium_Core32_Util::intToChr($this->limbs[1] & 0xff) .
-            ParagonIE_Sodium_Core32_Util::intToChr(($this->limbs[1] >> 8) & 0xff) .
-            ParagonIE_Sodium_Core32_Util::intToChr($this->limbs[0] & 0xff) .
-            ParagonIE_Sodium_Core32_Util::intToChr(($this->limbs[0] >> 8) & 0xff);
-    }
-
-    /**
-     * @return string
-     */
-    public function __toString()
-    {
-        try {
-            return $this->toString();
-        } catch (TypeError $ex) {
-            // PHP engine can't handle exceptions from __toString()
-            return '';
-        }
-    }
-}

diff --git a/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core32/Poly1305.php b/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core32/Poly1305.php
deleted file mode 100644 (file)
index b9dfaf3..0000000
--- a/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core32/Poly1305.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<?php
-
-if (class_exists('ParagonIE_Sodium_Core32_Poly1305', false)) {
-    return;
-}
-
-/**
- * Class ParagonIE_Sodium_Core32_Poly1305
- */
-abstract class ParagonIE_Sodium_Core32_Poly1305 extends ParagonIE_Sodium_Core32_Util
-{
-    const BLOCK_SIZE = 16;
-
-    /**
-     * @internal You should not use this directly from another application
-     *
-     * @param string $m
-     * @param string $key
-     * @return string
-     * @throws SodiumException
-     * @throws TypeError
-     */
-    public static function onetimeauth($m, $key)
-    {
-        if (self::strlen($key) < 32) {
-            throw new InvalidArgumentException(
-                'Key must be 32 bytes long.'
-            );
-        }
-        $state = new ParagonIE_Sodium_Core32_Poly1305_State(
-            self::substr($key, 0, 32)
-        );
-        return $state
-            ->update($m)
-            ->finish();
-    }
-
-    /**
-     * @internal You should not use this directly from another application
-     *
-     * @param string $mac
-     * @param string $m
-     * @param string $key
-     * @return bool
-     * @throws SodiumException
-     * @throws TypeError
-     */
-    public static function onetimeauth_verify($mac, $m, $key)
-    {
-        if (self::strlen($key) < 32) {
-            throw new InvalidArgumentException(
-                'Key must be 32 bytes long.'
-            );
-        }
-        $state = new ParagonIE_Sodium_Core32_Poly1305_State(
-            self::substr($key, 0, 32)
-        );
-        $calc = $state
-            ->update($m)
-            ->finish();
-        return self::verify_16($calc, $mac);
-    }
-}

diff --git a/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core32/Poly1305/State.php b/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core32/Poly1305/State.php
deleted file mode 100644 (file)
index 90d0362..0000000
--- a/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core32/Poly1305/State.php
+++ /dev/null
@@ -1,451 +0,0 @@
-<?php
-
-if (class_exists('ParagonIE_Sodium_Core32_Poly1305_State', false)) {
-    return;
-}
-
-/**
- * Class ParagonIE_Sodium_Core32_Poly1305_State
- */
-class ParagonIE_Sodium_Core32_Poly1305_State extends ParagonIE_Sodium_Core32_Util
-{
-    /**
-     * @var array<int, int>
-     */
-    protected $buffer = array();
-
-    /**
-     * @var bool
-     */
-    protected $final = false;
-
-    /**
-     * @var array<int, ParagonIE_Sodium_Core32_Int32>
-     */
-    public $h;
-
-    /**
-     * @var int
-     */
-    protected $leftover = 0;
-
-    /**
-     * @var array<int, ParagonIE_Sodium_Core32_Int32>
-     */
-    public $r;
-
-    /**
-     * @var array<int, ParagonIE_Sodium_Core32_Int64>
-     */
-    public $pad;
-
-    /**
-     * ParagonIE_Sodium_Core32_Poly1305_State constructor.
-     *
-     * @internal You should not use this directly from another application
-     *
-     * @param string $key
-     * @throws InvalidArgumentException
-     * @throws SodiumException
-     * @throws TypeError
-     */
-    public function __construct($key = '')
-    {
-        if (self::strlen($key) < 32) {
-            throw new InvalidArgumentException(
-                'Poly1305 requires a 32-byte key'
-            );
-        }
-        /* r &= 0xffffffc0ffffffc0ffffffc0fffffff */
-        $this->r = array(
-            // st->r[0] = ...
-            ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($key, 0, 4))
-                ->setUnsignedInt(true)
-                ->mask(0x3ffffff),
-            // st->r[1] = ...
-            ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($key, 3, 4))
-                ->setUnsignedInt(true)
-                ->shiftRight(2)
-                ->mask(0x3ffff03),
-            // st->r[2] = ...
-            ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($key, 6, 4))
-                ->setUnsignedInt(true)
-                ->shiftRight(4)
-                ->mask(0x3ffc0ff),
-            // st->r[3] = ...
-            ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($key, 9, 4))
-                ->setUnsignedInt(true)
-                ->shiftRight(6)
-                ->mask(0x3f03fff),
-            // st->r[4] = ...
-            ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($key, 12, 4))
-                ->setUnsignedInt(true)
-                ->shiftRight(8)
-                ->mask(0x00fffff)
-        );
-
-        /* h = 0 */
-        $this->h = array(
-            new ParagonIE_Sodium_Core32_Int32(array(0, 0), true),
-            new ParagonIE_Sodium_Core32_Int32(array(0, 0), true),
-            new ParagonIE_Sodium_Core32_Int32(array(0, 0), true),
-            new ParagonIE_Sodium_Core32_Int32(array(0, 0), true),
-            new ParagonIE_Sodium_Core32_Int32(array(0, 0), true)
-        );
-
-        /* save pad for later */
-        $this->pad = array(
-            ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($key, 16, 4))
-                ->setUnsignedInt(true)->toInt64(),
-            ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($key, 20, 4))
-                ->setUnsignedInt(true)->toInt64(),
-            ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($key, 24, 4))
-                ->setUnsignedInt(true)->toInt64(),
-            ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($key, 28, 4))
-                ->setUnsignedInt(true)->toInt64(),
-        );
-
-        $this->leftover = 0;
-        $this->final = false;
-    }
-
-    /**
-     * @internal You should not use this directly from another application
-     *
-     * @param string $message
-     * @return self
-     * @throws SodiumException
-     * @throws TypeError
-     */
-    public function update($message = '')
-    {
-        $bytes = self::strlen($message);
-
-        /* handle leftover */
-        if ($this->leftover) {
-            /** @var int $want */
-            $want = ParagonIE_Sodium_Core32_Poly1305::BLOCK_SIZE - $this->leftover;
-            if ($want > $bytes) {
-                $want = $bytes;
-            }
-            for ($i = 0; $i < $want; ++$i) {
-                $mi = self::chrToInt($message[$i]);
-                $this->buffer[$this->leftover + $i] = $mi;
-            }
-            // We snip off the leftmost bytes.
-            $message = self::substr($message, $want);
-            $bytes = self::strlen($message);
-            $this->leftover += $want;
-            if ($this->leftover < ParagonIE_Sodium_Core32_Poly1305::BLOCK_SIZE) {
-                // We still don't have enough to run $this->blocks()
-                return $this;
-            }
-
-            $this->blocks(
-                self::intArrayToString($this->buffer),
-                ParagonIE_Sodium_Core32_Poly1305::BLOCK_SIZE
-            );
-            $this->leftover = 0;
-        }
-
-        /* process full blocks */
-        if ($bytes >= ParagonIE_Sodium_Core32_Poly1305::BLOCK_SIZE) {
-            /** @var int $want */
-            $want = $bytes & ~(ParagonIE_Sodium_Core32_Poly1305::BLOCK_SIZE - 1);
-            if ($want >= ParagonIE_Sodium_Core32_Poly1305::BLOCK_SIZE) {
-                /** @var string $block */
-                $block = self::substr($message, 0, $want);
-                if (self::strlen($block) >= ParagonIE_Sodium_Core32_Poly1305::BLOCK_SIZE) {
-                    $this->blocks($block, $want);
-                    $message = self::substr($message, $want);
-                    $bytes = self::strlen($message);
-                }
-            }
-        }
-
-        /* store leftover */
-        if ($bytes) {
-            for ($i = 0; $i < $bytes; ++$i) {
-                $mi = self::chrToInt($message[$i]);
-                $this->buffer[$this->leftover + $i] = $mi;
-            }
-            $this->leftover = (int) $this->leftover + $bytes;
-        }
-        return $this;
-    }
-
-    /**
-     * @internal You should not use this directly from another application
-     *
-     * @param string $message
-     * @param int $bytes
-     * @return self
-     * @throws SodiumException
-     * @throws TypeError
-     */
-    public function blocks($message, $bytes)
-    {
-        if (self::strlen($message) < 16) {
-            $message = str_pad($message, 16, "\x00", STR_PAD_RIGHT);
-        }
-        $hibit = ParagonIE_Sodium_Core32_Int32::fromInt((int) ($this->final ? 0 : 1 << 24)); /* 1 << 128 */
-        $hibit->setUnsignedInt(true);
-        $zero = new ParagonIE_Sodium_Core32_Int64(array(0, 0, 0, 0), true);
-        /**
-         * @var ParagonIE_Sodium_Core32_Int64 $d0
-         * @var ParagonIE_Sodium_Core32_Int64 $d1
-         * @var ParagonIE_Sodium_Core32_Int64 $d2
-         * @var ParagonIE_Sodium_Core32_Int64 $d3
-         * @var ParagonIE_Sodium_Core32_Int64 $d4
-         * @var ParagonIE_Sodium_Core32_Int64 $r0
-         * @var ParagonIE_Sodium_Core32_Int64 $r1
-         * @var ParagonIE_Sodium_Core32_Int64 $r2
-         * @var ParagonIE_Sodium_Core32_Int64 $r3
-         * @var ParagonIE_Sodium_Core32_Int64 $r4
-         *
-         * @var ParagonIE_Sodium_Core32_Int32 $h0
-         * @var ParagonIE_Sodium_Core32_Int32 $h1
-         * @var ParagonIE_Sodium_Core32_Int32 $h2
-         * @var ParagonIE_Sodium_Core32_Int32 $h3
-         * @var ParagonIE_Sodium_Core32_Int32 $h4
-         */
-        $r0 = $this->r[0]->toInt64();
-        $r1 = $this->r[1]->toInt64();
-        $r2 = $this->r[2]->toInt64();
-        $r3 = $this->r[3]->toInt64();
-        $r4 = $this->r[4]->toInt64();
-
-        $s1 = $r1->toInt64()->mulInt(5, 3);
-        $s2 = $r2->toInt64()->mulInt(5, 3);
-        $s3 = $r3->toInt64()->mulInt(5, 3);
-        $s4 = $r4->toInt64()->mulInt(5, 3);
-
-        $h0 = $this->h[0];
-        $h1 = $this->h[1];
-        $h2 = $this->h[2];
-        $h3 = $this->h[3];
-        $h4 = $this->h[4];
-
-        while ($bytes >= ParagonIE_Sodium_Core32_Poly1305::BLOCK_SIZE) {
-            /* h += m[i] */
-            $h0 = $h0->addInt32(
-                ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($message, 0, 4))
-                    ->mask(0x3ffffff)
-            )->toInt64();
-            $h1 = $h1->addInt32(
-                ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($message, 3, 4))
-                    ->shiftRight(2)
-                    ->mask(0x3ffffff)
-            )->toInt64();
-            $h2 = $h2->addInt32(
-                ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($message, 6, 4))
-                    ->shiftRight(4)
-                    ->mask(0x3ffffff)
-            )->toInt64();
-            $h3 = $h3->addInt32(
-                ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($message, 9, 4))
-                    ->shiftRight(6)
-                    ->mask(0x3ffffff)
-            )->toInt64();
-            $h4 = $h4->addInt32(
-                ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($message, 12, 4))
-                    ->shiftRight(8)
-                    ->orInt32($hibit)
-            )->toInt64();
-
-            /* h *= r */
-            $d0 = $zero
-                ->addInt64($h0->mulInt64($r0, 27))
-                ->addInt64($s4->mulInt64($h1, 27))
-                ->addInt64($s3->mulInt64($h2, 27))
-                ->addInt64($s2->mulInt64($h3, 27))
-                ->addInt64($s1->mulInt64($h4, 27));
-
-            $d1 = $zero
-                ->addInt64($h0->mulInt64($r1, 27))
-                ->addInt64($h1->mulInt64($r0, 27))
-                ->addInt64($s4->mulInt64($h2, 27))
-                ->addInt64($s3->mulInt64($h3, 27))
-                ->addInt64($s2->mulInt64($h4, 27));
-
-            $d2 = $zero
-                ->addInt64($h0->mulInt64($r2, 27))
-                ->addInt64($h1->mulInt64($r1, 27))
-                ->addInt64($h2->mulInt64($r0, 27))
-                ->addInt64($s4->mulInt64($h3, 27))
-                ->addInt64($s3->mulInt64($h4, 27));
-
-            $d3 = $zero
-                ->addInt64($h0->mulInt64($r3, 27))
-                ->addInt64($h1->mulInt64($r2, 27))
-                ->addInt64($h2->mulInt64($r1, 27))
-                ->addInt64($h3->mulInt64($r0, 27))
-                ->addInt64($s4->mulInt64($h4, 27));
-
-            $d4 = $zero
-                ->addInt64($h0->mulInt64($r4, 27))
-                ->addInt64($h1->mulInt64($r3, 27))
-                ->addInt64($h2->mulInt64($r2, 27))
-                ->addInt64($h3->mulInt64($r1, 27))
-                ->addInt64($h4->mulInt64($r0, 27));
-
-            /* (partial) h %= p */
-            $c = $d0->shiftRight(26);
-            $h0 = $d0->toInt32()->mask(0x3ffffff);
-            $d1 = $d1->addInt64($c);
-
-            $c = $d1->shiftRight(26);
-            $h1 = $d1->toInt32()->mask(0x3ffffff);
-            $d2 = $d2->addInt64($c);
-
-            $c = $d2->shiftRight(26);
-            $h2 = $d2->toInt32()->mask(0x3ffffff);
-            $d3 = $d3->addInt64($c);
-
-            $c = $d3->shiftRight(26);
-            $h3 = $d3->toInt32()->mask(0x3ffffff);
-            $d4 = $d4->addInt64($c);
-
-            $c = $d4->shiftRight(26);
-            $h4 = $d4->toInt32()->mask(0x3ffffff);
-            $h0 = $h0->addInt32($c->toInt32()->mulInt(5, 3));
-
-            $c = $h0->shiftRight(26);
-            $h0 = $h0->mask(0x3ffffff);
-            $h1 = $h1->addInt32($c);
-
-            // Chop off the left 32 bytes.
-            $message = self::substr(
-                $message,
-                ParagonIE_Sodium_Core32_Poly1305::BLOCK_SIZE
-            );
-            $bytes -= ParagonIE_Sodium_Core32_Poly1305::BLOCK_SIZE;
-        }
-
-        /** @var array<int, ParagonIE_Sodium_Core32_Int32> $h */
-        $this->h = array($h0, $h1, $h2, $h3, $h4);
-        return $this;
-    }
-
-    /**
-     * @internal You should not use this directly from another application
-     *
-     * @return string
-     * @throws SodiumException
-     * @throws TypeError
-     */
-    public function finish()
-    {
-        /* process the remaining block */
-        if ($this->leftover) {
-            $i = $this->leftover;
-            $this->buffer[$i++] = 1;
-            for (; $i < ParagonIE_Sodium_Core32_Poly1305::BLOCK_SIZE; ++$i) {
-                $this->buffer[$i] = 0;
-            }
-            $this->final = true;
-            $this->blocks(
-                self::substr(
-                    self::intArrayToString($this->buffer),
-                    0,
-                    ParagonIE_Sodium_Core32_Poly1305::BLOCK_SIZE
-                ),
-                $b = ParagonIE_Sodium_Core32_Poly1305::BLOCK_SIZE
-            );
-        }
-
-        /**
-         * @var ParagonIE_Sodium_Core32_Int32 $f
-         * @var ParagonIE_Sodium_Core32_Int32 $g0
-         * @var ParagonIE_Sodium_Core32_Int32 $g1
-         * @var ParagonIE_Sodium_Core32_Int32 $g2
-         * @var ParagonIE_Sodium_Core32_Int32 $g3
-         * @var ParagonIE_Sodium_Core32_Int32 $g4
-         * @var ParagonIE_Sodium_Core32_Int32 $h0
-         * @var ParagonIE_Sodium_Core32_Int32 $h1
-         * @var ParagonIE_Sodium_Core32_Int32 $h2
-         * @var ParagonIE_Sodium_Core32_Int32 $h3
-         * @var ParagonIE_Sodium_Core32_Int32 $h4
-         */
-        $h0 = $this->h[0];
-        $h1 = $this->h[1];
-        $h2 = $this->h[2];
-        $h3 = $this->h[3];
-        $h4 = $this->h[4];
-
-        $c = $h1->shiftRight(26);           # $c = $h1 >> 26;
-        $h1 = $h1->mask(0x3ffffff);         # $h1 &= 0x3ffffff;
-
-        $h2 = $h2->addInt32($c);            # $h2 += $c;
-        $c = $h2->shiftRight(26);           # $c = $h2 >> 26;
-        $h2 = $h2->mask(0x3ffffff);         # $h2 &= 0x3ffffff;
-
-        $h3 = $h3->addInt32($c);            # $h3 += $c;
-        $c = $h3->shiftRight(26);           # $c = $h3 >> 26;
-        $h3 = $h3->mask(0x3ffffff);         # $h3 &= 0x3ffffff;
-
-        $h4 = $h4->addInt32($c);            # $h4 += $c;
-        $c = $h4->shiftRight(26);           # $c = $h4 >> 26;
-        $h4 = $h4->mask(0x3ffffff);         # $h4 &= 0x3ffffff;
-
-        $h0 = $h0->addInt32($c->mulInt(5, 3)); # $h0 += self::mul($c, 5);
-        $c = $h0->shiftRight(26);           # $c = $h0 >> 26;
-        $h0 = $h0->mask(0x3ffffff);         # $h0 &= 0x3ffffff;
-        $h1 = $h1->addInt32($c);            # $h1 += $c;
-
-        /* compute h + -p */
-        $g0 = $h0->addInt(5);
-        $c  = $g0->shiftRight(26);
-        $g0 = $g0->mask(0x3ffffff);
-        $g1 = $h1->addInt32($c);
-        $c  = $g1->shiftRight(26);
-        $g1 = $g1->mask(0x3ffffff);
-        $g2 = $h2->addInt32($c);
-        $c  = $g2->shiftRight(26);
-        $g2 = $g2->mask(0x3ffffff);
-        $g3 = $h3->addInt32($c);
-        $c  = $g3->shiftRight(26);
-        $g3 = $g3->mask(0x3ffffff);
-        $g4 = $h4->addInt32($c)->subInt(1 << 26);
-
-        # $mask = ($g4 >> 31) - 1;
-        /* select h if h < p, or h + -p if h >= p */
-        $mask = (int) (($g4->toInt() >> 31) + 1);
-
-        $g0 = $g0->mask($mask);
-        $g1 = $g1->mask($mask);
-        $g2 = $g2->mask($mask);
-        $g3 = $g3->mask($mask);
-        $g4 = $g4->mask($mask);
-
-        /** @var int $mask */
-        $mask = ~$mask;
-
-        $h0 = $h0->mask($mask)->orInt32($g0);
-        $h1 = $h1->mask($mask)->orInt32($g1);
-        $h2 = $h2->mask($mask)->orInt32($g2);
-        $h3 = $h3->mask($mask)->orInt32($g3);
-        $h4 = $h4->mask($mask)->orInt32($g4);
-
-        /* h = h % (2^128) */
-        $h0 = $h0->orInt32($h1->shiftLeft(26));
-        $h1 = $h1->shiftRight(6)->orInt32($h2->shiftLeft(20));
-        $h2 = $h2->shiftRight(12)->orInt32($h3->shiftLeft(14));
-        $h3 = $h3->shiftRight(18)->orInt32($h4->shiftLeft(8));
-
-        /* mac = (h + pad) % (2^128) */
-        $f = $h0->toInt64()->addInt64($this->pad[0]);
-        $h0 = $f->toInt32();
-        $f = $h1->toInt64()->addInt64($this->pad[1])->addInt($h0->overflow);
-        $h1 = $f->toInt32();
-        $f = $h2->toInt64()->addInt64($this->pad[2])->addInt($h1->overflow);
-        $h2 = $f->toInt32();
-        $f = $h3->toInt64()->addInt64($this->pad[3])->addInt($h2->overflow);
-        $h3 = $f->toInt32();
-
-        return $h0->toReverseString() .
-            $h1->toReverseString() .
-            $h2->toReverseString() .
-            $h3->toReverseString();
-    }
-}

diff --git a/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core32/Salsa20.php b/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core32/Salsa20.php
deleted file mode 100644 (file)
index d8c8073..0000000
--- a/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core32/Salsa20.php
+++ /dev/null
@@ -1,306 +0,0 @@
-<?php
-
-if (class_exists('ParagonIE_Sodium_Core32_Salsa20', false)) {
-    return;
-}
-
-/**
- * Class ParagonIE_Sodium_Core32_Salsa20
- */
-abstract class ParagonIE_Sodium_Core32_Salsa20 extends ParagonIE_Sodium_Core32_Util
-{
-    const ROUNDS = 20;
-
-    /**
-     * Calculate an salsa20 hash of a single block
-     *
-     * @internal You should not use this directly from another application
-     *
-     * @param string $in
-     * @param string $k
-     * @param string|null $c
-     * @return string
-     * @throws SodiumException
-     * @throws TypeError
-     */
-    public static function core_salsa20($in, $k, $c = null)
-    {
-        /**
-         * @var ParagonIE_Sodium_Core32_Int32 $x0
-         * @var ParagonIE_Sodium_Core32_Int32 $x1
-         * @var ParagonIE_Sodium_Core32_Int32 $x2
-         * @var ParagonIE_Sodium_Core32_Int32 $x3
-         * @var ParagonIE_Sodium_Core32_Int32 $x4
-         * @var ParagonIE_Sodium_Core32_Int32 $x5
-         * @var ParagonIE_Sodium_Core32_Int32 $x6
-         * @var ParagonIE_Sodium_Core32_Int32 $x7
-         * @var ParagonIE_Sodium_Core32_Int32 $x8
-         * @var ParagonIE_Sodium_Core32_Int32 $x9
-         * @var ParagonIE_Sodium_Core32_Int32 $x10
-         * @var ParagonIE_Sodium_Core32_Int32 $x11
-         * @var ParagonIE_Sodium_Core32_Int32 $x12
-         * @var ParagonIE_Sodium_Core32_Int32 $x13
-         * @var ParagonIE_Sodium_Core32_Int32 $x14
-         * @var ParagonIE_Sodium_Core32_Int32 $x15
-         * @var ParagonIE_Sodium_Core32_Int32 $j0
-         * @var ParagonIE_Sodium_Core32_Int32 $j1
-         * @var ParagonIE_Sodium_Core32_Int32 $j2
-         * @var ParagonIE_Sodium_Core32_Int32 $j3
-         * @var ParagonIE_Sodium_Core32_Int32 $j4
-         * @var ParagonIE_Sodium_Core32_Int32 $j5
-         * @var ParagonIE_Sodium_Core32_Int32 $j6
-         * @var ParagonIE_Sodium_Core32_Int32 $j7
-         * @var ParagonIE_Sodium_Core32_Int32 $j8
-         * @var ParagonIE_Sodium_Core32_Int32 $j9
-         * @var ParagonIE_Sodium_Core32_Int32 $j10
-         * @var ParagonIE_Sodium_Core32_Int32 $j11
-         * @var ParagonIE_Sodium_Core32_Int32 $j12
-         * @var ParagonIE_Sodium_Core32_Int32 $j13
-         * @var ParagonIE_Sodium_Core32_Int32 $j14
-         * @var ParagonIE_Sodium_Core32_Int32 $j15
-         */
-        if (self::strlen($k) < 32) {
-            throw new RangeException('Key must be 32 bytes long');
-        }
-        if ($c === null) {
-            $x0  = new ParagonIE_Sodium_Core32_Int32(array(0x6170, 0x7865));
-            $x5  = new ParagonIE_Sodium_Core32_Int32(array(0x3320, 0x646e));
-            $x10 = new ParagonIE_Sodium_Core32_Int32(array(0x7962, 0x2d32));
-            $x15 = new ParagonIE_Sodium_Core32_Int32(array(0x6b20, 0x6574));
-        } else {
-            $x0  = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($c, 0, 4));
-            $x5  = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($c, 4, 4));
-            $x10 = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($c, 8, 4));
-            $x15 = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($c, 12, 4));
-        }
-        $x1  = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($k, 0, 4));
-        $x2  = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($k, 4, 4));
-        $x3  = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($k, 8, 4));
-        $x4  = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($k, 12, 4));
-        $x6  = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($in, 0, 4));
-        $x7  = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($in, 4, 4));
-        $x8  = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($in, 8, 4));
-        $x9  = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($in, 12, 4));
-        $x11 = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($k, 16, 4));
-        $x12 = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($k, 20, 4));
-        $x13 = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($k, 24, 4));
-        $x14 = ParagonIE_Sodium_Core32_Int32::fromReverseString(self::substr($k, 28, 4));
-
-        $j0  = clone $x0;
-        $j1  = clone $x1;
-        $j2  = clone $x2;
-        $j3  = clone $x3;
-        $j4  = clone $x4;
-        $j5  = clone $x5;
-        $j6  = clone $x6;
-        $j7  = clone $x7;
-        $j8  = clone $x8;
-        $j9  = clone $x9;
-        $j10  = clone $x10;
-        $j11  = clone $x11;
-        $j12  = clone $x12;
-        $j13  = clone $x13;
-        $j14  = clone $x14;
-        $j15  = clone $x15;
-
-        for ($i = self::ROUNDS; $i > 0; $i -= 2) {
-            $x4  = $x4->xorInt32($x0->addInt32($x12)->rotateLeft(7));
-            $x8  = $x8->xorInt32($x4->addInt32($x0)->rotateLeft(9));
-            $x12 = $x12->xorInt32($x8->addInt32($x4)->rotateLeft(13));
-            $x0  = $x0->xorInt32($x12->addInt32($x8)->rotateLeft(18));
-
-            $x9  = $x9->xorInt32($x5->addInt32($x1)->rotateLeft(7));
-            $x13 = $x13->xorInt32($x9->addInt32($x5)->rotateLeft(9));
-            $x1  = $x1->xorInt32($x13->addInt32($x9)->rotateLeft(13));
-            $x5  = $x5->xorInt32($x1->addInt32($x13)->rotateLeft(18));
-
-            $x14 = $x14->xorInt32($x10->addInt32($x6)->rotateLeft(7));
-            $x2  = $x2->xorInt32($x14->addInt32($x10)->rotateLeft(9));
-            $x6  = $x6->xorInt32($x2->addInt32($x14)->rotateLeft(13));
-            $x10 = $x10->xorInt32($x6->addInt32($x2)->rotateLeft(18));
-
-            $x3  = $x3->xorInt32($x15->addInt32($x11)->rotateLeft(7));
-            $x7  = $x7->xorInt32($x3->addInt32($x15)->rotateLeft(9));
-            $x11 = $x11->xorInt32($x7->addInt32($x3)->rotateLeft(13));
-            $x15 = $x15->xorInt32($x11->addInt32($x7)->rotateLeft(18));
-
-            $x1  = $x1->xorInt32($x0->addInt32($x3)->rotateLeft(7));
-            $x2  = $x2->xorInt32($x1->addInt32($x0)->rotateLeft(9));
-            $x3  = $x3->xorInt32($x2->addInt32($x1)->rotateLeft(13));
-            $x0  = $x0->xorInt32($x3->addInt32($x2)->rotateLeft(18));
-
-            $x6  = $x6->xorInt32($x5->addInt32($x4)->rotateLeft(7));
-            $x7  = $x7->xorInt32($x6->addInt32($x5)->rotateLeft(9));
-            $x4  = $x4->xorInt32($x7->addInt32($x6)->rotateLeft(13));
-            $x5  = $x5->xorInt32($x4->addInt32($x7)->rotateLeft(18));
-
-            $x11 = $x11->xorInt32($x10->addInt32($x9)->rotateLeft(7));
-            $x8  = $x8->xorInt32($x11->addInt32($x10)->rotateLeft(9));
-            $x9  = $x9->xorInt32($x8->addInt32($x11)->rotateLeft(13));
-            $x10 = $x10->xorInt32($x9->addInt32($x8)->rotateLeft(18));
-
-            $x12 = $x12->xorInt32($x15->addInt32($x14)->rotateLeft(7));
-            $x13 = $x13->xorInt32($x12->addInt32($x15)->rotateLeft(9));
-            $x14 = $x14->xorInt32($x13->addInt32($x12)->rotateLeft(13));
-            $x15 = $x15->xorInt32($x14->addInt32($x13)->rotateLeft(18));
-        }
-
-        $x0  = $x0->addInt32($j0);
-        $x1  = $x1->addInt32($j1);
-        $x2  = $x2->addInt32($j2);
-        $x3  = $x3->addInt32($j3);
-        $x4  = $x4->addInt32($j4);
-        $x5  = $x5->addInt32($j5);
-        $x6  = $x6->addInt32($j6);
-        $x7  = $x7->addInt32($j7);
-        $x8  = $x8->addInt32($j8);
-        $x9  = $x9->addInt32($j9);
-        $x10 = $x10->addInt32($j10);
-        $x11 = $x11->addInt32($j11);
-        $x12 = $x12->addInt32($j12);
-        $x13 = $x13->addInt32($j13);
-        $x14 = $x14->addInt32($j14);
-        $x15 = $x15->addInt32($j15);
-
-        return $x0->toReverseString() .
-            $x1->toReverseString() .
-            $x2->toReverseString() .
-            $x3->toReverseString() .
-            $x4->toReverseString() .
-            $x5->toReverseString() .
-            $x6->toReverseString() .
-            $x7->toReverseString() .
-            $x8->toReverseString() .
-            $x9->toReverseString() .
-            $x10->toReverseString() .
-            $x11->toReverseString() .
-            $x12->toReverseString() .
-            $x13->toReverseString() .
-            $x14->toReverseString() .
-            $x15->toReverseString();
-    }
-
-    /**
-     * @internal You should not use this directly from another application
-     *
-     * @param int $len
-     * @param string $nonce
-     * @param string $key
-     * @return string
-     * @throws SodiumException
-     * @throws TypeError
-     */
-    public static function salsa20($len, $nonce, $key)
-    {
-        if (self::strlen($key) !== 32) {
-            throw new RangeException('Key must be 32 bytes long');
-        }
-        $kcopy = '' . $key;
-        $in = self::substr($nonce, 0, 8) . str_repeat("\0", 8);
-        $c = '';
-        while ($len >= 64) {
-            $c .= self::core_salsa20($in, $kcopy, null);
-            $u = 1;
-            // Internal counter.
-            for ($i = 8; $i < 16; ++$i) {
-                $u += self::chrToInt($in[$i]);
-                $in[$i] = self::intToChr($u & 0xff);
-                $u >>= 8;
-            }
-            $len -= 64;
-        }
-        if ($len > 0) {
-            $c .= self::substr(
-                self::core_salsa20($in, $kcopy, null),
-                0,
-                $len
-            );
-        }
-        try {
-            ParagonIE_Sodium_Compat::memzero($kcopy);
-        } catch (SodiumException $ex) {
-            $kcopy = null;
-        }
-        return $c;
-    }
-
-    /**
-     * @internal You should not use this directly from another application
-     *
-     * @param string $m
-     * @param string $n
-     * @param int $ic
-     * @param string $k
-     * @return string
-     * @throws SodiumException
-     * @throws TypeError
-     */
-    public static function salsa20_xor_ic($m, $n, $ic, $k)
-    {
-        $mlen = self::strlen($m);
-        if ($mlen < 1) {
-            return '';
-        }
-        $kcopy = self::substr($k, 0, 32);
-        $in = self::substr($n, 0, 8);
-        // Initialize the counter
-        $in .= ParagonIE_Sodium_Core32_Util::store64_le($ic);
-
-        $c = '';
-        while ($mlen >= 64) {
-            $block = self::core_salsa20($in, $kcopy, null);
-            $c .= self::xorStrings(
-                self::substr($m, 0, 64),
-                self::substr($block, 0, 64)
-            );
-            $u = 1;
-            for ($i = 8; $i < 16; ++$i) {
-                $u += self::chrToInt($in[$i]);
-                $in[$i] = self::intToChr($u & 0xff);
-                $u >>= 8;
-            }
-
-            $mlen -= 64;
-            $m = self::substr($m, 64);
-        }
-
-        if ($mlen) {
-            $block = self::core_salsa20($in, $kcopy, null);
-            $c .= self::xorStrings(
-                self::substr($m, 0, $mlen),
-                self::substr($block, 0, $mlen)
-            );
-        }
-        try {
-            ParagonIE_Sodium_Compat::memzero($block);
-            ParagonIE_Sodium_Compat::memzero($kcopy);
-        } catch (SodiumException $ex) {
-            $block = null;
-            $kcopy = null;
-        }
-
-        return $c;
-    }
-
-    /**
-     * @internal You should not use this directly from another application
-     *
-     * @param string $message
-     * @param string $nonce
-     * @param string $key
-     * @return string
-     * @throws SodiumException
-     * @throws TypeError
-     */
-    public static function salsa20_xor($message, $nonce, $key)
-    {
-        return self::xorStrings(
-            $message,
-            self::salsa20(
-                self::strlen($message),
-                $nonce,
-                $key
-            )
-        );
-    }
-}

diff --git a/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core32/SecretStream/State.php b/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core32/SecretStream/State.php
deleted file mode 100644 (file)
index 6f20486..0000000
--- a/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core32/SecretStream/State.php
+++ /dev/null
@@ -1,163 +0,0 @@
-<?php
-
-/**
- * Class ParagonIE_Sodium_Core32_SecretStream_State
- */
-class ParagonIE_Sodium_Core32_SecretStream_State
-{
-    /** @var string $key */
-    protected $key;
-
-    /** @var int $counter */
-    protected $counter;
-
-    /** @var string $nonce */
-    protected $nonce;
-
-    /** @var string $_pad */
-    protected $_pad;
-
-    /**
-     * ParagonIE_Sodium_Core32_SecretStream_State constructor.
-     * @param string $key
-     * @param string|null $nonce
-     */
-    public function __construct($key, $nonce = null)
-    {
-        $this->key = $key;
-        $this->counter = 1;
-        if (is_null($nonce)) {
-            $nonce = str_repeat("\0", 12);
-        }
-        $this->nonce = str_pad($nonce, 12, "\0", STR_PAD_RIGHT);;
-        $this->_pad = str_repeat("\0", 4);
-    }
-
-    /**
-     * @return self
-     */
-    public function counterReset()
-    {
-        $this->counter = 1;
-        $this->_pad = str_repeat("\0", 4);
-        return $this;
-    }
-
-    /**
-     * @return string
-     */
-    public function getKey()
-    {
-        return $this->key;
-    }
-
-    /**
-     * @return string
-     */
-    public function getCounter()
-    {
-        return ParagonIE_Sodium_Core32_Util::store32_le($this->counter);
-    }
-
-    /**
-     * @return string
-     */
-    public function getNonce()
-    {
-        if (!is_string($this->nonce)) {
-            $this->nonce = str_repeat("\0", 12);
-        }
-        if (ParagonIE_Sodium_Core32_Util::strlen($this->nonce) !== 12) {
-            $this->nonce = str_pad($this->nonce, 12, "\0", STR_PAD_RIGHT);
-        }
-        return $this->nonce;
-    }
-
-    /**
-     * @return string
-     */
-    public function getCombinedNonce()
-    {
-        return $this->getCounter() .
-            ParagonIE_Sodium_Core32_Util::substr($this->getNonce(), 0, 8);
-    }
-
-    /**
-     * @return self
-     */
-    public function incrementCounter()
-    {
-        ++$this->counter;
-        return $this;
-    }
-
-    /**
-     * @return bool
-     */
-    public function needsRekey()
-    {
-        return ($this->counter & 0xffff) === 0;
-    }
-
-    /**
-     * @param string $newKeyAndNonce
-     * @return self
-     */
-    public function rekey($newKeyAndNonce)
-    {
-        $this->key = ParagonIE_Sodium_Core32_Util::substr($newKeyAndNonce, 0, 32);
-        $this->nonce = str_pad(
-            ParagonIE_Sodium_Core32_Util::substr($newKeyAndNonce, 32),
-            12,
-            "\0",
-            STR_PAD_RIGHT
-        );
-        return $this;
-    }
-
-    /**
-     * @param string $str
-     * @return self
-     */
-    public function xorNonce($str)
-    {
-        $this->nonce = ParagonIE_Sodium_Core32_Util::xorStrings(
-            $this->getNonce(),
-            str_pad(
-                ParagonIE_Sodium_Core32_Util::substr($str, 0, 8),
-                12,
-                "\0",
-                STR_PAD_RIGHT
-            )
-        );
-        return $this;
-    }
-
-    /**
-     * @param string $string
-     * @return self
-     */
-    public static function fromString($string)
-    {
-        $state = new ParagonIE_Sodium_Core32_SecretStream_State(
-            ParagonIE_Sodium_Core32_Util::substr($string, 0, 32)
-        );
-        $state->counter = ParagonIE_Sodium_Core32_Util::load_4(
-            ParagonIE_Sodium_Core32_Util::substr($string, 32, 4)
-        );
-        $state->nonce = ParagonIE_Sodium_Core32_Util::substr($string, 36, 12);
-        $state->_pad = ParagonIE_Sodium_Core32_Util::substr($string, 48, 8);
-        return $state;
-    }
-
-    /**
-     * @return string
-     */
-    public function toString()
-    {
-        return $this->key .
-            $this->getCounter() .
-            $this->nonce .
-            $this->_pad;
-    }
-}

diff --git a/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core32/SipHash.php b/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core32/SipHash.php
deleted file mode 100644 (file)
index 079946d..0000000
--- a/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core32/SipHash.php
+++ /dev/null
@@ -1,238 +0,0 @@
-<?php
-
-if (class_exists('ParagonIE_Sodium_Core32_SipHash', false)) {
-    return;
-}
-
-/**
- * Class ParagonIE_SodiumCompat_Core32_SipHash
- *
- * Only uses 32-bit arithmetic, while the original SipHash used 64-bit integers
- */
-class ParagonIE_Sodium_Core32_SipHash extends ParagonIE_Sodium_Core32_Util
-{
-    /**
-     * @internal You should not use this directly from another application
-     *
-     * @param array<int, ParagonIE_Sodium_Core32_Int64> $v
-     * @return array<int, ParagonIE_Sodium_Core32_Int64>
-     */
-    public static function sipRound(array $v)
-    {
-        # v0 += v1;
-        $v[0] = $v[0]->addInt64($v[1]);
-
-        # v1 = ROTL(v1, 13);
-        $v[1] = $v[1]->rotateLeft(13);
-
-        #  v1 ^= v0;
-        $v[1] = $v[1]->xorInt64($v[0]);
-
-        #  v0=ROTL(v0,32);
-        $v[0] = $v[0]->rotateLeft(32);
-
-        # v2 += v3;
-        $v[2] = $v[2]->addInt64($v[3]);
-
-        # v3=ROTL(v3,16);
-        $v[3] = $v[3]->rotateLeft(16);
-
-        #  v3 ^= v2;
-        $v[3] = $v[3]->xorInt64($v[2]);
-
-        # v0 += v3;
-        $v[0] = $v[0]->addInt64($v[3]);
-
-        # v3=ROTL(v3,21);
-        $v[3] = $v[3]->rotateLeft(21);
-
-        # v3 ^= v0;
-        $v[3] = $v[3]->xorInt64($v[0]);
-
-        # v2 += v1;
-        $v[2] = $v[2]->addInt64($v[1]);
-
-        # v1=ROTL(v1,17);
-        $v[1] = $v[1]->rotateLeft(17);
-
-        #  v1 ^= v2;
-        $v[1] = $v[1]->xorInt64($v[2]);
-
-        # v2=ROTL(v2,32)
-        $v[2] = $v[2]->rotateLeft(32);
-
-        return $v;
-    }
-
-    /**
-     * @internal You should not use this directly from another application
-     *
-     * @param string $in
-     * @param string $key
-     * @return string
-     * @throws SodiumException
-     * @throws TypeError
-     */
-    public static function sipHash24($in, $key)
-    {
-        $inlen = self::strlen($in);
-
-        # /* "somepseudorandomlygeneratedbytes" */
-        # u64 v0 = 0x736f6d6570736575ULL;
-        # u64 v1 = 0x646f72616e646f6dULL;
-        # u64 v2 = 0x6c7967656e657261ULL;
-        # u64 v3 = 0x7465646279746573ULL;
-        $v = array(
-            new ParagonIE_Sodium_Core32_Int64(
-                array(0x736f, 0x6d65, 0x7073, 0x6575)
-            ),
-            new ParagonIE_Sodium_Core32_Int64(
-                array(0x646f, 0x7261, 0x6e64, 0x6f6d)
-            ),
-            new ParagonIE_Sodium_Core32_Int64(
-                array(0x6c79, 0x6765, 0x6e65, 0x7261)
-            ),
-            new ParagonIE_Sodium_Core32_Int64(
-                array(0x7465, 0x6462, 0x7974, 0x6573)
-            )
-        );
-
-        # u64 k0 = LOAD64_LE( k );
-        # u64 k1 = LOAD64_LE( k + 8 );
-        $k = array(
-            ParagonIE_Sodium_Core32_Int64::fromReverseString(
-                self::substr($key, 0, 8)
-            ),
-            ParagonIE_Sodium_Core32_Int64::fromReverseString(
-                self::substr($key, 8, 8)
-            )
-        );
-
-        # b = ( ( u64 )inlen ) << 56;
-        $b = new ParagonIE_Sodium_Core32_Int64(
-            array(($inlen << 8) & 0xffff, 0, 0, 0)
-        );
-
-        # v3 ^= k1;
-        $v[3] = $v[3]->xorInt64($k[1]);
-        # v2 ^= k0;
-        $v[2] = $v[2]->xorInt64($k[0]);
-        # v1 ^= k1;
-        $v[1] = $v[1]->xorInt64($k[1]);
-        # v0 ^= k0;
-        $v[0] = $v[0]->xorInt64($k[0]);
-
-        $left = $inlen;
-        # for ( ; in != end; in += 8 )
-        while ($left >= 8) {
-            # m = LOAD64_LE( in );
-            $m = ParagonIE_Sodium_Core32_Int64::fromReverseString(
-                self::substr($in, 0, 8)
-            );
-
-            # v3 ^= m;
-            $v[3] = $v[3]->xorInt64($m);
-
-            # SIPROUND;
-            # SIPROUND;
-            $v = self::sipRound($v);
-            $v = self::sipRound($v);
-
-            # v0 ^= m;
-            $v[0] = $v[0]->xorInt64($m);
-
-            $in = self::substr($in, 8);
-            $left -= 8;
-        }
-
-        # switch( left )
-        #  {
-        #     case 7: b |= ( ( u64 )in[ 6] )  << 48;
-        #     case 6: b |= ( ( u64 )in[ 5] )  << 40;
-        #     case 5: b |= ( ( u64 )in[ 4] )  << 32;
-        #     case 4: b |= ( ( u64 )in[ 3] )  << 24;
-        #     case 3: b |= ( ( u64 )in[ 2] )  << 16;
-        #     case 2: b |= ( ( u64 )in[ 1] )  <<  8;
-        #     case 1: b |= ( ( u64 )in[ 0] ); break;
-        #     case 0: break;
-        # }
-        switch ($left) {
-            case 7:
-                $b = $b->orInt64(
-                    ParagonIE_Sodium_Core32_Int64::fromInts(
-                        0, self::chrToInt($in[6]) << 16
-                    )
-                );
-            case 6:
-                $b = $b->orInt64(
-                    ParagonIE_Sodium_Core32_Int64::fromInts(
-                        0, self::chrToInt($in[5]) << 8
-                    )
-                );
-            case 5:
-                $b = $b->orInt64(
-                    ParagonIE_Sodium_Core32_Int64::fromInts(
-                        0, self::chrToInt($in[4])
-                    )
-                );
-            case 4:
-                $b = $b->orInt64(
-                    ParagonIE_Sodium_Core32_Int64::fromInts(
-                        self::chrToInt($in[3]) << 24, 0
-                    )
-                );
-            case 3:
-                $b = $b->orInt64(
-                    ParagonIE_Sodium_Core32_Int64::fromInts(
-                        self::chrToInt($in[2]) << 16, 0
-                    )
-                );
-            case 2:
-                $b = $b->orInt64(
-                    ParagonIE_Sodium_Core32_Int64::fromInts(
-                        self::chrToInt($in[1]) << 8, 0
-                    )
-                );
-            case 1:
-                $b = $b->orInt64(
-                    ParagonIE_Sodium_Core32_Int64::fromInts(
-                        self::chrToInt($in[0]), 0
-                    )
-                );
-            case 0:
-                break;
-        }
-
-        # v3 ^= b;
-        $v[3] = $v[3]->xorInt64($b);
-
-        # SIPROUND;
-        # SIPROUND;
-        $v = self::sipRound($v);
-        $v = self::sipRound($v);
-
-        # v0 ^= b;
-        $v[0] = $v[0]->xorInt64($b);
-
-        // Flip the lower 8 bits of v2 which is ($v[4], $v[5]) in our implementation
-        # v2 ^= 0xff;
-        $v[2]->limbs[3] ^= 0xff;
-
-        # SIPROUND;
-        # SIPROUND;
-        # SIPROUND;
-        # SIPROUND;
-        $v = self::sipRound($v);
-        $v = self::sipRound($v);
-        $v = self::sipRound($v);
-        $v = self::sipRound($v);
-
-        # b = v0 ^ v1 ^ v2 ^ v3;
-        # STORE64_LE( out, b );
-        return $v[0]
-            ->xorInt64($v[1])
-            ->xorInt64($v[2])
-            ->xorInt64($v[3])
-            ->toReverseString();
-    }
-}

diff --git a/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core32/Util.php b/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core32/Util.php
deleted file mode 100644 (file)
index f32e5ad..0000000
--- a/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core32/Util.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-
-if (class_exists('ParagonIE_Sodium_Core32_Util', false)) {
-    return;
-}
-
-/**
- * Class ParagonIE_Sodium_Core_Util
- */
-abstract class ParagonIE_Sodium_Core32_Util extends ParagonIE_Sodium_Core_Util
-{
-
-}

diff --git a/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core32/X25519.php b/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core32/X25519.php
deleted file mode 100644 (file)
index 2cc000d..0000000
--- a/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core32/X25519.php
+++ /dev/null
@@ -1,345 +0,0 @@
-<?php
-
-if (class_exists('ParagonIE_Sodium_Core32_X25519', false)) {
-    return;
-}
-
-/**
- * Class ParagonIE_Sodium_Core32_X25519
- */
-abstract class ParagonIE_Sodium_Core32_X25519 extends ParagonIE_Sodium_Core32_Curve25519
-{
-    /**
-     * Alters the objects passed to this method in place.
-     *
-     * @internal You should not use this directly from another application
-     *
-     * @param ParagonIE_Sodium_Core32_Curve25519_Fe $f
-     * @param ParagonIE_Sodium_Core32_Curve25519_Fe $g
-     * @param int $b
-     * @return void
-     * @throws SodiumException
-     * @throws TypeError
-     * @psalm-suppress MixedMethodCall
-     */
-    public static function fe_cswap(
-        ParagonIE_Sodium_Core32_Curve25519_Fe $f,
-        ParagonIE_Sodium_Core32_Curve25519_Fe $g,
-        $b = 0
-    ) {
-        $f0 = (int) $f[0]->toInt();
-        $f1 = (int) $f[1]->toInt();
-        $f2 = (int) $f[2]->toInt();
-        $f3 = (int) $f[3]->toInt();
-        $f4 = (int) $f[4]->toInt();
-        $f5 = (int) $f[5]->toInt();
-        $f6 = (int) $f[6]->toInt();
-        $f7 = (int) $f[7]->toInt();
-        $f8 = (int) $f[8]->toInt();
-        $f9 = (int) $f[9]->toInt();
-        $g0 = (int) $g[0]->toInt();
-        $g1 = (int) $g[1]->toInt();
-        $g2 = (int) $g[2]->toInt();
-        $g3 = (int) $g[3]->toInt();
-        $g4 = (int) $g[4]->toInt();
-        $g5 = (int) $g[5]->toInt();
-        $g6 = (int) $g[6]->toInt();
-        $g7 = (int) $g[7]->toInt();
-        $g8 = (int) $g[8]->toInt();
-        $g9 = (int) $g[9]->toInt();
-        $b = -$b;
-        /** @var int $x0 */
-        $x0 = ($f0 ^ $g0) & $b;
-        /** @var int $x1 */
-        $x1 = ($f1 ^ $g1) & $b;
-        /** @var int $x2 */
-        $x2 = ($f2 ^ $g2) & $b;
-        /** @var int $x3 */
-        $x3 = ($f3 ^ $g3) & $b;
-        /** @var int $x4 */
-        $x4 = ($f4 ^ $g4) & $b;
-        /** @var int $x5 */
-        $x5 = ($f5 ^ $g5) & $b;
-        /** @var int $x6 */
-        $x6 = ($f6 ^ $g6) & $b;
-        /** @var int $x7 */
-        $x7 = ($f7 ^ $g7) & $b;
-        /** @var int $x8 */
-        $x8 = ($f8 ^ $g8) & $b;
-        /** @var int $x9 */
-        $x9 = ($f9 ^ $g9) & $b;
-        $f[0] = ParagonIE_Sodium_Core32_Int32::fromInt($f0 ^ $x0);
-        $f[1] = ParagonIE_Sodium_Core32_Int32::fromInt($f1 ^ $x1);
-        $f[2] = ParagonIE_Sodium_Core32_Int32::fromInt($f2 ^ $x2);
-        $f[3] = ParagonIE_Sodium_Core32_Int32::fromInt($f3 ^ $x3);
-        $f[4] = ParagonIE_Sodium_Core32_Int32::fromInt($f4 ^ $x4);
-        $f[5] = ParagonIE_Sodium_Core32_Int32::fromInt($f5 ^ $x5);
-        $f[6] = ParagonIE_Sodium_Core32_Int32::fromInt($f6 ^ $x6);
-        $f[7] = ParagonIE_Sodium_Core32_Int32::fromInt($f7 ^ $x7);
-        $f[8] = ParagonIE_Sodium_Core32_Int32::fromInt($f8 ^ $x8);
-        $f[9] = ParagonIE_Sodium_Core32_Int32::fromInt($f9 ^ $x9);
-        $g[0] = ParagonIE_Sodium_Core32_Int32::fromInt($g0 ^ $x0);
-        $g[1] = ParagonIE_Sodium_Core32_Int32::fromInt($g1 ^ $x1);
-        $g[2] = ParagonIE_Sodium_Core32_Int32::fromInt($g2 ^ $x2);
-        $g[3] = ParagonIE_Sodium_Core32_Int32::fromInt($g3 ^ $x3);
-        $g[4] = ParagonIE_Sodium_Core32_Int32::fromInt($g4 ^ $x4);
-        $g[5] = ParagonIE_Sodium_Core32_Int32::fromInt($g5 ^ $x5);
-        $g[6] = ParagonIE_Sodium_Core32_Int32::fromInt($g6 ^ $x6);
-        $g[7] = ParagonIE_Sodium_Core32_Int32::fromInt($g7 ^ $x7);
-        $g[8] = ParagonIE_Sodium_Core32_Int32::fromInt($g8 ^ $x8);
-        $g[9] = ParagonIE_Sodium_Core32_Int32::fromInt($g9 ^ $x9);
-    }
-
-    /**
-     * @internal You should not use this directly from another application
-     *
-     * @param ParagonIE_Sodium_Core32_Curve25519_Fe $f
-     * @return ParagonIE_Sodium_Core32_Curve25519_Fe
-     * @throws SodiumException
-     * @throws TypeError
-     * @psalm-suppress MixedAssignment
-     * @psalm-suppress MixedMethodCall
-     */
-    public static function fe_mul121666(ParagonIE_Sodium_Core32_Curve25519_Fe $f)
-    {
-        /** @var array<int, ParagonIE_Sodium_Core32_Int64> $h */
-        $h = array();
-        for ($i = 0; $i < 10; ++$i) {
-            $h[$i] = $f[$i]->toInt64()->mulInt(121666, 17);
-        }
-
-        $carry9 = $h[9]->addInt(1 << 24)->shiftRight(25);
-        $h[0] = $h[0]->addInt64($carry9->mulInt(19, 5));
-        $h[9] = $h[9]->subInt64($carry9->shiftLeft(25));
-
-        $carry1 = $h[1]->addInt(1 << 24)->shiftRight(25);
-        $h[2] = $h[2]->addInt64($carry1);
-        $h[1] = $h[1]->subInt64($carry1->shiftLeft(25));
-
-        $carry3 = $h[3]->addInt(1 << 24)->shiftRight(25);
-        $h[4] = $h[4]->addInt64($carry3);
-        $h[3] = $h[3]->subInt64($carry3->shiftLeft(25));
-
-        $carry5 = $h[5]->addInt(1 << 24)->shiftRight(25);
-        $h[6] = $h[6]->addInt64($carry5);
-        $h[5] = $h[5]->subInt64($carry5->shiftLeft(25));
-
-        $carry7 = $h[7]->addInt(1 << 24)->shiftRight(25);
-        $h[8] = $h[8]->addInt64($carry7);
-        $h[7] = $h[7]->subInt64($carry7->shiftLeft(25));
-
-        $carry0 = $h[0]->addInt(1 << 25)->shiftRight(26);
-        $h[1] = $h[1]->addInt64($carry0);
-        $h[0] = $h[0]->subInt64($carry0->shiftLeft(26));
-
-        $carry2 = $h[2]->addInt(1 << 25)->shiftRight(26);
-        $h[3] = $h[3]->addInt64($carry2);
-        $h[2] = $h[2]->subInt64($carry2->shiftLeft(26));
-
-        $carry4 = $h[4]->addInt(1 << 25)->shiftRight(26);
-        $h[5] = $h[5]->addInt64($carry4);
-        $h[4] = $h[4]->subInt64($carry4->shiftLeft(26));
-
-        $carry6 = $h[6]->addInt(1 << 25)->shiftRight(26);
-        $h[7] = $h[7]->addInt64($carry6);
-        $h[6] = $h[6]->subInt64($carry6->shiftLeft(26));
-
-        $carry8 = $h[8]->addInt(1 << 25)->shiftRight(26);
-        $h[9] = $h[9]->addInt64($carry8);
-        $h[8] = $h[8]->subInt64($carry8->shiftLeft(26));
-
-        for ($i = 0; $i < 10; ++$i) {
-            $h[$i] = $h[$i]->toInt32();
-        }
-        /** @var array<int, ParagonIE_Sodium_Core32_Int32> $h2 */
-        $h2 = $h;
-        return ParagonIE_Sodium_Core32_Curve25519_Fe::fromArray($h2);
-    }
-
-    /**
-     * @internal You should not use this directly from another application
-     *
-     * Inline comments preceded by # are from libsodium's ref10 code.
-     *
-     * @param string $n
-     * @param string $p
-     * @return string
-     * @throws SodiumException
-     * @throws TypeError
-     */
-    public static function crypto_scalarmult_curve25519_ref10($n, $p)
-    {
-        # for (i = 0;i < 32;++i) e[i] = n[i];
-        $e = '' . $n;
-        # e[0] &= 248;
-        $e[0] = self::intToChr(
-            self::chrToInt($e[0]) & 248
-        );
-        # e[31] &= 127;
-        # e[31] |= 64;
-        $e[31] = self::intToChr(
-            (self::chrToInt($e[31]) & 127) | 64
-        );
-        # fe_frombytes(x1,p);
-        $x1 = self::fe_frombytes($p);
-        # fe_1(x2);
-        $x2 = self::fe_1();
-        # fe_0(z2);
-        $z2 = self::fe_0();
-        # fe_copy(x3,x1);
-        $x3 = self::fe_copy($x1);
-        # fe_1(z3);
-        $z3 = self::fe_1();
-
-        # swap = 0;
-        /** @var int $swap */
-        $swap = 0;
-
-        # for (pos = 254;pos >= 0;--pos) {
-        for ($pos = 254; $pos >= 0; --$pos) {
-            # b = e[pos / 8] >> (pos & 7);
-            /** @var int $b */
-            $b = self::chrToInt(
-                    $e[(int) floor($pos / 8)]
-                ) >> ($pos & 7);
-            # b &= 1;
-            $b &= 1;
-
-            # swap ^= b;
-            $swap ^= $b;
-
-            # fe_cswap(x2,x3,swap);
-            self::fe_cswap($x2, $x3, $swap);
-
-            # fe_cswap(z2,z3,swap);
-            self::fe_cswap($z2, $z3, $swap);
-
-            # swap = b;
-            /** @var int $swap */
-            $swap = $b;
-
-            # fe_sub(tmp0,x3,z3);
-            $tmp0 = self::fe_sub($x3, $z3);
-
-            # fe_sub(tmp1,x2,z2);
-            $tmp1 = self::fe_sub($x2, $z2);
-
-            # fe_add(x2,x2,z2);
-            $x2 = self::fe_add($x2, $z2);
-
-            # fe_add(z2,x3,z3);
-            $z2 = self::fe_add($x3, $z3);
-
-            # fe_mul(z3,tmp0,x2);
-            $z3 = self::fe_mul($tmp0, $x2);
-
-            # fe_mul(z2,z2,tmp1);
-            $z2 = self::fe_mul($z2, $tmp1);
-
-            # fe_sq(tmp0,tmp1);
-            $tmp0 = self::fe_sq($tmp1);
-
-            # fe_sq(tmp1,x2);
-            $tmp1 = self::fe_sq($x2);
-
-            # fe_add(x3,z3,z2);
-            $x3 = self::fe_add($z3, $z2);
-
-            # fe_sub(z2,z3,z2);
-            $z2 = self::fe_sub($z3, $z2);
-
-            # fe_mul(x2,tmp1,tmp0);
-            $x2 = self::fe_mul($tmp1, $tmp0);
-
-            # fe_sub(tmp1,tmp1,tmp0);
-            $tmp1 = self::fe_sub($tmp1, $tmp0);
-
-            # fe_sq(z2,z2);
-            $z2 = self::fe_sq($z2);
-
-            # fe_mul121666(z3,tmp1);
-            $z3 = self::fe_mul121666($tmp1);
-
-            # fe_sq(x3,x3);
-            $x3 = self::fe_sq($x3);
-
-            # fe_add(tmp0,tmp0,z3);
-            $tmp0 = self::fe_add($tmp0, $z3);
-
-            # fe_mul(z3,x1,z2);
-            $z3 = self::fe_mul($x1, $z2);
-
-            # fe_mul(z2,tmp1,tmp0);
-            $z2 = self::fe_mul($tmp1, $tmp0);
-        }
-
-        # fe_cswap(x2,x3,swap);
-        self::fe_cswap($x2, $x3, $swap);
-
-        # fe_cswap(z2,z3,swap);
-        self::fe_cswap($z2, $z3, $swap);
-
-        # fe_invert(z2,z2);
-        $z2 = self::fe_invert($z2);
-
-        # fe_mul(x2,x2,z2);
-        $x2 = self::fe_mul($x2, $z2);
-        # fe_tobytes(q,x2);
-        return (string) self::fe_tobytes($x2);
-    }
-
-    /**
-     * @internal You should not use this directly from another application
-     *
-     * @param ParagonIE_Sodium_Core32_Curve25519_Fe $edwardsY
-     * @param ParagonIE_Sodium_Core32_Curve25519_Fe $edwardsZ
-     * @return ParagonIE_Sodium_Core32_Curve25519_Fe
-     * @throws SodiumException
-     * @throws TypeError
-     */
-    public static function edwards_to_montgomery(
-        ParagonIE_Sodium_Core32_Curve25519_Fe $edwardsY,
-        ParagonIE_Sodium_Core32_Curve25519_Fe $edwardsZ
-    ) {
-        $tempX = self::fe_add($edwardsZ, $edwardsY);
-        $tempZ = self::fe_sub($edwardsZ, $edwardsY);
-        $tempZ = self::fe_invert($tempZ);
-        return self::fe_mul($tempX, $tempZ);
-    }
-
-    /**
-     * @internal You should not use this directly from another application
-     *
-     * @param string $n
-     * @return string
-     * @throws SodiumException
-     * @throws TypeError
-     */
-    public static function crypto_scalarmult_curve25519_ref10_base($n)
-    {
-        # for (i = 0;i < 32;++i) e[i] = n[i];
-        $e = '' . $n;
-
-        # e[0] &= 248;
-        $e[0] = self::intToChr(
-            self::chrToInt($e[0]) & 248
-        );
-
-        # e[31] &= 127;
-        # e[31] |= 64;
-        $e[31] = self::intToChr(
-            (self::chrToInt($e[31]) & 127) | 64
-        );
-
-        $A = self::ge_scalarmult_base($e);
-        if (
-            !($A->Y instanceof ParagonIE_Sodium_Core32_Curve25519_Fe)
-                ||
-            !($A->Z instanceof ParagonIE_Sodium_Core32_Curve25519_Fe)
-        ) {
-            throw new TypeError('Null points encountered');
-        }
-        $pk = self::edwards_to_montgomery($A->Y, $A->Z);
-        return self::fe_tobytes($pk);
-    }
-}

diff --git a/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core32/XChaCha20.php b/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core32/XChaCha20.php
deleted file mode 100644 (file)
index 404e8d2..0000000
--- a/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core32/XChaCha20.php
+++ /dev/null
@@ -1,87 +0,0 @@
-<?php
-
-if (class_exists('ParagonIE_Sodium_Core32_XChaCha20', false)) {
-    return;
-}
-
-/**
- * Class ParagonIE_Sodium_Core32_XChaCha20
- */
-class ParagonIE_Sodium_Core32_XChaCha20 extends ParagonIE_Sodium_Core32_HChaCha20
-{
-    /**
-     * @internal You should not use this directly from another application
-     *
-     * @param int $len
-     * @param string $nonce
-     * @param string $key
-     * @return string
-     * @throws SodiumException
-     * @throws TypeError
-     */
-    public static function stream($len = 64, $nonce = '', $key = '')
-    {
-        if (self::strlen($nonce) !== 24) {
-            throw new SodiumException('Nonce must be 24 bytes long');
-        }
-        return self::encryptBytes(
-            new ParagonIE_Sodium_Core32_ChaCha20_Ctx(
-                self::hChaCha20(
-                    self::substr($nonce, 0, 16),
-                    $key
-                ),
-                self::substr($nonce, 16, 8)
-            ),
-            str_repeat("\x00", $len)
-        );
-    }
-
-    /**
-     * @internal You should not use this directly from another application
-     *
-     * @param string $message
-     * @param string $nonce
-     * @param string $key
-     * @param string $ic
-     * @return string
-     * @throws SodiumException
-     * @throws TypeError
-     */
-    public static function streamXorIc($message, $nonce = '', $key = '', $ic = '')
-    {
-        if (self::strlen($nonce) !== 24) {
-            throw new SodiumException('Nonce must be 24 bytes long');
-        }
-        return self::encryptBytes(
-            new ParagonIE_Sodium_Core32_ChaCha20_Ctx(
-                self::hChaCha20(self::substr($nonce, 0, 16), $key),
-                self::substr($nonce, 16, 8),
-                $ic
-            ),
-            $message
-        );
-    }
-
-    /**
-     * @internal You should not use this directly from another application
-     *
-     * @param string $message
-     * @param string $nonce
-     * @param string $key
-     * @param string $ic
-     * @return string
-     * @throws SodiumException
-     * @throws TypeError
-     */
-    public static function ietfStreamXorIc($message, $nonce = '', $key = '', $ic = '')
-    {
-        return self::encryptBytes(
-            new ParagonIE_Sodium_Core32_ChaCha20_IetfCtx(
-                self::hChaCha20(self::substr($nonce, 0, 16), $key),
-                "\x00\x00\x00\x00" . self::substr($nonce, 16, 8),
-                $ic
-            ),
-            $message
-        );
-    }
-}

diff --git a/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core32/XSalsa20.php b/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core32/XSalsa20.php
deleted file mode 100644 (file)
index a16b93b..0000000
--- a/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Core32/XSalsa20.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-
-if (class_exists('ParagonIE_Sodium_Core32_XSalsa20', false)) {
-    return;
-}
-
-/**
- * Class ParagonIE_Sodium_Core32_XSalsa20
- */
-abstract class ParagonIE_Sodium_Core32_XSalsa20 extends ParagonIE_Sodium_Core32_HSalsa20
-{
-    /**
-     * Expand a key and nonce into an xsalsa20 keystream.
-     *
-     * @internal You should not use this directly from another application
-     *
-     * @param int $len
-     * @param string $nonce
-     * @param string $key
-     * @return string
-     * @throws SodiumException
-     * @throws TypeError
-     */
-    public static function xsalsa20($len, $nonce, $key)
-    {
-        $ret = self::salsa20(
-            $len,
-            self::substr($nonce, 16, 8),
-            self::hsalsa20($nonce, $key)
-        );
-        return $ret;
-    }
-
-    /**
-     * Encrypt a string with XSalsa20. Doesn't provide integrity.
-     *
-     * @internal You should not use this directly from another application
-     *
-     * @param string $message
-     * @param string $nonce
-     * @param string $key
-     * @return string
-     * @throws SodiumException
-     * @throws TypeError
-     */
-    public static function xsalsa20_xor($message, $nonce, $key)
-    {
-        return self::xorStrings(
-            $message,
-            self::xsalsa20(
-                self::strlen($message),
-                $nonce,
-                $key
-            )
-        );
-    }
-}

diff --git a/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Crypto.php b/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Crypto.php
index 7e980f4f7c5321b94f573135af221b0904a68d0f..bcd58c0de5d0b547633ed64752bc4a18c0f0ddbd 100644 (file)
--- a/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Crypto.php
+++ b/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Crypto.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 if (class_exists('ParagonIE_Sodium_Crypto', false)) {
     return;
@@ -69,31 +70,32 @@ abstract class ParagonIE_Sodium_Crypto
      * @throws TypeError
      */
     public static function aead_chacha20poly1305_decrypt(
-        $message = '',
-        $ad = '',
-        $nonce = '',
-        $key = ''
-    ) {
-        /** @var int $len - Length of message (ciphertext + MAC) */
+        string $message = '',
+        string $ad = '',
+        string $nonce = '',
+        #[SensitiveParameter]
+        string $key = ''
+    ): string {
+        /* Length of message (ciphertext + MAC) */
         $len = ParagonIE_Sodium_Core_Util::strlen($message);
 
-        /** @var int  $clen - Length of ciphertext */
+        /* Length of ciphertext */
         $clen = $len - self::aead_chacha20poly1305_ABYTES;
 
-        /** @var int $adlen - Length of associated data */
+        /* Length of associated data */
         $adlen = ParagonIE_Sodium_Core_Util::strlen($ad);
 
-        /** @var string $mac - Message authentication code */
+        /* Message authentication code */
         $mac = ParagonIE_Sodium_Core_Util::substr(
             $message,
             $clen,
             self::aead_chacha20poly1305_ABYTES
         );
 
-        /** @var string $ciphertext - The encrypted message (sans MAC) */
+        /* The encrypted message (sans MAC) */
         $ciphertext = ParagonIE_Sodium_Core_Util::substr($message, 0, $clen);
 
-        /** @var string The first block of the chacha20 keystream, used as a poly1305 key */
+        /* The first block of the chacha20 keystream, used as a poly1305 key */
         $block0 = ParagonIE_Sodium_Core_ChaCha20::stream(
             32,
             $nonce,
@@ -104,7 +106,7 @@ abstract class ParagonIE_Sodium_Crypto
         $state = new ParagonIE_Sodium_Core_Poly1305_State($block0);
         try {
             ParagonIE_Sodium_Compat::memzero($block0);
-        } catch (SodiumException $ex) {
+        } catch (SodiumException) {
             $block0 = null;
         }
         $state->update($ad);
@@ -141,18 +143,20 @@ abstract class ParagonIE_Sodium_Crypto
      * @throws TypeError
      */
     public static function aead_chacha20poly1305_encrypt(
-        $message = '',
-        $ad = '',
-        $nonce = '',
-        $key = ''
-    ) {
-        /** @var int $len - Length of the plaintext message */
+        #[SensitiveParameter]
+        string $message = '',
+        string $ad = '',
+        string $nonce = '',
+        #[SensitiveParameter]
+        string $key = ''
+    ): string {
+        /* Length of the plaintext message */
         $len = ParagonIE_Sodium_Core_Util::strlen($message);
 
-        /** @var int $adlen - Length of the associated data */
+        /* Length of the associated data */
         $adlen = ParagonIE_Sodium_Core_Util::strlen($ad);
 
-        /** @var string The first block of the chacha20 keystream, used as a poly1305 key */
+        /* The first block of the chacha20 keystream, used as a poly1305 key */
         $block0 = ParagonIE_Sodium_Core_ChaCha20::stream(
             32,
             $nonce,
@@ -161,7 +165,7 @@ abstract class ParagonIE_Sodium_Crypto
         $state = new ParagonIE_Sodium_Core_Poly1305_State($block0);
         try {
             ParagonIE_Sodium_Compat::memzero($block0);
-        } catch (SodiumException $ex) {
+        } catch (SodiumException) {
             $block0 = null;
         }
 
@@ -194,21 +198,22 @@ abstract class ParagonIE_Sodium_Crypto
      * @throws TypeError
      */
     public static function aead_chacha20poly1305_ietf_decrypt(
-        $message = '',
-        $ad = '',
-        $nonce = '',
-        $key = ''
-    ) {
-        /** @var int $adlen - Length of associated data */
+        string $message = '',
+        string $ad = '',
+        string $nonce = '',
+        #[SensitiveParameter]
+        string $key = ''
+    ): string {
+        /* Length of associated data */
         $adlen = ParagonIE_Sodium_Core_Util::strlen($ad);
 
-        /** @var int $len - Length of message (ciphertext + MAC) */
+        /* Length of message (ciphertext + MAC) */
         $len = ParagonIE_Sodium_Core_Util::strlen($message);
 
-        /** @var int  $clen - Length of ciphertext */
+        /* Length of ciphertext */
         $clen = $len - self::aead_chacha20poly1305_IETF_ABYTES;
 
-        /** @var string The first block of the chacha20 keystream, used as a poly1305 key */
+        /* The first block of the chacha20 keystream, used as a poly1305 key */
         $block0 = ParagonIE_Sodium_Core_ChaCha20::ietfStream(
             32,
             $nonce,
@@ -233,7 +238,7 @@ abstract class ParagonIE_Sodium_Crypto
         $state = new ParagonIE_Sodium_Core_Poly1305_State($block0);
         try {
             ParagonIE_Sodium_Compat::memzero($block0);
-        } catch (SodiumException $ex) {
+        } catch (SodiumException) {
             $block0 = null;
         }
         $state->update($ad);
@@ -272,18 +277,20 @@ abstract class ParagonIE_Sodium_Crypto
      * @throws TypeError
      */
     public static function aead_chacha20poly1305_ietf_encrypt(
-        $message = '',
-        $ad = '',
-        $nonce = '',
-        $key = ''
-    ) {
-        /** @var int $len - Length of the plaintext message */
+        #[SensitiveParameter]
+        string $message = '',
+        string $ad = '',
+        string $nonce = '',
+        #[SensitiveParameter]
+        string $key = ''
+    ): string {
+        /* Length of the plaintext message */
         $len = ParagonIE_Sodium_Core_Util::strlen($message);
 
-        /** @var int $adlen - Length of the associated data */
+        /* Length of the associated data */
         $adlen = ParagonIE_Sodium_Core_Util::strlen($ad);
 
-        /** @var string The first block of the chacha20 keystream, used as a poly1305 key */
+        /* The first block of the chacha20 keystream, used as a poly1305 key */
         $block0 = ParagonIE_Sodium_Core_ChaCha20::ietfStream(
             32,
             $nonce,
@@ -292,7 +299,7 @@ abstract class ParagonIE_Sodium_Crypto
         $state = new ParagonIE_Sodium_Core_Poly1305_State($block0);
         try {
             ParagonIE_Sodium_Compat::memzero($block0);
-        } catch (SodiumException $ex) {
+        } catch (SodiumException) {
             $block0 = null;
         }
 
@@ -327,11 +334,12 @@ abstract class ParagonIE_Sodium_Crypto
      * @throws TypeError
      */
     public static function aead_xchacha20poly1305_ietf_decrypt(
-        $message = '',
-        $ad = '',
-        $nonce = '',
-        $key = ''
-    ) {
+        string $message = '',
+        string $ad = '',
+        string $nonce = '',
+        #[SensitiveParameter]
+        string $key = ''
+    ): string {
         $subkey = ParagonIE_Sodium_Core_HChaCha20::hChaCha20(
             ParagonIE_Sodium_Core_Util::substr($nonce, 0, 16),
             $key
@@ -356,11 +364,13 @@ abstract class ParagonIE_Sodium_Crypto
      * @throws TypeError
      */
     public static function aead_xchacha20poly1305_ietf_encrypt(
-        $message = '',
-        $ad = '',
-        $nonce = '',
-        $key = ''
-    ) {
+        #[SensitiveParameter]
+        string $message = '',
+        string $ad = '',
+        string $nonce = '',
+        #[SensitiveParameter]
+        string $key = ''
+    ): string {
         $subkey = ParagonIE_Sodium_Core_HChaCha20::hChaCha20(
             ParagonIE_Sodium_Core_Util::substr($nonce, 0, 16),
             $key
@@ -381,8 +391,11 @@ abstract class ParagonIE_Sodium_Crypto
      * @return string
      * @throws TypeError
      */
-    public static function auth($message, $key)
-    {
+    public static function auth(
+        string $message,
+        #[SensitiveParameter]
+        string $key
+    ): string {
         return ParagonIE_Sodium_Core_Util::substr(
             hash_hmac('sha512', $message, $key, true),
             0,
@@ -402,8 +415,12 @@ abstract class ParagonIE_Sodium_Crypto
      * @throws SodiumException
      * @throws TypeError
      */
-    public static function auth_verify($mac, $message, $key)
-    {
+    public static function auth_verify(
+        string $mac,
+        string $message,
+        #[SensitiveParameter]
+        string $key
+    ): bool {
         return ParagonIE_Sodium_Core_Util::hashEquals(
             $mac,
             self::auth($message, $key)
@@ -422,9 +439,14 @@ abstract class ParagonIE_Sodium_Crypto
      * @throws SodiumException
      * @throws TypeError
      */
-    public static function box($plaintext, $nonce, $keypair)
-    {
-        $c = self::secretbox(
+    public static function box(
+        #[SensitiveParameter]
+        string $plaintext,
+        string $nonce,
+        #[SensitiveParameter]
+        string $keypair
+    ): string {
+        return self::secretbox(
             $plaintext,
             $nonce,
             self::box_beforenm(
@@ -432,7 +454,6 @@ abstract class ParagonIE_Sodium_Crypto
                 self::box_publickey($keypair)
             )
         );
-        return $c;
     }
 
     /**
@@ -446,8 +467,11 @@ abstract class ParagonIE_Sodium_Crypto
      * @throws SodiumException
      * @throws TypeError
      */
-    public static function box_seal($message, $publicKey)
-    {
+    public static function box_seal(
+        #[SensitiveParameter]
+        string $message,
+        string $publicKey
+    ): string {
         /** @var string $ephemeralKeypair */
         $ephemeralKeypair = self::box_keypair();
 
@@ -473,7 +497,7 @@ abstract class ParagonIE_Sodium_Crypto
             ParagonIE_Sodium_Compat::memzero($ephemeralKeypair);
             ParagonIE_Sodium_Compat::memzero($ephemeralSK);
             ParagonIE_Sodium_Compat::memzero($nonce);
-        } catch (SodiumException $ex) {
+        } catch (SodiumException) {
             $ephemeralKeypair = null;
             $ephemeralSK = null;
             $nonce = null;
@@ -492,8 +516,11 @@ abstract class ParagonIE_Sodium_Crypto
      * @throws SodiumException
      * @throws TypeError
      */
-    public static function box_seal_open($message, $keypair)
-    {
+    public static function box_seal_open(
+        string $message,
+        #[SensitiveParameter]
+        string $keypair
+    ): string {
         /** @var string $ephemeralPK */
         $ephemeralPK = ParagonIE_Sodium_Core_Util::substr($message, 0, 32);
 
@@ -522,7 +549,7 @@ abstract class ParagonIE_Sodium_Crypto
             ParagonIE_Sodium_Compat::memzero($secretKey);
             ParagonIE_Sodium_Compat::memzero($ephemeralPK);
             ParagonIE_Sodium_Compat::memzero($nonce);
-        } catch (SodiumException $ex) {
+        } catch (SodiumException) {
             $secretKey = null;
             $ephemeralPK = null;
             $nonce = null;
@@ -541,7 +568,11 @@ abstract class ParagonIE_Sodium_Crypto
      * @throws SodiumException
      * @throws TypeError
      */
-    public static function box_beforenm($sk, $pk)
+    public static function box_beforenm(
+        #[SensitiveParameter]
+        string $sk,
+        string $pk
+    ): string
     {
         return ParagonIE_Sodium_Core_HSalsa20::hsalsa20(
             str_repeat("\x00", 16),
@@ -557,7 +588,7 @@ abstract class ParagonIE_Sodium_Crypto
      * @throws SodiumException
      * @throws TypeError
      */
-    public static function box_keypair()
+    public static function box_keypair(): string
     {
         $sKey = random_bytes(32);
         $pKey = self::scalarmult_base($sKey);
@@ -570,7 +601,10 @@ abstract class ParagonIE_Sodium_Crypto
      * @throws SodiumException
      * @throws TypeError
      */
-    public static function box_seed_keypair($seed)
+    public static function box_seed_keypair(
+        #[SensitiveParameter]
+        string $seed
+    ): string
     {
         $sKey = ParagonIE_Sodium_Core_Util::substr(
             hash('sha512', $seed, true),
@@ -589,8 +623,11 @@ abstract class ParagonIE_Sodium_Crypto
      * @return string
      * @throws TypeError
      */
-    public static function box_keypair_from_secretkey_and_publickey($sKey, $pKey)
-    {
+    public static function box_keypair_from_secretkey_and_publickey(
+        #[SensitiveParameter]
+        string $sKey,
+        string $pKey
+    ): string {
         return ParagonIE_Sodium_Core_Util::substr($sKey, 0, 32) .
             ParagonIE_Sodium_Core_Util::substr($pKey, 0, 32);
     }
@@ -603,8 +640,10 @@ abstract class ParagonIE_Sodium_Crypto
      * @throws RangeException
      * @throws TypeError
      */
-    public static function box_secretkey($keypair)
-    {
+    public static function box_secretkey(
+        #[SensitiveParameter]
+        string $keypair
+    ): string {
         if (ParagonIE_Sodium_Core_Util::strlen($keypair) !== 64) {
             throw new RangeException(
                 'Must be ParagonIE_Sodium_Compat::CRYPTO_BOX_KEYPAIRBYTES bytes long.'
@@ -621,8 +660,10 @@ abstract class ParagonIE_Sodium_Crypto
      * @throws RangeException
      * @throws TypeError
      */
-    public static function box_publickey($keypair)
-    {
+    public static function box_publickey(
+        #[SensitiveParameter]
+        string $keypair
+    ): string {
         if (ParagonIE_Sodium_Core_Util::strlen($keypair) !== ParagonIE_Sodium_Compat::CRYPTO_BOX_KEYPAIRBYTES) {
             throw new RangeException(
                 'Must be ParagonIE_Sodium_Compat::CRYPTO_BOX_KEYPAIRBYTES bytes long.'
@@ -640,8 +681,10 @@ abstract class ParagonIE_Sodium_Crypto
      * @throws SodiumException
      * @throws TypeError
      */
-    public static function box_publickey_from_secretkey($sKey)
-    {
+    public static function box_publickey_from_secretkey(
+        #[SensitiveParameter]
+        string $sKey
+    ): string {
         if (ParagonIE_Sodium_Core_Util::strlen($sKey) !== ParagonIE_Sodium_Compat::CRYPTO_BOX_SECRETKEYBYTES) {
             throw new RangeException(
                 'Must be ParagonIE_Sodium_Compat::CRYPTO_BOX_SECRETKEYBYTES bytes long.'
@@ -662,8 +705,12 @@ abstract class ParagonIE_Sodium_Crypto
      * @throws SodiumException
      * @throws TypeError
      */
-    public static function box_open($ciphertext, $nonce, $keypair)
-    {
+    public static function box_open(
+        string $ciphertext,
+        string $nonce,
+        #[SensitiveParameter]
+        string $keypair
+    ): string {
         return self::secretbox_open(
             $ciphertext,
             $nonce,
@@ -687,12 +734,17 @@ abstract class ParagonIE_Sodium_Crypto
      * @throws SodiumException
      * @throws TypeError
      */
-    public static function generichash($message, $key = '', $outlen = 32)
-    {
+    public static function generichash(
+        string $message,
+        #[SensitiveParameter]
+        ?string $key = '',
+        int $outlen = 32
+    ): string {
         // This ensures that ParagonIE_Sodium_Core_BLAKE2b::$iv is initialized
         ParagonIE_Sodium_Core_BLAKE2b::pseudoConstructor();
 
         $k = null;
+        /** @psalm-suppress RiskyTruthyFalsyComparison */
         if (!empty($key)) {
             /** @var SplFixedArray $k */
             $k = ParagonIE_Sodium_Core_BLAKE2b::stringToSplFixedArray($key);
@@ -728,20 +780,11 @@ abstract class ParagonIE_Sodium_Crypto
      * @throws SodiumException
      * @throws TypeError
      */
-    public static function generichash_final($ctx, $outlen = 32)
+    public static function generichash_final(string $ctx, int $outlen = 32): string
     {
-        if (!is_string($ctx)) {
-            throw new TypeError('Context must be a string');
-        }
         $out = new SplFixedArray($outlen);
-
-        /** @var SplFixedArray $context */
         $context = ParagonIE_Sodium_Core_BLAKE2b::stringToContext($ctx);
-
-        /** @var SplFixedArray $out */
         $out = ParagonIE_Sodium_Core_BLAKE2b::finish($context, $out);
-
-        /** @var array<int, int> */
         $outArray = $out->toArray();
         return ParagonIE_Sodium_Core_Util::intArrayToString($outArray);
     }
@@ -758,8 +801,11 @@ abstract class ParagonIE_Sodium_Crypto
      * @throws SodiumException
      * @throws TypeError
      */
-    public static function generichash_init($key = '', $outputLength = 32)
-    {
+    public static function generichash_init(
+        #[SensitiveParameter]
+        string $key = '',
+        int $outputLength = 32
+    ): string {
         // This ensures that ParagonIE_Sodium_Core_BLAKE2b::$iv is initialized
         ParagonIE_Sodium_Core_BLAKE2b::pseudoConstructor();
 
@@ -792,11 +838,12 @@ abstract class ParagonIE_Sodium_Crypto
      * @throws TypeError
      */
     public static function generichash_init_salt_personal(
-        $key = '',
-        $outputLength = 32,
-        $salt = '',
-        $personal = ''
-    ) {
+        #[SensitiveParameter]
+        string $key = '',
+        int $outputLength = 32,
+        string $salt = '',
+        string $personal = ''
+    ): string {
         // This ensures that ParagonIE_Sodium_Core_BLAKE2b::$iv is initialized
         ParagonIE_Sodium_Core_BLAKE2b::pseudoConstructor();
 
@@ -817,10 +864,7 @@ abstract class ParagonIE_Sodium_Crypto
         } else {
             $p = null;
         }
-
-        /** @var SplFixedArray $ctx */
         $ctx = ParagonIE_Sodium_Core_BLAKE2b::init($k, $outputLength, $s, $p);
-
         return ParagonIE_Sodium_Core_BLAKE2b::contextToString($ctx);
     }
 
@@ -835,19 +879,13 @@ abstract class ParagonIE_Sodium_Crypto
      * @throws SodiumException
      * @throws TypeError
      */
-    public static function generichash_update($ctx, $message)
+    public static function generichash_update(string $ctx, string $message): string
     {
         // This ensures that ParagonIE_Sodium_Core_BLAKE2b::$iv is initialized
         ParagonIE_Sodium_Core_BLAKE2b::pseudoConstructor();
-
-        /** @var SplFixedArray $context */
         $context = ParagonIE_Sodium_Core_BLAKE2b::stringToContext($ctx);
-
-        /** @var SplFixedArray $in */
         $in = ParagonIE_Sodium_Core_BLAKE2b::stringToSplFixedArray($message);
-
         ParagonIE_Sodium_Core_BLAKE2b::update($context, $in, $in->count());
-
         return ParagonIE_Sodium_Core_BLAKE2b::contextToString($context);
     }
 
@@ -864,8 +902,13 @@ abstract class ParagonIE_Sodium_Crypto
      * @throws SodiumException
      * @throws TypeError
      */
-    public static function keyExchange($my_sk, $their_pk, $client_pk, $server_pk)
-    {
+    public static function keyExchange(
+        #[SensitiveParameter]
+        string $my_sk,
+        string $their_pk,
+        string $client_pk,
+        string $server_pk
+    ): string {
         return ParagonIE_Sodium_Compat::crypto_generichash(
             ParagonIE_Sodium_Compat::crypto_scalarmult($my_sk, $their_pk) .
             $client_pk .
@@ -885,8 +928,11 @@ abstract class ParagonIE_Sodium_Crypto
      * @throws SodiumException
      * @throws TypeError
      */
-    public static function scalarmult($sKey, $pKey)
-    {
+    public static function scalarmult(
+        #[SensitiveParameter]
+        string $sKey,
+        string $pKey
+    ): string {
         $q = ParagonIE_Sodium_Core_X25519::crypto_scalarmult_curve25519_ref10($sKey, $pKey);
         self::scalarmult_throw_if_zero($q);
         return $q;
@@ -902,8 +948,10 @@ abstract class ParagonIE_Sodium_Crypto
      * @throws SodiumException
      * @throws TypeError
      */
-    public static function scalarmult_base($secret)
-    {
+    public static function scalarmult_base(
+        #[SensitiveParameter]
+        string $secret
+    ): string {
         $q = ParagonIE_Sodium_Core_X25519::crypto_scalarmult_curve25519_ref10_base($secret);
         self::scalarmult_throw_if_zero($q);
         return $q;
@@ -917,8 +965,10 @@ abstract class ParagonIE_Sodium_Crypto
      * @throws SodiumException
      * @throws TypeError
      */
-    protected static function scalarmult_throw_if_zero($q)
-    {
+    protected static function scalarmult_throw_if_zero(
+        #[SensitiveParameter]
+        string $q
+    ): void {
         $d = 0;
         for ($i = 0; $i < self::box_curve25519xsalsa20poly1305_SECRETKEYBYTES; ++$i) {
             $d |= ParagonIE_Sodium_Core_Util::chrToInt($q[$i]);
@@ -942,20 +992,19 @@ abstract class ParagonIE_Sodium_Crypto
      * @throws SodiumException
      * @throws TypeError
      */
-    public static function secretbox($plaintext, $nonce, $key)
-    {
-        /** @var string $subkey */
+    public static function secretbox(
+        #[SensitiveParameter]
+        string $plaintext,
+        string $nonce,
+        #[SensitiveParameter]
+        string $key
+    ): string {
         $subkey = ParagonIE_Sodium_Core_HSalsa20::hsalsa20($nonce, $key);
-
-        /** @var string $block0 */
         $block0 = str_repeat("\x00", 32);
 
-        /** @var int $mlen - Length of the plaintext message */
+        /* Length of the plaintext message */
         $mlen = ParagonIE_Sodium_Core_Util::strlen($plaintext);
-        $mlen0 = $mlen;
-        if ($mlen0 > 64 - self::secretbox_xsalsa20poly1305_ZEROBYTES) {
-            $mlen0 = 64 - self::secretbox_xsalsa20poly1305_ZEROBYTES;
-        }
+        $mlen0 = min($mlen,  64 - self::secretbox_xsalsa20poly1305_ZEROBYTES);
         $block0 .= ParagonIE_Sodium_Core_Util::substr($plaintext, 0, $mlen0);
 
         /** @var string $block0 */
@@ -991,7 +1040,7 @@ abstract class ParagonIE_Sodium_Crypto
         try {
             ParagonIE_Sodium_Compat::memzero($block0);
             ParagonIE_Sodium_Compat::memzero($subkey);
-        } catch (SodiumException $ex) {
+        } catch (SodiumException) {
             $block0 = null;
             $subkey = null;
         }
@@ -1017,28 +1066,27 @@ abstract class ParagonIE_Sodium_Crypto
      * @throws SodiumException
      * @throws TypeError
      */
-    public static function secretbox_open($ciphertext, $nonce, $key)
-    {
-        /** @var string $mac */
+    public static function secretbox_open(
+        string $ciphertext,
+        string $nonce,
+        #[SensitiveParameter]
+        string $key
+    ): string {
         $mac = ParagonIE_Sodium_Core_Util::substr(
             $ciphertext,
             0,
             self::secretbox_xsalsa20poly1305_MACBYTES
         );
 
-        /** @var string $c */
         $c = ParagonIE_Sodium_Core_Util::substr(
             $ciphertext,
             self::secretbox_xsalsa20poly1305_MACBYTES
         );
 
-        /** @var int $clen */
         $clen = ParagonIE_Sodium_Core_Util::strlen($c);
 
-        /** @var string $subkey */
         $subkey = ParagonIE_Sodium_Core_HSalsa20::hsalsa20($nonce, $key);
 
-        /** @var string $block0 */
         $block0 = ParagonIE_Sodium_Core_Salsa20::salsa20(
             64,
             ParagonIE_Sodium_Core_Util::substr($nonce, 16, 8),
@@ -1052,13 +1100,13 @@ abstract class ParagonIE_Sodium_Crypto
         if (!$verified) {
             try {
                 ParagonIE_Sodium_Compat::memzero($subkey);
-            } catch (SodiumException $ex) {
+            } catch (SodiumException) {
                 $subkey = null;
             }
             throw new SodiumException('Invalid MAC');
         }
 
-        /** @var string $m - Decrypted message */
+        /* Decrypted message */
         $m = ParagonIE_Sodium_Core_Util::xorStrings(
             ParagonIE_Sodium_Core_Util::substr($block0, self::secretbox_xsalsa20poly1305_ZEROBYTES),
             ParagonIE_Sodium_Core_Util::substr($c, 0, self::secretbox_xsalsa20poly1305_ZEROBYTES)
@@ -1072,7 +1120,7 @@ abstract class ParagonIE_Sodium_Crypto
                 ),
                 ParagonIE_Sodium_Core_Util::substr($nonce, 16, 8),
                 1,
-                (string) $subkey
+                $subkey
             );
         }
         return $m;
@@ -1090,19 +1138,21 @@ abstract class ParagonIE_Sodium_Crypto
      * @throws SodiumException
      * @throws TypeError
      */
-    public static function secretbox_xchacha20poly1305($plaintext, $nonce, $key)
-    {
-        /** @var string $subkey */
+    public static function secretbox_xchacha20poly1305(
+        #[SensitiveParameter]
+        string $plaintext,
+        string $nonce,
+        #[SensitiveParameter]
+        string $key
+    ): string {
         $subkey = ParagonIE_Sodium_Core_HChaCha20::hChaCha20(
             ParagonIE_Sodium_Core_Util::substr($nonce, 0, 16),
             $key
         );
         $nonceLast = ParagonIE_Sodium_Core_Util::substr($nonce, 16, 8);
-
-        /** @var string $block0 */
         $block0 = str_repeat("\x00", 32);
 
-        /** @var int $mlen - Length of the plaintext message */
+        /*Length of the plaintext message */
         $mlen = ParagonIE_Sodium_Core_Util::strlen($plaintext);
         $mlen0 = $mlen;
         if ($mlen0 > 64 - self::secretbox_xchacha20poly1305_ZEROBYTES) {
@@ -1143,7 +1193,7 @@ abstract class ParagonIE_Sodium_Crypto
         try {
             ParagonIE_Sodium_Compat::memzero($block0);
             ParagonIE_Sodium_Compat::memzero($subkey);
-        } catch (SodiumException $ex) {
+        } catch (SodiumException) {
             $block0 = null;
             $subkey = null;
         }
@@ -1169,8 +1219,12 @@ abstract class ParagonIE_Sodium_Crypto
      * @throws SodiumException
      * @throws TypeError
      */
-    public static function secretbox_xchacha20poly1305_open($ciphertext, $nonce, $key)
-    {
+    public static function secretbox_xchacha20poly1305_open(
+        string $ciphertext,
+        string $nonce,
+        #[SensitiveParameter]
+        string $key
+    ): string {
         /** @var string $mac */
         $mac = ParagonIE_Sodium_Core_Util::substr(
             $ciphertext,
@@ -1205,13 +1259,13 @@ abstract class ParagonIE_Sodium_Crypto
         if (!$verified) {
             try {
                 ParagonIE_Sodium_Compat::memzero($subkey);
-            } catch (SodiumException $ex) {
+            } catch (SodiumException) {
                 $subkey = null;
             }
             throw new SodiumException('Invalid MAC');
         }
 
-        /** @var string $m - Decrypted message */
+        /* Decrypted message */
         $m = ParagonIE_Sodium_Core_Util::xorStrings(
             ParagonIE_Sodium_Core_Util::substr($block0, self::secretbox_xchacha20poly1305_ZEROBYTES),
             ParagonIE_Sodium_Core_Util::substr($c, 0, self::secretbox_xchacha20poly1305_ZEROBYTES)
@@ -1225,7 +1279,7 @@ abstract class ParagonIE_Sodium_Crypto
                     self::secretbox_xchacha20poly1305_ZEROBYTES
                 ),
                 ParagonIE_Sodium_Core_Util::substr($nonce, 16, 8),
-                (string) $subkey,
+                $subkey,
                 ParagonIE_Sodium_Core_Util::store64_le(1)
             );
         }
@@ -1238,8 +1292,10 @@ abstract class ParagonIE_Sodium_Crypto
      * @throws Exception
      * @throws SodiumException
      */
-    public static function secretstream_xchacha20poly1305_init_push($key)
-    {
+    public static function secretstream_xchacha20poly1305_init_push(
+        #[SensitiveParameter]
+        string $key
+    ): array {
         # randombytes_buf(out, crypto_secretstream_xchacha20poly1305_HEADERBYTES);
         $out = random_bytes(24);
 
@@ -1268,8 +1324,11 @@ abstract class ParagonIE_Sodium_Crypto
      * @return string Returns a state.
      * @throws Exception
      */
-    public static function secretstream_xchacha20poly1305_init_pull($key, $header)
-    {
+    public static function secretstream_xchacha20poly1305_init_pull(
+        #[SensitiveParameter]
+        string $key,
+        string $header
+    ): string {
         # crypto_core_hchacha20(state->k, in, k, NULL);
         $subkey = ParagonIE_Sodium_Core_HChaCha20::hChaCha20(
             ParagonIE_Sodium_Core_Util::substr($header, 0, 16),
@@ -1295,8 +1354,14 @@ abstract class ParagonIE_Sodium_Crypto
      * @return string
      * @throws SodiumException
      */
-    public static function secretstream_xchacha20poly1305_push(&$state, $msg, $aad = '', $tag = 0)
-    {
+    public static function secretstream_xchacha20poly1305_push(
+        #[SensitiveParameter]
+        string &$state,
+        #[SensitiveParameter]
+        string $msg,
+        string $aad = '',
+        int $tag = 0
+    ): string {
         $st = ParagonIE_Sodium_Core_SecretStream_State::fromString($state);
         # crypto_onetimeauth_poly1305_state poly1305_state;
         # unsigned char                     block[64U];
@@ -1424,8 +1489,12 @@ abstract class ParagonIE_Sodium_Crypto
      * @return bool|array{0: string, 1: int}
      * @throws SodiumException
      */
-    public static function secretstream_xchacha20poly1305_pull(&$state, $cipher, $aad = '')
-    {
+    public static function secretstream_xchacha20poly1305_pull(
+        #[SensitiveParameter]
+        string &$state,
+        string $cipher,
+        string $aad = ''
+    ): bool|array {
         $st = ParagonIE_Sodium_Core_SecretStream_State::fromString($state);
 
         $cipherlen = ParagonIE_Sodium_Core_Util::strlen($cipher);
@@ -1547,8 +1616,10 @@ abstract class ParagonIE_Sodium_Crypto
      * @return void
      * @throws SodiumException
      */
-    public static function secretstream_xchacha20poly1305_rekey(&$state)
-    {
+    public static function secretstream_xchacha20poly1305_rekey(
+        #[SensitiveParameter]
+        string &$state
+    ): void {
         $st = ParagonIE_Sodium_Core_SecretStream_State::fromString($state);
         # unsigned char new_key_and_inonce[crypto_stream_chacha20_ietf_KEYBYTES +
         # crypto_secretstream_xchacha20poly1305_INONCEBYTES];
@@ -1599,8 +1670,11 @@ abstract class ParagonIE_Sodium_Crypto
      * @throws SodiumException
      * @throws TypeError
      */
-    public static function sign_detached($message, $sk)
-    {
+    public static function sign_detached(
+        string $message,
+        #[SensitiveParameter]
+        string $sk
+    ): string {
         return ParagonIE_Sodium_Core_Ed25519::sign_detached($message, $sk);
     }
 
@@ -1615,8 +1689,11 @@ abstract class ParagonIE_Sodium_Crypto
      * @throws SodiumException
      * @throws TypeError
      */
-    public static function sign($message, $sk)
-    {
+    public static function sign(
+        string $message,
+        #[SensitiveParameter]
+        string $sk
+    ): string {
         return ParagonIE_Sodium_Core_Ed25519::sign($message, $sk);
     }
 
@@ -1631,8 +1708,11 @@ abstract class ParagonIE_Sodium_Crypto
      * @throws SodiumException
      * @throws TypeError
      */
-    public static function sign_open($signedMessage, $pk)
-    {
+    public static function sign_open(
+        string $signedMessage,
+        #[SensitiveParameter]
+        string $pk
+    ): string {
         return ParagonIE_Sodium_Core_Ed25519::sign_open($signedMessage, $pk);
     }
 
@@ -1648,8 +1728,11 @@ abstract class ParagonIE_Sodium_Crypto
      * @throws SodiumException
      * @throws TypeError
      */
-    public static function sign_verify_detached($signature, $message, $pk)
-    {
+    public static function sign_verify_detached(
+        string $signature,
+        string $message,
+        string $pk
+    ): bool {
         return ParagonIE_Sodium_Core_Ed25519::verify_detached($signature, $message, $pk);
     }
 }

diff --git a/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Crypto32.php b/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Crypto32.php
deleted file mode 100644 (file)
index 34c0d7a..0000000
--- a/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/Crypto32.php
+++ /dev/null
@@ -1,1654 +0,0 @@
-<?php
-
-if (class_exists('ParagonIE_Sodium_Crypto32', false)) {
-    return;
-}
-
-/**
- * Class ParagonIE_Sodium_Crypto
- *
- * ATTENTION!
- *
- * If you are using this library, you should be using
- * ParagonIE_Sodium_Compat in your code, not this class.
- */
-abstract class ParagonIE_Sodium_Crypto32
-{
-    const aead_chacha20poly1305_KEYBYTES = 32;
-    const aead_chacha20poly1305_NSECBYTES = 0;
-    const aead_chacha20poly1305_NPUBBYTES = 8;
-    const aead_chacha20poly1305_ABYTES = 16;
-
-    const aead_chacha20poly1305_IETF_KEYBYTES = 32;
-    const aead_chacha20poly1305_IETF_NSECBYTES = 0;
-    const aead_chacha20poly1305_IETF_NPUBBYTES = 12;
-    const aead_chacha20poly1305_IETF_ABYTES = 16;
-
-    const aead_xchacha20poly1305_IETF_KEYBYTES = 32;
-    const aead_xchacha20poly1305_IETF_NSECBYTES = 0;
-    const aead_xchacha20poly1305_IETF_NPUBBYTES = 24;
-    const aead_xchacha20poly1305_IETF_ABYTES = 16;
-
-    const box_curve25519xsalsa20poly1305_SEEDBYTES = 32;
-    const box_curve25519xsalsa20poly1305_PUBLICKEYBYTES = 32;
-    const box_curve25519xsalsa20poly1305_SECRETKEYBYTES = 32;
-    const box_curve25519xsalsa20poly1305_BEFORENMBYTES = 32;
-    const box_curve25519xsalsa20poly1305_NONCEBYTES = 24;
-    const box_curve25519xsalsa20poly1305_MACBYTES = 16;
-    const box_curve25519xsalsa20poly1305_BOXZEROBYTES = 16;
-    const box_curve25519xsalsa20poly1305_ZEROBYTES = 32;
-
-    const onetimeauth_poly1305_BYTES = 16;
-    const onetimeauth_poly1305_KEYBYTES = 32;
-
-    const secretbox_xsalsa20poly1305_KEYBYTES = 32;
-    const secretbox_xsalsa20poly1305_NONCEBYTES = 24;
-    const secretbox_xsalsa20poly1305_MACBYTES = 16;
-    const secretbox_xsalsa20poly1305_BOXZEROBYTES = 16;
-    const secretbox_xsalsa20poly1305_ZEROBYTES = 32;
-
-    const secretbox_xchacha20poly1305_KEYBYTES = 32;
-    const secretbox_xchacha20poly1305_NONCEBYTES = 24;
-    const secretbox_xchacha20poly1305_MACBYTES = 16;
-    const secretbox_xchacha20poly1305_BOXZEROBYTES = 16;
-    const secretbox_xchacha20poly1305_ZEROBYTES = 32;
-
-    const stream_salsa20_KEYBYTES = 32;
-
-    /**
-     * AEAD Decryption with ChaCha20-Poly1305
-     *
-     * @internal Do not use this directly. Use ParagonIE_Sodium_Compat.
-     *
-     * @param string $message
-     * @param string $ad
-     * @param string $nonce
-     * @param string $key
-     * @return string
-     * @throws SodiumException
-     * @throws TypeError
-     */
-    public static function aead_chacha20poly1305_decrypt(
-        $message = '',
-        $ad = '',
-        $nonce = '',
-        $key = ''
-    ) {
-        /** @var int $len - Length of message (ciphertext + MAC) */
-        $len = ParagonIE_Sodium_Core32_Util::strlen($message);
-
-        /** @var int  $clen - Length of ciphertext */
-        $clen = $len - self::aead_chacha20poly1305_ABYTES;
-
-        /** @var int $adlen - Length of associated data */
-        $adlen = ParagonIE_Sodium_Core32_Util::strlen($ad);
-
-        /** @var string $mac - Message authentication code */
-        $mac = ParagonIE_Sodium_Core32_Util::substr(
-            $message,
-            $clen,
-            self::aead_chacha20poly1305_ABYTES
-        );
-
-        /** @var string $ciphertext - The encrypted message (sans MAC) */
-        $ciphertext = ParagonIE_Sodium_Core32_Util::substr($message, 0, $clen);
-
-        /** @var string The first block of the chacha20 keystream, used as a poly1305 key */
-        $block0 = ParagonIE_Sodium_Core32_ChaCha20::stream(
-            32,
-            $nonce,
-            $key
-        );
-
-        /* Recalculate the Poly1305 authentication tag (MAC): */
-        $state = new ParagonIE_Sodium_Core32_Poly1305_State($block0);
-        try {
-            ParagonIE_Sodium_Compat::memzero($block0);
-        } catch (SodiumException $ex) {
-            $block0 = null;
-        }
-        $state->update($ad);
-        $state->update(ParagonIE_Sodium_Core32_Util::store64_le($adlen));
-        $state->update($ciphertext);
-        $state->update(ParagonIE_Sodium_Core32_Util::store64_le($clen));
-        $computed_mac = $state->finish();
-
-        /* Compare the given MAC with the recalculated MAC: */
-        if (!ParagonIE_Sodium_Core32_Util::verify_16($computed_mac, $mac)) {
-            throw new SodiumException('Invalid MAC');
-        }
-
-        // Here, we know that the MAC is valid, so we decrypt and return the plaintext
-        return ParagonIE_Sodium_Core32_ChaCha20::streamXorIc(
-            $ciphertext,
-            $nonce,
-            $key,
-            ParagonIE_Sodium_Core32_Util::store64_le(1)
-        );
-    }
-
-    /**
-     * AEAD Encryption with ChaCha20-Poly1305
-     *
-     * @internal Do not use this directly. Use ParagonIE_Sodium_Compat.
-     *
-     * @param string $message
-     * @param string $ad
-     * @param string $nonce
-     * @param string $key
-     * @return string
-     * @throws SodiumException
-     * @throws TypeError
-     */
-    public static function aead_chacha20poly1305_encrypt(
-        $message = '',
-        $ad = '',
-        $nonce = '',
-        $key = ''
-    ) {
-        /** @var int $len - Length of the plaintext message */
-        $len = ParagonIE_Sodium_Core32_Util::strlen($message);
-
-        /** @var int $adlen - Length of the associated data */
-        $adlen = ParagonIE_Sodium_Core32_Util::strlen($ad);
-
-        /** @var string The first block of the chacha20 keystream, used as a poly1305 key */
-        $block0 = ParagonIE_Sodium_Core32_ChaCha20::stream(
-            32,
-            $nonce,
-            $key
-        );
-        $state = new ParagonIE_Sodium_Core32_Poly1305_State($block0);
-        try {
-            ParagonIE_Sodium_Compat::memzero($block0);
-        } catch (SodiumException $ex) {
-            $block0 = null;
-        }
-
-        /** @var string $ciphertext - Raw encrypted data */
-        $ciphertext = ParagonIE_Sodium_Core32_ChaCha20::streamXorIc(
-            $message,
-            $nonce,
-            $key,
-            ParagonIE_Sodium_Core32_Util::store64_le(1)
-        );
-
-        $state->update($ad);
-        $state->update(ParagonIE_Sodium_Core32_Util::store64_le($adlen));
-        $state->update($ciphertext);
-        $state->update(ParagonIE_Sodium_Core32_Util::store64_le($len));
-        return $ciphertext . $state->finish();
-    }
-
-    /**
-     * AEAD Decryption with ChaCha20-Poly1305, IETF mode (96-bit nonce)
-     *
-     * @internal Do not use this directly. Use ParagonIE_Sodium_Compat.
-     *
-     * @param string $message
-     * @param string $ad
-     * @param string $nonce
-     * @param string $key
-     * @return string
-     * @throws SodiumException
-     * @throws TypeError
-     */
-    public static function aead_chacha20poly1305_ietf_decrypt(
-        $message = '',
-        $ad = '',
-        $nonce = '',
-        $key = ''
-    ) {
-        /** @var int $adlen - Length of associated data */
-        $adlen = ParagonIE_Sodium_Core32_Util::strlen($ad);
-
-        /** @var int $len - Length of message (ciphertext + MAC) */
-        $len = ParagonIE_Sodium_Core32_Util::strlen($message);
-
-        /** @var int  $clen - Length of ciphertext */
-        $clen = $len - self::aead_chacha20poly1305_IETF_ABYTES;
-
-        /** @var string The first block of the chacha20 keystream, used as a poly1305 key */
-        $block0 = ParagonIE_Sodium_Core32_ChaCha20::ietfStream(
-            32,
-            $nonce,
-            $key
-        );
-
-        /** @var string $mac - Message authentication code */
-        $mac = ParagonIE_Sodium_Core32_Util::substr(
-            $message,
-            $len - self::aead_chacha20poly1305_IETF_ABYTES,
-            self::aead_chacha20poly1305_IETF_ABYTES
-        );
-
-        /** @var string $ciphertext - The encrypted message (sans MAC) */
-        $ciphertext = ParagonIE_Sodium_Core32_Util::substr(
-            $message,
-            0,
-            $len - self::aead_chacha20poly1305_IETF_ABYTES
-        );
-
-        /* Recalculate the Poly1305 authentication tag (MAC): */
-        $state = new ParagonIE_Sodium_Core32_Poly1305_State($block0);
-        try {
-            ParagonIE_Sodium_Compat::memzero($block0);
-        } catch (SodiumException $ex) {
-            $block0 = null;
-        }
-        $state->update($ad);
-        $state->update(str_repeat("\x00", ((0x10 - $adlen) & 0xf)));
-        $state->update($ciphertext);
-        $state->update(str_repeat("\x00", (0x10 - $clen) & 0xf));
-        $state->update(ParagonIE_Sodium_Core32_Util::store64_le($adlen));
-        $state->update(ParagonIE_Sodium_Core32_Util::store64_le($clen));
-        $computed_mac = $state->finish();
-
-        /* Compare the given MAC with the recalculated MAC: */
-        if (!ParagonIE_Sodium_Core32_Util::verify_16($computed_mac, $mac)) {
-            throw new SodiumException('Invalid MAC');
-        }
-
-        // Here, we know that the MAC is valid, so we decrypt and return the plaintext
-        return ParagonIE_Sodium_Core32_ChaCha20::ietfStreamXorIc(
-            $ciphertext,
-            $nonce,
-            $key,
-            ParagonIE_Sodium_Core32_Util::store64_le(1)
-        );
-    }
-
-    /**
-     * AEAD Encryption with ChaCha20-Poly1305, IETF mode (96-bit nonce)
-     *
-     * @internal Do not use this directly. Use ParagonIE_Sodium_Compat.
-     *
-     * @param string $message
-     * @param string $ad
-     * @param string $nonce
-     * @param string $key
-     * @return string
-     * @throws SodiumException
-     * @throws TypeError
-     */
-    public static function aead_chacha20poly1305_ietf_encrypt(
-        $message = '',
-        $ad = '',
-        $nonce = '',
-        $key = ''
-    ) {
-        /** @var int $len - Length of the plaintext message */
-        $len = ParagonIE_Sodium_Core32_Util::strlen($message);
-
-        /** @var int $adlen - Length of the associated data */
-        $adlen = ParagonIE_Sodium_Core32_Util::strlen($ad);
-
-        /** @var string The first block of the chacha20 keystream, used as a poly1305 key */
-        $block0 = ParagonIE_Sodium_Core32_ChaCha20::ietfStream(
-            32,
-            $nonce,
-            $key
-        );
-        $state = new ParagonIE_Sodium_Core32_Poly1305_State($block0);
-        try {
-            ParagonIE_Sodium_Compat::memzero($block0);
-        } catch (SodiumException $ex) {
-            $block0 = null;
-        }
-
-        /** @var string $ciphertext - Raw encrypted data */
-        $ciphertext = ParagonIE_Sodium_Core32_ChaCha20::ietfStreamXorIc(
-            $message,
-            $nonce,
-            $key,
-            ParagonIE_Sodium_Core32_Util::store64_le(1)
-        );
-
-        $state->update($ad);
-        $state->update(str_repeat("\x00", ((0x10 - $adlen) & 0xf)));
-        $state->update($ciphertext);
-        $state->update(str_repeat("\x00", ((0x10 - $len) & 0xf)));
-        $state->update(ParagonIE_Sodium_Core32_Util::store64_le($adlen));
-        $state->update(ParagonIE_Sodium_Core32_Util::store64_le($len));
-        return $ciphertext . $state->finish();
-    }
-
-    /**
-     * AEAD Decryption with ChaCha20-Poly1305, IETF mode (96-bit nonce)
-     *
-     * @internal Do not use this directly. Use ParagonIE_Sodium_Compat.
-     *
-     * @param string $message
-     * @param string $ad
-     * @param string $nonce
-     * @param string $key
-     * @return string
-     * @throws SodiumException
-     * @throws TypeError
-     */
-    public static function aead_xchacha20poly1305_ietf_decrypt(
-        $message = '',
-        $ad = '',
-        $nonce = '',
-        $key = ''
-    ) {
-        $subkey = ParagonIE_Sodium_Core32_HChaCha20::hChaCha20(
-            ParagonIE_Sodium_Core32_Util::substr($nonce, 0, 16),
-            $key
-        );
-        $nonceLast = "\x00\x00\x00\x00" .
-            ParagonIE_Sodium_Core32_Util::substr($nonce, 16, 8);
-
-        return self::aead_chacha20poly1305_ietf_decrypt($message, $ad, $nonceLast, $subkey);
-    }
-
-    /**
-     * AEAD Encryption with ChaCha20-Poly1305, IETF mode (96-bit nonce)
-     *
-     * @internal Do not use this directly. Use ParagonIE_Sodium_Compat.
-     *
-     * @param string $message
-     * @param string $ad
-     * @param string $nonce
-     * @param string $key
-     * @return string
-     * @throws SodiumException
-     * @throws TypeError
-     */
-    public static function aead_xchacha20poly1305_ietf_encrypt(
-        $message = '',
-        $ad = '',
-        $nonce = '',
-        $key = ''
-    ) {
-        $subkey = ParagonIE_Sodium_Core32_HChaCha20::hChaCha20(
-            ParagonIE_Sodium_Core32_Util::substr($nonce, 0, 16),
-            $key
-        );
-        $nonceLast = "\x00\x00\x00\x00" .
-            ParagonIE_Sodium_Core32_Util::substr($nonce, 16, 8);
-
-        return self::aead_chacha20poly1305_ietf_encrypt($message, $ad, $nonceLast, $subkey);
-    }
-
-    /**
-     * HMAC-SHA-512-256 (a.k.a. the leftmost 256 bits of HMAC-SHA-512)
-     *
-     * @internal Do not use this directly. Use ParagonIE_Sodium_Compat.
-     *
-     * @param string $message
-     * @param string $key
-     * @return string
-     * @throws TypeError
-     */
-    public static function auth($message, $key)
-    {
-        return ParagonIE_Sodium_Core32_Util::substr(
-            hash_hmac('sha512', $message, $key, true),
-            0,
-            32
-        );
-    }
-
-    /**
-     * HMAC-SHA-512-256 validation. Constant-time via hash_equals().
-     *
-     * @internal Do not use this directly. Use ParagonIE_Sodium_Compat.
-     *
-     * @param string $mac
-     * @param string $message
-     * @param string $key
-     * @return bool
-     * @throws SodiumException
-     * @throws TypeError
-     */
-    public static function auth_verify($mac, $message, $key)
-    {
-        return ParagonIE_Sodium_Core32_Util::hashEquals(
-            $mac,
-            self::auth($message, $key)
-        );
-    }
-
-    /**
-     * X25519 key exchange followed by XSalsa20Poly1305 symmetric encryption
-     *
-     * @internal Do not use this directly. Use ParagonIE_Sodium_Compat.
-     *
-     * @param string $plaintext
-     * @param string $nonce
-     * @param string $keypair
-     * @return string
-     * @throws SodiumException
-     * @throws TypeError
-     */
-    public static function box($plaintext, $nonce, $keypair)
-    {
-        return self::secretbox(
-            $plaintext,
-            $nonce,
-            self::box_beforenm(
-                self::box_secretkey($keypair),
-                self::box_publickey($keypair)
-            )
-        );
-    }
-
-    /**
-     * X25519-XSalsa20-Poly1305 with one ephemeral X25519 keypair.
-     *
-     * @internal Do not use this directly. Use ParagonIE_Sodium_Compat.
-     *
-     * @param string $message
-     * @param string $publicKey
-     * @return string
-     * @throws SodiumException
-     * @throws TypeError
-     */
-    public static function box_seal($message, $publicKey)
-    {
-        /** @var string $ephemeralKeypair */
-        $ephemeralKeypair = self::box_keypair();
-
-        /** @var string $ephemeralSK */
-        $ephemeralSK = self::box_secretkey($ephemeralKeypair);
-
-        /** @var string $ephemeralPK */
-        $ephemeralPK = self::box_publickey($ephemeralKeypair);
-
-        /** @var string $nonce */
-        $nonce = self::generichash(
-            $ephemeralPK . $publicKey,
-            '',
-            24
-        );
-
-        /** @var string $keypair - The combined keypair used in crypto_box() */
-        $keypair = self::box_keypair_from_secretkey_and_publickey($ephemeralSK, $publicKey);
-
-        /** @var string $ciphertext Ciphertext + MAC from crypto_box */
-        $ciphertext = self::box($message, $nonce, $keypair);
-        try {
-            ParagonIE_Sodium_Compat::memzero($ephemeralKeypair);
-            ParagonIE_Sodium_Compat::memzero($ephemeralSK);
-            ParagonIE_Sodium_Compat::memzero($nonce);
-        } catch (SodiumException $ex) {
-            $ephemeralKeypair = null;
-            $ephemeralSK = null;
-            $nonce = null;
-        }
-        return $ephemeralPK . $ciphertext;
-    }
-
-    /**
-     * Opens a message encrypted via box_seal().
-     *
-     * @internal Do not use this directly. Use ParagonIE_Sodium_Compat.
-     *
-     * @param string $message
-     * @param string $keypair
-     * @return string
-     * @throws SodiumException
-     * @throws TypeError
-     */
-    public static function box_seal_open($message, $keypair)
-    {
-        /** @var string $ephemeralPK */
-        $ephemeralPK = ParagonIE_Sodium_Core32_Util::substr($message, 0, 32);
-
-        /** @var string $ciphertext (ciphertext + MAC) */
-        $ciphertext = ParagonIE_Sodium_Core32_Util::substr($message, 32);
-
-        /** @var string $secretKey */
-        $secretKey = self::box_secretkey($keypair);
-
-        /** @var string $publicKey */
-        $publicKey = self::box_publickey($keypair);
-
-        /** @var string $nonce */
-        $nonce = self::generichash(
-            $ephemeralPK . $publicKey,
-            '',
-            24
-        );
-
-        /** @var string $keypair */
-        $keypair = self::box_keypair_from_secretkey_and_publickey($secretKey, $ephemeralPK);
-
-        /** @var string $m */
-        $m = self::box_open($ciphertext, $nonce, $keypair);
-        try {
-            ParagonIE_Sodium_Compat::memzero($secretKey);
-            ParagonIE_Sodium_Compat::memzero($ephemeralPK);
-            ParagonIE_Sodium_Compat::memzero($nonce);
-        } catch (SodiumException $ex) {
-            $secretKey = null;
-            $ephemeralPK = null;
-            $nonce = null;
-        }
-        return $m;
-    }
-
-    /**
-     * Used by crypto_box() to get the crypto_secretbox() key.
-     *
-     * @internal Do not use this directly. Use ParagonIE_Sodium_Compat.
-     *
-     * @param string $sk
-     * @param string $pk
-     * @return string
-     * @throws SodiumException
-     * @throws TypeError
-     */
-    public static function box_beforenm($sk, $pk)
-    {
-        return ParagonIE_Sodium_Core32_HSalsa20::hsalsa20(
-            str_repeat("\x00", 16),
-            self::scalarmult($sk, $pk)
-        );
-    }
-
-    /**
-     * @internal Do not use this directly. Use ParagonIE_Sodium_Compat.
-     *
-     * @return string
-     * @throws Exception
-     * @throws SodiumException
-     * @throws TypeError
-     */
-    public static function box_keypair()
-    {
-        $sKey = random_bytes(32);
-        $pKey = self::scalarmult_base($sKey);
-        return $sKey . $pKey;
-    }
-
-    /**
-     * @param string $seed
-     * @return string
-     * @throws SodiumException
-     * @throws TypeError
-     */
-    public static function box_seed_keypair($seed)
-    {
-        $sKey = ParagonIE_Sodium_Core32_Util::substr(
-            hash('sha512', $seed, true),
-            0,
-            32
-        );
-        $pKey = self::scalarmult_base($sKey);
-        return $sKey . $pKey;
-    }
-
-    /**
-     * @internal Do not use this directly. Use ParagonIE_Sodium_Compat.
-     *
-     * @param string $sKey
-     * @param string $pKey
-     * @return string
-     * @throws TypeError
-     */
-    public static function box_keypair_from_secretkey_and_publickey($sKey, $pKey)
-    {
-        return ParagonIE_Sodium_Core32_Util::substr($sKey, 0, 32) .
-            ParagonIE_Sodium_Core32_Util::substr($pKey, 0, 32);
-    }
-
-    /**
-     * @internal Do not use this directly. Use ParagonIE_Sodium_Compat.
-     *
-     * @param string $keypair
-     * @return string
-     * @throws RangeException
-     * @throws TypeError
-     */
-    public static function box_secretkey($keypair)
-    {
-        if (ParagonIE_Sodium_Core32_Util::strlen($keypair) !== 64) {
-            throw new RangeException(
-                'Must be ParagonIE_Sodium_Compat::CRYPTO_BOX_KEYPAIRBYTES bytes long.'
-            );
-        }
-        return ParagonIE_Sodium_Core32_Util::substr($keypair, 0, 32);
-    }
-
-    /**
-     * @internal Do not use this directly. Use ParagonIE_Sodium_Compat.
-     *
-     * @param string $keypair
-     * @return string
-     * @throws RangeException
-     * @throws TypeError
-     */
-    public static function box_publickey($keypair)
-    {
-        if (ParagonIE_Sodium_Core32_Util::strlen($keypair) !== ParagonIE_Sodium_Compat::CRYPTO_BOX_KEYPAIRBYTES) {
-            throw new RangeException(
-                'Must be ParagonIE_Sodium_Compat::CRYPTO_BOX_KEYPAIRBYTES bytes long.'
-            );
-        }
-        return ParagonIE_Sodium_Core32_Util::substr($keypair, 32, 32);
-    }
-
-    /**
-     * @internal Do not use this directly. Use ParagonIE_Sodium_Compat.
-     *
-     * @param string $sKey
-     * @return string
-     * @throws RangeException
-     * @throws SodiumException
-     * @throws TypeError
-     */
-    public static function box_publickey_from_secretkey($sKey)
-    {
-        if (ParagonIE_Sodium_Core32_Util::strlen($sKey) !== ParagonIE_Sodium_Compat::CRYPTO_BOX_SECRETKEYBYTES) {
-            throw new RangeException(
-                'Must be ParagonIE_Sodium_Compat::CRYPTO_BOX_SECRETKEYBYTES bytes long.'
-            );
-        }
-        return self::scalarmult_base($sKey);
-    }
-
-    /**
-     * Decrypt a message encrypted with box().
-     *
-     * @internal Do not use this directly. Use ParagonIE_Sodium_Compat.
-     *
-     * @param string $ciphertext
-     * @param string $nonce
-     * @param string $keypair
-     * @return string
-     * @throws SodiumException
-     * @throws TypeError
-     */
-    public static function box_open($ciphertext, $nonce, $keypair)
-    {
-        return self::secretbox_open(
-            $ciphertext,
-            $nonce,
-            self::box_beforenm(
-                self::box_secretkey($keypair),
-                self::box_publickey($keypair)
-            )
-        );
-    }
-
-    /**
-     * Calculate a BLAKE2b hash.
-     *
-     * @internal Do not use this directly. Use ParagonIE_Sodium_Compat.
-     *
-     * @param string $message
-     * @param string|null $key
-     * @param int $outlen
-     * @return string
-     * @throws RangeException
-     * @throws SodiumException
-     * @throws TypeError
-     */
-    public static function generichash($message, $key = '', $outlen = 32)
-    {
-        // This ensures that ParagonIE_Sodium_Core32_BLAKE2b::$iv is initialized
-        ParagonIE_Sodium_Core32_BLAKE2b::pseudoConstructor();
-
-        $k = null;
-        if (!empty($key)) {
-            /** @var SplFixedArray $k */
-            $k = ParagonIE_Sodium_Core32_BLAKE2b::stringToSplFixedArray($key);
-            if ($k->count() > ParagonIE_Sodium_Core32_BLAKE2b::KEYBYTES) {
-                throw new RangeException('Invalid key size');
-            }
-        }
-
-        /** @var SplFixedArray $in */
-        $in = ParagonIE_Sodium_Core32_BLAKE2b::stringToSplFixedArray($message);
-
-        /** @var SplFixedArray $ctx */
-        $ctx = ParagonIE_Sodium_Core32_BLAKE2b::init($k, $outlen);
-        ParagonIE_Sodium_Core32_BLAKE2b::update($ctx, $in, $in->count());
-
-        /** @var SplFixedArray $out */
-        $out = new SplFixedArray($outlen);
-        $out = ParagonIE_Sodium_Core32_BLAKE2b::finish($ctx, $out);
-
-        /** @var array<int, int> */
-        $outArray = $out->toArray();
-        return ParagonIE_Sodium_Core32_Util::intArrayToString($outArray);
-    }
-
-    /**
-     * Finalize a BLAKE2b hashing context, returning the hash.
-     *
-     * @internal Do not use this directly. Use ParagonIE_Sodium_Compat.
-     *
-     * @param string $ctx
-     * @param int $outlen
-     * @return string
-     * @throws SodiumException
-     * @throws TypeError
-     */
-    public static function generichash_final($ctx, $outlen = 32)
-    {
-        if (!is_string($ctx)) {
-            throw new TypeError('Context must be a string');
-        }
-        $out = new SplFixedArray($outlen);
-
-        /** @var SplFixedArray $context */
-        $context = ParagonIE_Sodium_Core32_BLAKE2b::stringToContext($ctx);
-
-        /** @var SplFixedArray $out */
-        $out = ParagonIE_Sodium_Core32_BLAKE2b::finish($context, $out);
-
-        /** @var array<int, int> */
-        $outArray = $out->toArray();
-        return ParagonIE_Sodium_Core32_Util::intArrayToString($outArray);
-    }
-
-    /**
-     * Initialize a hashing context for BLAKE2b.
-     *
-     * @internal Do not use this directly. Use ParagonIE_Sodium_Compat.
-     *
-     * @param string $key
-     * @param int $outputLength
-     * @return string
-     * @throws RangeException
-     * @throws SodiumException
-     * @throws TypeError
-     */
-    public static function generichash_init($key = '', $outputLength = 32)
-    {
-        // This ensures that ParagonIE_Sodium_Core32_BLAKE2b::$iv is initialized
-        ParagonIE_Sodium_Core32_BLAKE2b::pseudoConstructor();
-
-        $k = null;
-        if (!empty($key)) {
-            $k = ParagonIE_Sodium_Core32_BLAKE2b::stringToSplFixedArray($key);
-            if ($k->count() > ParagonIE_Sodium_Core32_BLAKE2b::KEYBYTES) {
-                throw new RangeException('Invalid key size');
-            }
-        }
-
-        /** @var SplFixedArray $ctx */
-        $ctx = ParagonIE_Sodium_Core32_BLAKE2b::init($k, $outputLength);
-
-        return ParagonIE_Sodium_Core32_BLAKE2b::contextToString($ctx);
-    }
-
-    /**
-     * Initialize a hashing context for BLAKE2b.
-     *
-     * @internal Do not use this directly. Use ParagonIE_Sodium_Compat.
-     *
-     * @param string $key
-     * @param int $outputLength
-     * @param string $salt
-     * @param string $personal
-     * @return string
-     * @throws RangeException
-     * @throws SodiumException
-     * @throws TypeError
-     */
-    public static function generichash_init_salt_personal(
-        $key = '',
-        $outputLength = 32,
-        $salt = '',
-        $personal = ''
-    ) {
-        // This ensures that ParagonIE_Sodium_Core32_BLAKE2b::$iv is initialized
-        ParagonIE_Sodium_Core32_BLAKE2b::pseudoConstructor();
-
-        $k = null;
-        if (!empty($key)) {
-            $k = ParagonIE_Sodium_Core32_BLAKE2b::stringToSplFixedArray($key);
-            if ($k->count() > ParagonIE_Sodium_Core32_BLAKE2b::KEYBYTES) {
-                throw new RangeException('Invalid key size');
-            }
-        }
-        if (!empty($salt)) {
-            $s = ParagonIE_Sodium_Core32_BLAKE2b::stringToSplFixedArray($salt);
-        } else {
-            $s = null;
-        }
-        if (!empty($salt)) {
-            $p = ParagonIE_Sodium_Core32_BLAKE2b::stringToSplFixedArray($personal);
-        } else {
-            $p = null;
-        }
-
-        /** @var SplFixedArray $ctx */
-        $ctx = ParagonIE_Sodium_Core32_BLAKE2b::init($k, $outputLength, $s, $p);
-
-        return ParagonIE_Sodium_Core32_BLAKE2b::contextToString($ctx);
-    }
-
-    /**
-     * Update a hashing context for BLAKE2b with $message
-     *
-     * @internal Do not use this directly. Use ParagonIE_Sodium_Compat.
-     *
-     * @param string $ctx
-     * @param string $message
-     * @return string
-     * @throws SodiumException
-     * @throws TypeError
-     */
-    public static function generichash_update($ctx, $message)
-    {
-        // This ensures that ParagonIE_Sodium_Core32_BLAKE2b::$iv is initialized
-        ParagonIE_Sodium_Core32_BLAKE2b::pseudoConstructor();
-
-        /** @var SplFixedArray $context */
-        $context = ParagonIE_Sodium_Core32_BLAKE2b::stringToContext($ctx);
-
-        /** @var SplFixedArray $in */
-        $in = ParagonIE_Sodium_Core32_BLAKE2b::stringToSplFixedArray($message);
-
-        ParagonIE_Sodium_Core32_BLAKE2b::update($context, $in, $in->count());
-
-        return ParagonIE_Sodium_Core32_BLAKE2b::contextToString($context);
-    }
-
-    /**
-     * Libsodium's crypto_kx().
-     *
-     * @internal Do not use this directly. Use ParagonIE_Sodium_Compat.
-     *
-     * @param string $my_sk
-     * @param string $their_pk
-     * @param string $client_pk
-     * @param string $server_pk
-     * @return string
-     * @throws SodiumException
-     * @throws TypeError
-     */
-    public static function keyExchange($my_sk, $their_pk, $client_pk, $server_pk)
-    {
-        return self::generichash(
-            self::scalarmult($my_sk, $their_pk) .
-            $client_pk .
-            $server_pk
-        );
-    }
-
-    /**
-     * ECDH over Curve25519
-     *
-     * @internal Do not use this directly. Use ParagonIE_Sodium_Compat.
-     *
-     * @param string $sKey
-     * @param string $pKey
-     * @return string
-     *
-     * @throws SodiumException
-     * @throws TypeError
-     */
-    public static function scalarmult($sKey, $pKey)
-    {
-        $q = ParagonIE_Sodium_Core32_X25519::crypto_scalarmult_curve25519_ref10($sKey, $pKey);
-        self::scalarmult_throw_if_zero($q);
-        return $q;
-    }
-
-    /**
-     * ECDH over Curve25519, using the basepoint.
-     * Used to get a secret key from a public key.
-     *
-     * @param string $secret
-     * @return string
-     *
-     * @throws SodiumException
-     * @throws TypeError
-     */
-    public static function scalarmult_base($secret)
-    {
-        $q = ParagonIE_Sodium_Core32_X25519::crypto_scalarmult_curve25519_ref10_base($secret);
-        self::scalarmult_throw_if_zero($q);
-        return $q;
-    }
-
-    /**
-     * This throws an Error if a zero public key was passed to the function.
-     *
-     * @param string $q
-     * @return void
-     * @throws SodiumException
-     * @throws TypeError
-     */
-    protected static function scalarmult_throw_if_zero($q)
-    {
-        $d = 0;
-        for ($i = 0; $i < self::box_curve25519xsalsa20poly1305_SECRETKEYBYTES; ++$i) {
-            $d |= ParagonIE_Sodium_Core32_Util::chrToInt($q[$i]);
-        }
-
-        /* branch-free variant of === 0 */
-        if (-(1 & (($d - 1) >> 8))) {
-            throw new SodiumException('Zero public key is not allowed');
-        }
-    }
-
-    /**
-     * XSalsa20-Poly1305 authenticated symmetric-key encryption.
-     *
-     * @internal Do not use this directly. Use ParagonIE_Sodium_Compat.
-     *
-     * @param string $plaintext
-     * @param string $nonce
-     * @param string $key
-     * @return string
-     * @throws SodiumException
-     * @throws TypeError
-     */
-    public static function secretbox($plaintext, $nonce, $key)
-    {
-        /** @var string $subkey */
-        $subkey = ParagonIE_Sodium_Core32_HSalsa20::hsalsa20($nonce, $key);
-
-        /** @var string $block0 */
-        $block0 = str_repeat("\x00", 32);
-
-        /** @var int $mlen - Length of the plaintext message */
-        $mlen = ParagonIE_Sodium_Core32_Util::strlen($plaintext);
-        $mlen0 = $mlen;
-        if ($mlen0 > 64 - self::secretbox_xsalsa20poly1305_ZEROBYTES) {
-            $mlen0 = 64 - self::secretbox_xsalsa20poly1305_ZEROBYTES;
-        }
-        $block0 .= ParagonIE_Sodium_Core32_Util::substr($plaintext, 0, $mlen0);
-
-        /** @var string $block0 */
-        $block0 = ParagonIE_Sodium_Core32_Salsa20::salsa20_xor(
-            $block0,
-            ParagonIE_Sodium_Core32_Util::substr($nonce, 16, 8),
-            $subkey
-        );
-
-        /** @var string $c */
-        $c = ParagonIE_Sodium_Core32_Util::substr(
-            $block0,
-            self::secretbox_xsalsa20poly1305_ZEROBYTES
-        );
-        if ($mlen > $mlen0) {
-            $c .= ParagonIE_Sodium_Core32_Salsa20::salsa20_xor_ic(
-                ParagonIE_Sodium_Core32_Util::substr(
-                    $plaintext,
-                    self::secretbox_xsalsa20poly1305_ZEROBYTES
-                ),
-                ParagonIE_Sodium_Core32_Util::substr($nonce, 16, 8),
-                1,
-                $subkey
-            );
-        }
-        $state = new ParagonIE_Sodium_Core32_Poly1305_State(
-            ParagonIE_Sodium_Core32_Util::substr(
-                $block0,
-                0,
-                self::onetimeauth_poly1305_KEYBYTES
-            )
-        );
-        try {
-            ParagonIE_Sodium_Compat::memzero($block0);
-            ParagonIE_Sodium_Compat::memzero($subkey);
-        } catch (SodiumException $ex) {
-            $block0 = null;
-            $subkey = null;
-        }
-
-        $state->update($c);
-
-        /** @var string $c - MAC || ciphertext */
-        $c = $state->finish() . $c;
-        unset($state);
-
-        return $c;
-    }
-
-    /**
-     * Decrypt a ciphertext generated via secretbox().
-     *
-     * @internal Do not use this directly. Use ParagonIE_Sodium_Compat.
-     *
-     * @param string $ciphertext
-     * @param string $nonce
-     * @param string $key
-     * @return string
-     * @throws SodiumException
-     * @throws TypeError
-     */
-    public static function secretbox_open($ciphertext, $nonce, $key)
-    {
-        /** @var string $mac */
-        $mac = ParagonIE_Sodium_Core32_Util::substr(
-            $ciphertext,
-            0,
-            self::secretbox_xsalsa20poly1305_MACBYTES
-        );
-
-        /** @var string $c */
-        $c = ParagonIE_Sodium_Core32_Util::substr(
-            $ciphertext,
-            self::secretbox_xsalsa20poly1305_MACBYTES
-        );
-
-        /** @var int $clen */
-        $clen = ParagonIE_Sodium_Core32_Util::strlen($c);
-
-        /** @var string $subkey */
-        $subkey = ParagonIE_Sodium_Core32_HSalsa20::hsalsa20($nonce, $key);
-
-        /** @var string $block0 */
-        $block0 = ParagonIE_Sodium_Core32_Salsa20::salsa20(
-            64,
-            ParagonIE_Sodium_Core32_Util::substr($nonce, 16, 8),
-            $subkey
-        );
-        $verified = ParagonIE_Sodium_Core32_Poly1305::onetimeauth_verify(
-            $mac,
-            $c,
-            ParagonIE_Sodium_Core32_Util::substr($block0, 0, 32)
-        );
-        if (!$verified) {
-            try {
-                ParagonIE_Sodium_Compat::memzero($subkey);
-            } catch (SodiumException $ex) {
-                $subkey = null;
-            }
-            throw new SodiumException('Invalid MAC');
-        }
-
-        /** @var string $m - Decrypted message */
-        $m = ParagonIE_Sodium_Core32_Util::xorStrings(
-            ParagonIE_Sodium_Core32_Util::substr($block0, self::secretbox_xsalsa20poly1305_ZEROBYTES),
-            ParagonIE_Sodium_Core32_Util::substr($c, 0, self::secretbox_xsalsa20poly1305_ZEROBYTES)
-        );
-        if ($clen > self::secretbox_xsalsa20poly1305_ZEROBYTES) {
-            // We had more than 1 block, so let's continue to decrypt the rest.
-            $m .= ParagonIE_Sodium_Core32_Salsa20::salsa20_xor_ic(
-                ParagonIE_Sodium_Core32_Util::substr(
-                    $c,
-                    self::secretbox_xsalsa20poly1305_ZEROBYTES
-                ),
-                ParagonIE_Sodium_Core32_Util::substr($nonce, 16, 8),
-                1,
-                (string) $subkey
-            );
-        }
-        return $m;
-    }
-
-    /**
-     * XChaCha20-Poly1305 authenticated symmetric-key encryption.
-     *
-     * @internal Do not use this directly. Use ParagonIE_Sodium_Compat.
-     *
-     * @param string $plaintext
-     * @param string $nonce
-     * @param string $key
-     * @return string
-     * @throws SodiumException
-     * @throws TypeError
-     */
-    public static function secretbox_xchacha20poly1305($plaintext, $nonce, $key)
-    {
-        /** @var string $subkey */
-        $subkey = ParagonIE_Sodium_Core32_HChaCha20::hChaCha20(
-            ParagonIE_Sodium_Core32_Util::substr($nonce, 0, 16),
-            $key
-        );
-        $nonceLast = ParagonIE_Sodium_Core32_Util::substr($nonce, 16, 8);
-
-        /** @var string $block0 */
-        $block0 = str_repeat("\x00", 32);
-
-        /** @var int $mlen - Length of the plaintext message */
-        $mlen = ParagonIE_Sodium_Core32_Util::strlen($plaintext);
-        $mlen0 = $mlen;
-        if ($mlen0 > 64 - self::secretbox_xchacha20poly1305_ZEROBYTES) {
-            $mlen0 = 64 - self::secretbox_xchacha20poly1305_ZEROBYTES;
-        }
-        $block0 .= ParagonIE_Sodium_Core32_Util::substr($plaintext, 0, $mlen0);
-
-        /** @var string $block0 */
-        $block0 = ParagonIE_Sodium_Core32_ChaCha20::streamXorIc(
-            $block0,
-            $nonceLast,
-            $subkey
-        );
-
-        /** @var string $c */
-        $c = ParagonIE_Sodium_Core32_Util::substr(
-            $block0,
-            self::secretbox_xchacha20poly1305_ZEROBYTES
-        );
-        if ($mlen > $mlen0) {
-            $c .= ParagonIE_Sodium_Core32_ChaCha20::streamXorIc(
-                ParagonIE_Sodium_Core32_Util::substr(
-                    $plaintext,
-                    self::secretbox_xchacha20poly1305_ZEROBYTES
-                ),
-                $nonceLast,
-                $subkey,
-                ParagonIE_Sodium_Core32_Util::store64_le(1)
-            );
-        }
-        $state = new ParagonIE_Sodium_Core32_Poly1305_State(
-            ParagonIE_Sodium_Core32_Util::substr(
-                $block0,
-                0,
-                self::onetimeauth_poly1305_KEYBYTES
-            )
-        );
-        try {
-            ParagonIE_Sodium_Compat::memzero($block0);
-            ParagonIE_Sodium_Compat::memzero($subkey);
-        } catch (SodiumException $ex) {
-            $block0 = null;
-            $subkey = null;
-        }
-
-        $state->update($c);
-
-        /** @var string $c - MAC || ciphertext */
-        $c = $state->finish() . $c;
-        unset($state);
-
-        return $c;
-    }
-
-    /**
-     * Decrypt a ciphertext generated via secretbox_xchacha20poly1305().
-     *
-     * @internal Do not use this directly. Use ParagonIE_Sodium_Compat.
-     *
-     * @param string $ciphertext
-     * @param string $nonce
-     * @param string $key
-     * @return string
-     * @throws SodiumException
-     * @throws TypeError
-     */
-    public static function secretbox_xchacha20poly1305_open($ciphertext, $nonce, $key)
-    {
-        /** @var string $mac */
-        $mac = ParagonIE_Sodium_Core32_Util::substr(
-            $ciphertext,
-            0,
-            self::secretbox_xchacha20poly1305_MACBYTES
-        );
-
-        /** @var string $c */
-        $c = ParagonIE_Sodium_Core32_Util::substr(
-            $ciphertext,
-            self::secretbox_xchacha20poly1305_MACBYTES
-        );
-
-        /** @var int $clen */
-        $clen = ParagonIE_Sodium_Core32_Util::strlen($c);
-
-        /** @var string $subkey */
-        $subkey = ParagonIE_Sodium_Core32_HChaCha20::hchacha20($nonce, $key);
-
-        /** @var string $block0 */
-        $block0 = ParagonIE_Sodium_Core32_ChaCha20::stream(
-            64,
-            ParagonIE_Sodium_Core32_Util::substr($nonce, 16, 8),
-            $subkey
-        );
-        $verified = ParagonIE_Sodium_Core32_Poly1305::onetimeauth_verify(
-            $mac,
-            $c,
-            ParagonIE_Sodium_Core32_Util::substr($block0, 0, 32)
-        );
-
-        if (!$verified) {
-            try {
-                ParagonIE_Sodium_Compat::memzero($subkey);
-            } catch (SodiumException $ex) {
-                $subkey = null;
-            }
-            throw new SodiumException('Invalid MAC');
-        }
-
-        /** @var string $m - Decrypted message */
-        $m = ParagonIE_Sodium_Core32_Util::xorStrings(
-            ParagonIE_Sodium_Core32_Util::substr($block0, self::secretbox_xchacha20poly1305_ZEROBYTES),
-            ParagonIE_Sodium_Core32_Util::substr($c, 0, self::secretbox_xchacha20poly1305_ZEROBYTES)
-        );
-
-        if ($clen > self::secretbox_xchacha20poly1305_ZEROBYTES) {
-            // We had more than 1 block, so let's continue to decrypt the rest.
-            $m .= ParagonIE_Sodium_Core32_ChaCha20::streamXorIc(
-                ParagonIE_Sodium_Core32_Util::substr(
-                    $c,
-                    self::secretbox_xchacha20poly1305_ZEROBYTES
-                ),
-                ParagonIE_Sodium_Core32_Util::substr($nonce, 16, 8),
-                (string) $subkey,
-                ParagonIE_Sodium_Core32_Util::store64_le(1)
-            );
-        }
-        return $m;
-    }
-
-    /**
-     * @param string $key
-     * @return array<int, string> Returns a state and a header.
-     * @throws Exception
-     * @throws SodiumException
-     */
-    public static function secretstream_xchacha20poly1305_init_push($key)
-    {
-        # randombytes_buf(out, crypto_secretstream_xchacha20poly1305_HEADERBYTES);
-        $out = random_bytes(24);
-
-        # crypto_core_hchacha20(state->k, out, k, NULL);
-        $subkey = ParagonIE_Sodium_Core32_HChaCha20::hChaCha20($out, $key);
-        $state = new ParagonIE_Sodium_Core32_SecretStream_State(
-            $subkey,
-            ParagonIE_Sodium_Core32_Util::substr($out, 16, 8) . str_repeat("\0", 4)
-        );
-
-        # _crypto_secretstream_xchacha20poly1305_counter_reset(state);
-        $state->counterReset();
-
-        # memcpy(STATE_INONCE(state), out + crypto_core_hchacha20_INPUTBYTES,
-        #        crypto_secretstream_xchacha20poly1305_INONCEBYTES);
-        # memset(state->_pad, 0, sizeof state->_pad);
-        return array(
-            $state->toString(),
-            $out
-        );
-    }
-
-    /**
-     * @param string $key
-     * @param string $header
-     * @return string Returns a state.
-     * @throws Exception
-     */
-    public static function secretstream_xchacha20poly1305_init_pull($key, $header)
-    {
-        # crypto_core_hchacha20(state->k, in, k, NULL);
-        $subkey = ParagonIE_Sodium_Core32_HChaCha20::hChaCha20(
-            ParagonIE_Sodium_Core32_Util::substr($header, 0, 16),
-            $key
-        );
-        $state = new ParagonIE_Sodium_Core32_SecretStream_State(
-            $subkey,
-            ParagonIE_Sodium_Core32_Util::substr($header, 16)
-        );
-        $state->counterReset();
-        # memcpy(STATE_INONCE(state), in + crypto_core_hchacha20_INPUTBYTES,
-        #     crypto_secretstream_xchacha20poly1305_INONCEBYTES);
-        # memset(state->_pad, 0, sizeof state->_pad);
-        # return 0;
-        return $state->toString();
-    }
-
-    /**
-     * @param string $state
-     * @param string $msg
-     * @param string $aad
-     * @param int $tag
-     * @return string
-     * @throws SodiumException
-     */
-    public static function secretstream_xchacha20poly1305_push(&$state, $msg, $aad = '', $tag = 0)
-    {
-        $st = ParagonIE_Sodium_Core32_SecretStream_State::fromString($state);
-        # crypto_onetimeauth_poly1305_state poly1305_state;
-        # unsigned char                     block[64U];
-        # unsigned char                     slen[8U];
-        # unsigned char                    *c;
-        # unsigned char                    *mac;
-
-        $msglen = ParagonIE_Sodium_Core32_Util::strlen($msg);
-        $aadlen = ParagonIE_Sodium_Core32_Util::strlen($aad);
-
-        if ((($msglen + 63) >> 6) > 0xfffffffe) {
-            throw new SodiumException(
-                'message cannot be larger than SODIUM_CRYPTO_SECRETSTREAM_XCHACHA20POLY1305_MESSAGEBYTES_MAX bytes'
-            );
-        }
-
-        # if (outlen_p != NULL) {
-        #     *outlen_p = 0U;
-        # }
-        # if (mlen > crypto_secretstream_xchacha20poly1305_MESSAGEBYTES_MAX) {
-        #     sodium_misuse();
-        # }
-
-        # crypto_stream_chacha20_ietf(block, sizeof block, state->nonce, state->k);
-        # crypto_onetimeauth_poly1305_init(&poly1305_state, block);
-        # sodium_memzero(block, sizeof block);
-        $auth = new ParagonIE_Sodium_Core32_Poly1305_State(
-            ParagonIE_Sodium_Core32_ChaCha20::ietfStream(32, $st->getCombinedNonce(), $st->getKey())
-        );
-
-        # crypto_onetimeauth_poly1305_update(&poly1305_state, ad, adlen);
-        $auth->update($aad);
-
-        # crypto_onetimeauth_poly1305_update(&poly1305_state, _pad0,
-        #     (0x10 - adlen) & 0xf);
-        $auth->update(str_repeat("\0", ((0x10 - $aadlen) & 0xf)));
-
-        # memset(block, 0, sizeof block);
-        # block[0] = tag;
-        # crypto_stream_chacha20_ietf_xor_ic(block, block, sizeof block,
-        #                                    state->nonce, 1U, state->k);
-        $block = ParagonIE_Sodium_Core32_ChaCha20::ietfStreamXorIc(
-            ParagonIE_Sodium_Core32_Util::intToChr($tag) . str_repeat("\0", 63),
-            $st->getCombinedNonce(),
-            $st->getKey(),
-            ParagonIE_Sodium_Core32_Util::store64_le(1)
-        );
-
-        # crypto_onetimeauth_poly1305_update(&poly1305_state, block, sizeof block);
-        $auth->update($block);
-
-        # out[0] = block[0];
-        $out = $block[0];
-        # c = out + (sizeof tag);
-        # crypto_stream_chacha20_ietf_xor_ic(c, m, mlen, state->nonce, 2U, state->k);
-        $cipher = ParagonIE_Sodium_Core32_ChaCha20::ietfStreamXorIc(
-            $msg,
-            $st->getCombinedNonce(),
-            $st->getKey(),
-            ParagonIE_Sodium_Core32_Util::store64_le(2)
-        );
-
-        # crypto_onetimeauth_poly1305_update(&poly1305_state, c, mlen);
-        $auth->update($cipher);
-
-        $out .= $cipher;
-        unset($cipher);
-
-        # crypto_onetimeauth_poly1305_update
-        # (&poly1305_state, _pad0, (0x10 - (sizeof block) + mlen) & 0xf);
-        $auth->update(str_repeat("\0", ((0x10 - 64 + $msglen) & 0xf)));
-
-        # STORE64_LE(slen, (uint64_t) adlen);
-        $slen = ParagonIE_Sodium_Core32_Util::store64_le($aadlen);
-
-        # crypto_onetimeauth_poly1305_update(&poly1305_state, slen, sizeof slen);
-        $auth->update($slen);
-
-        # STORE64_LE(slen, (sizeof block) + mlen);
-        $slen = ParagonIE_Sodium_Core32_Util::store64_le(64 + $msglen);
-
-        # crypto_onetimeauth_poly1305_update(&poly1305_state, slen, sizeof slen);
-        $auth->update($slen);
-
-        # mac = c + mlen;
-        # crypto_onetimeauth_poly1305_final(&poly1305_state, mac);
-        $mac = $auth->finish();
-        $out .= $mac;
-
-        # sodium_memzero(&poly1305_state, sizeof poly1305_state);
-        unset($auth);
-
-
-        # XOR_BUF(STATE_INONCE(state), mac,
-        #     crypto_secretstream_xchacha20poly1305_INONCEBYTES);
-        $st->xorNonce($mac);
-
-        # sodium_increment(STATE_COUNTER(state),
-        #     crypto_secretstream_xchacha20poly1305_COUNTERBYTES);
-        $st->incrementCounter();
-        // Overwrite by reference:
-        $state = $st->toString();
-
-        /** @var bool $rekey */
-        $rekey = ($tag & ParagonIE_Sodium_Compat::CRYPTO_SECRETSTREAM_XCHACHA20POLY1305_TAG_REKEY) !== 0;
-        # if ((tag & crypto_secretstream_xchacha20poly1305_TAG_REKEY) != 0 ||
-        #     sodium_is_zero(STATE_COUNTER(state),
-        #         crypto_secretstream_xchacha20poly1305_COUNTERBYTES)) {
-        #     crypto_secretstream_xchacha20poly1305_rekey(state);
-        # }
-        if ($rekey || $st->needsRekey()) {
-            // DO REKEY
-            self::secretstream_xchacha20poly1305_rekey($state);
-        }
-        # if (outlen_p != NULL) {
-        #     *outlen_p = crypto_secretstream_xchacha20poly1305_ABYTES + mlen;
-        # }
-        return $out;
-    }
-
-    /**
-     * @param string $state
-     * @param string $cipher
-     * @param string $aad
-     * @return bool|array{0: string, 1: int}
-     * @throws SodiumException
-     */
-    public static function secretstream_xchacha20poly1305_pull(&$state, $cipher, $aad = '')
-    {
-        $st = ParagonIE_Sodium_Core32_SecretStream_State::fromString($state);
-
-        $cipherlen = ParagonIE_Sodium_Core32_Util::strlen($cipher);
-        #     mlen = inlen - crypto_secretstream_xchacha20poly1305_ABYTES;
-        $msglen = $cipherlen - ParagonIE_Sodium_Compat::CRYPTO_SECRETSTREAM_XCHACHA20POLY1305_ABYTES;
-        $aadlen = ParagonIE_Sodium_Core32_Util::strlen($aad);
-
-        #     if (mlen > crypto_secretstream_xchacha20poly1305_MESSAGEBYTES_MAX) {
-        #         sodium_misuse();
-        #     }
-        if ((($msglen + 63) >> 6) > 0xfffffffe) {
-            throw new SodiumException(
-                'message cannot be larger than SODIUM_CRYPTO_SECRETSTREAM_XCHACHA20POLY1305_MESSAGEBYTES_MAX bytes'
-            );
-        }
-
-        #     crypto_stream_chacha20_ietf(block, sizeof block, state->nonce, state->k);
-        #     crypto_onetimeauth_poly1305_init(&poly1305_state, block);
-        #     sodium_memzero(block, sizeof block);
-        $auth = new ParagonIE_Sodium_Core32_Poly1305_State(
-            ParagonIE_Sodium_Core32_ChaCha20::ietfStream(32, $st->getCombinedNonce(), $st->getKey())
-        );
-
-        #     crypto_onetimeauth_poly1305_update(&poly1305_state, ad, adlen);
-        $auth->update($aad);
-
-        #     crypto_onetimeauth_poly1305_update(&poly1305_state, _pad0,
-        #         (0x10 - adlen) & 0xf);
-        $auth->update(str_repeat("\0", ((0x10 - $aadlen) & 0xf)));
-
-
-        #     memset(block, 0, sizeof block);
-        #     block[0] = in[0];
-        #     crypto_stream_chacha20_ietf_xor_ic(block, block, sizeof block,
-        #                                        state->nonce, 1U, state->k);
-        $block = ParagonIE_Sodium_Core32_ChaCha20::ietfStreamXorIc(
-            $cipher[0] . str_repeat("\0", 63),
-            $st->getCombinedNonce(),
-            $st->getKey(),
-            ParagonIE_Sodium_Core32_Util::store64_le(1)
-        );
-        #     tag = block[0];
-        #     block[0] = in[0];
-        #     crypto_onetimeauth_poly1305_update(&poly1305_state, block, sizeof block);
-        $tag = ParagonIE_Sodium_Core32_Util::chrToInt($block[0]);
-        $block[0] = $cipher[0];
-        $auth->update($block);
-
-
-        #     c = in + (sizeof tag);
-        #     crypto_onetimeauth_poly1305_update(&poly1305_state, c, mlen);
-        $auth->update(ParagonIE_Sodium_Core32_Util::substr($cipher, 1, $msglen));
-
-        #     crypto_onetimeauth_poly1305_update
-        #     (&poly1305_state, _pad0, (0x10 - (sizeof block) + mlen) & 0xf);
-        $auth->update(str_repeat("\0", ((0x10 - 64 + $msglen) & 0xf)));
-
-        #     STORE64_LE(slen, (uint64_t) adlen);
-        #     crypto_onetimeauth_poly1305_update(&poly1305_state, slen, sizeof slen);
-        $slen = ParagonIE_Sodium_Core32_Util::store64_le($aadlen);
-        $auth->update($slen);
-
-        #     STORE64_LE(slen, (sizeof block) + mlen);
-        #     crypto_onetimeauth_poly1305_update(&poly1305_state, slen, sizeof slen);
-        $slen = ParagonIE_Sodium_Core32_Util::store64_le(64 + $msglen);
-        $auth->update($slen);
-
-        #     crypto_onetimeauth_poly1305_final(&poly1305_state, mac);
-        #     sodium_memzero(&poly1305_state, sizeof poly1305_state);
-        $mac = $auth->finish();
-
-        #     stored_mac = c + mlen;
-        #     if (sodium_memcmp(mac, stored_mac, sizeof mac) != 0) {
-        #     sodium_memzero(mac, sizeof mac);
-        #         return -1;
-        #     }
-
-        $stored = ParagonIE_Sodium_Core32_Util::substr($cipher, $msglen + 1, 16);
-        if (!ParagonIE_Sodium_Core32_Util::hashEquals($mac, $stored)) {
-            return false;
-        }
-
-        #     crypto_stream_chacha20_ietf_xor_ic(m, c, mlen, state->nonce, 2U, state->k);
-        $out = ParagonIE_Sodium_Core32_ChaCha20::ietfStreamXorIc(
-            ParagonIE_Sodium_Core32_Util::substr($cipher, 1, $msglen),
-            $st->getCombinedNonce(),
-            $st->getKey(),
-            ParagonIE_Sodium_Core32_Util::store64_le(2)
-        );
-
-        #     XOR_BUF(STATE_INONCE(state), mac,
-        #         crypto_secretstream_xchacha20poly1305_INONCEBYTES);
-        $st->xorNonce($mac);
-
-        #     sodium_increment(STATE_COUNTER(state),
-        #         crypto_secretstream_xchacha20poly1305_COUNTERBYTES);
-        $st->incrementCounter();
-
-        #     if ((tag & crypto_secretstream_xchacha20poly1305_TAG_REKEY) != 0 ||
-        #         sodium_is_zero(STATE_COUNTER(state),
-        #             crypto_secretstream_xchacha20poly1305_COUNTERBYTES)) {
-        #         crypto_secretstream_xchacha20poly1305_rekey(state);
-        #     }
-
-        // Overwrite by reference:
-        $state = $st->toString();
-
-        /** @var bool $rekey */
-        $rekey = ($tag & ParagonIE_Sodium_Compat::CRYPTO_SECRETSTREAM_XCHACHA20POLY1305_TAG_REKEY) !== 0;
-        if ($rekey || $st->needsRekey()) {
-            // DO REKEY
-            self::secretstream_xchacha20poly1305_rekey($state);
-        }
-        return array($out, $tag);
-    }
-
-    /**
-     * @param string $state
-     * @return void
-     * @throws SodiumException
-     */
-    public static function secretstream_xchacha20poly1305_rekey(&$state)
-    {
-        $st = ParagonIE_Sodium_Core32_SecretStream_State::fromString($state);
-        # unsigned char new_key_and_inonce[crypto_stream_chacha20_ietf_KEYBYTES +
-        # crypto_secretstream_xchacha20poly1305_INONCEBYTES];
-        # size_t        i;
-        # for (i = 0U; i < crypto_stream_chacha20_ietf_KEYBYTES; i++) {
-        #     new_key_and_inonce[i] = state->k[i];
-        # }
-        $new_key_and_inonce = $st->getKey();
-
-        # for (i = 0U; i < crypto_secretstream_xchacha20poly1305_INONCEBYTES; i++) {
-        #     new_key_and_inonce[crypto_stream_chacha20_ietf_KEYBYTES + i] =
-        #         STATE_INONCE(state)[i];
-        # }
-        $new_key_and_inonce .= ParagonIE_Sodium_Core32_Util::substR($st->getNonce(), 0, 8);
-
-        # crypto_stream_chacha20_ietf_xor(new_key_and_inonce, new_key_and_inonce,
-        #                                 sizeof new_key_and_inonce,
-        #                                 state->nonce, state->k);
-
-        $st->rekey(ParagonIE_Sodium_Core32_ChaCha20::ietfStreamXorIc(
-            $new_key_and_inonce,
-            $st->getCombinedNonce(),
-            $st->getKey(),
-            ParagonIE_Sodium_Core32_Util::store64_le(0)
-        ));
-
-        # for (i = 0U; i < crypto_stream_chacha20_ietf_KEYBYTES; i++) {
-        #     state->k[i] = new_key_and_inonce[i];
-        # }
-        # for (i = 0U; i < crypto_secretstream_xchacha20poly1305_INONCEBYTES; i++) {
-        #     STATE_INONCE(state)[i] =
-        #          new_key_and_inonce[crypto_stream_chacha20_ietf_KEYBYTES + i];
-        # }
-        # _crypto_secretstream_xchacha20poly1305_counter_reset(state);
-        $st->counterReset();
-
-        $state = $st->toString();
-    }
-
-    /**
-     * Detached Ed25519 signature.
-     *
-     * @internal Do not use this directly. Use ParagonIE_Sodium_Compat.
-     *
-     * @param string $message
-     * @param string $sk
-     * @return string
-     * @throws SodiumException
-     * @throws TypeError
-     */
-    public static function sign_detached($message, $sk)
-    {
-        return ParagonIE_Sodium_Core32_Ed25519::sign_detached($message, $sk);
-    }
-
-    /**
-     * Attached Ed25519 signature. (Returns a signed message.)
-     *
-     * @internal Do not use this directly. Use ParagonIE_Sodium_Compat.
-     *
-     * @param string $message
-     * @param string $sk
-     * @return string
-     * @throws SodiumException
-     * @throws TypeError
-     */
-    public static function sign($message, $sk)
-    {
-        return ParagonIE_Sodium_Core32_Ed25519::sign($message, $sk);
-    }
-
-    /**
-     * Opens a signed message. If valid, returns the message.
-     *
-     * @internal Do not use this directly. Use ParagonIE_Sodium_Compat.
-     *
-     * @param string $signedMessage
-     * @param string $pk
-     * @return string
-     * @throws SodiumException
-     * @throws TypeError
-     */
-    public static function sign_open($signedMessage, $pk)
-    {
-        return ParagonIE_Sodium_Core32_Ed25519::sign_open($signedMessage, $pk);
-    }
-
-    /**
-     * Verify a detached signature of a given message and public key.
-     *
-     * @internal Do not use this directly. Use ParagonIE_Sodium_Compat.
-     *
-     * @param string $signature
-     * @param string $message
-     * @param string $pk
-     * @return bool
-     * @throws SodiumException
-     * @throws TypeError
-     */
-    public static function sign_verify_detached($signature, $message, $pk)
-    {
-        return ParagonIE_Sodium_Core32_Ed25519::verify_detached($signature, $message, $pk);
-    }
-}

diff --git a/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/File.php b/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/File.php
index 1b02fc4be619e37e90e827e1da5d05c68805d165..01943452eec1e8af6b6d10256d641ae2c0827daa 100644 (file)
--- a/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/File.php
+++ b/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/File.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 if (class_exists('ParagonIE_Sodium_File', false)) {
     return;
@@ -26,27 +27,12 @@ class ParagonIE_Sodium_File extends ParagonIE_Sodium_Core_Util
      * @throws TypeError
      */
     public static function box(
-        $inputFile,
-        $outputFile,
-        $nonce,
-        #[\SensitiveParameter]
-        $keyPair
-    ) {
-        /* Type checks: */
-        if (!is_string($inputFile)) {
-            throw new TypeError('Argument 1 must be a string, ' . gettype($inputFile) . ' given.');
-        }
-        if (!is_string($outputFile)) {
-            throw new TypeError('Argument 2 must be a string, ' . gettype($outputFile) . ' given.');
-        }
-        if (!is_string($nonce)) {
-            throw new TypeError('Argument 3 must be a string, ' . gettype($nonce) . ' given.');
-        }
-
-        /* Input validation: */
-        if (!is_string($keyPair)) {
-            throw new TypeError('Argument 4 must be a string, ' . gettype($keyPair) . ' given.');
-        }
+        string $inputFile,
+        string $outputFile,
+        string $nonce,
+        #[SensitiveParameter]
+        string $keyPair
+    ): bool {
         if (self::strlen($nonce) !== ParagonIE_Sodium_Compat::CRYPTO_BOX_NONCEBYTES) {
             throw new TypeError('Argument 3 must be CRYPTO_BOX_NONCEBYTES bytes');
         }
@@ -54,19 +40,16 @@ class ParagonIE_Sodium_File extends ParagonIE_Sodium_Core_Util
             throw new TypeError('Argument 4 must be CRYPTO_BOX_KEYPAIRBYTES bytes');
         }
 
-        /** @var int $size */
         $size = filesize($inputFile);
         if (!is_int($size)) {
             throw new SodiumException('Could not obtain the file size');
         }
 
-        /** @var resource $ifp */
         $ifp = fopen($inputFile, 'rb');
         if (!is_resource($ifp)) {
             throw new SodiumException('Could not open input file for reading');
         }
 
-        /** @var resource $ofp */
         $ofp = fopen($outputFile, 'wb');
         if (!is_resource($ofp)) {
             fclose($ifp);
@@ -97,26 +80,12 @@ class ParagonIE_Sodium_File extends ParagonIE_Sodium_Core_Util
      * @throws TypeError
      */
     public static function box_open(
-        $inputFile,
-        $outputFile,
-        $nonce,
-        #[\SensitiveParameter]
-        $keypair
-    ) {
-        /* Type checks: */
-        if (!is_string($inputFile)) {
-            throw new TypeError('Argument 1 must be a string, ' . gettype($inputFile) . ' given.');
-        }
-        if (!is_string($outputFile)) {
-            throw new TypeError('Argument 2 must be a string, ' . gettype($outputFile) . ' given.');
-        }
-        if (!is_string($nonce)) {
-            throw new TypeError('Argument 3 must be a string, ' . gettype($nonce) . ' given.');
-        }
-        if (!is_string($keypair)) {
-            throw new TypeError('Argument 4 must be a string, ' . gettype($keypair) . ' given.');
-        }
-
+        string $inputFile,
+        string $outputFile,
+        string $nonce,
+        #[SensitiveParameter]
+        string $keypair
+    ): bool {
         /* Input validation: */
         if (self::strlen($nonce) !== ParagonIE_Sodium_Compat::CRYPTO_BOX_NONCEBYTES) {
             throw new TypeError('Argument 4 must be CRYPTO_BOX_NONCEBYTES bytes');
@@ -125,19 +94,16 @@ class ParagonIE_Sodium_File extends ParagonIE_Sodium_Core_Util
             throw new TypeError('Argument 4 must be CRYPTO_BOX_KEYPAIRBYTES bytes');
         }
 
-        /** @var int $size */
         $size = filesize($inputFile);
         if (!is_int($size)) {
             throw new SodiumException('Could not obtain the file size');
         }
 
-        /** @var resource $ifp */
         $ifp = fopen($inputFile, 'rb');
         if (!is_resource($ifp)) {
             throw new SodiumException('Could not open input file for reading');
         }
 
-        /** @var resource $ofp */
         $ofp = fopen($outputFile, 'wb');
         if (!is_resource($ofp)) {
             fclose($ifp);
@@ -150,7 +116,7 @@ class ParagonIE_Sodium_File extends ParagonIE_Sodium_Core_Util
         try {
             ParagonIE_Sodium_Compat::memzero($nonce);
             ParagonIE_Sodium_Compat::memzero($ephKeypair);
-        } catch (SodiumException $ex) {
+        } catch (SodiumException) {
             if (isset($ephKeypair)) {
                 unset($ephKeypair);
             }
@@ -172,66 +138,43 @@ class ParagonIE_Sodium_File extends ParagonIE_Sodium_Core_Util
      * @throws TypeError
      */
     public static function box_seal(
-        $inputFile,
-        $outputFile,
-        #[\SensitiveParameter]
-        $publicKey
-    ) {
-        /* Type checks: */
-        if (!is_string($inputFile)) {
-            throw new TypeError('Argument 1 must be a string, ' . gettype($inputFile) . ' given.');
-        }
-        if (!is_string($outputFile)) {
-            throw new TypeError('Argument 2 must be a string, ' . gettype($outputFile) . ' given.');
-        }
-        if (!is_string($publicKey)) {
-            throw new TypeError('Argument 3 must be a string, ' . gettype($publicKey) . ' given.');
-        }
-
+        string $inputFile,
+        string $outputFile,
+        string $publicKey
+    ): bool {
         /* Input validation: */
         if (self::strlen($publicKey) !== ParagonIE_Sodium_Compat::CRYPTO_BOX_PUBLICKEYBYTES) {
             throw new TypeError('Argument 3 must be CRYPTO_BOX_PUBLICKEYBYTES bytes');
         }
 
-        /** @var int $size */
         $size = filesize($inputFile);
         if (!is_int($size)) {
             throw new SodiumException('Could not obtain the file size');
         }
 
-        /** @var resource $ifp */
         $ifp = fopen($inputFile, 'rb');
         if (!is_resource($ifp)) {
             throw new SodiumException('Could not open input file for reading');
         }
 
-        /** @var resource $ofp */
         $ofp = fopen($outputFile, 'wb');
         if (!is_resource($ofp)) {
             fclose($ifp);
             throw new SodiumException('Could not open output file for writing');
         }
 
-        /** @var string $ephKeypair */
         $ephKeypair = ParagonIE_Sodium_Compat::crypto_box_keypair();
-
-        /** @var string $msgKeypair */
         $msgKeypair = ParagonIE_Sodium_Compat::crypto_box_keypair_from_secretkey_and_publickey(
             ParagonIE_Sodium_Compat::crypto_box_secretkey($ephKeypair),
             $publicKey
         );
-
-        /** @var string $ephemeralPK */
         $ephemeralPK = ParagonIE_Sodium_Compat::crypto_box_publickey($ephKeypair);
-
-        /** @var string $nonce */
         $nonce = ParagonIE_Sodium_Compat::crypto_generichash(
             $ephemeralPK . $publicKey,
             '',
             24
         );
 
-        /** @var int $firstWrite */
         $firstWrite = fwrite(
             $ofp,
             $ephemeralPK,
@@ -256,7 +199,7 @@ class ParagonIE_Sodium_File extends ParagonIE_Sodium_Core_Util
         try {
             ParagonIE_Sodium_Compat::memzero($nonce);
             ParagonIE_Sodium_Compat::memzero($ephKeypair);
-        } catch (SodiumException $ex) {
+        } catch (SodiumException) {
             /** @psalm-suppress PossiblyUndefinedVariable */
             unset($ephKeypair);
         }
@@ -280,22 +223,11 @@ class ParagonIE_Sodium_File extends ParagonIE_Sodium_Core_Util
      * @throws TypeError
      */
     public static function box_seal_open(
-        $inputFile,
-        $outputFile,
-        #[\SensitiveParameter]
-        $ecdhKeypair
-    ) {
-        /* Type checks: */
-        if (!is_string($inputFile)) {
-            throw new TypeError('Argument 1 must be a string, ' . gettype($inputFile) . ' given.');
-        }
-        if (!is_string($outputFile)) {
-            throw new TypeError('Argument 2 must be a string, ' . gettype($outputFile) . ' given.');
-        }
-        if (!is_string($ecdhKeypair)) {
-            throw new TypeError('Argument 3 must be a string, ' . gettype($ecdhKeypair) . ' given.');
-        }
-
+        string $inputFile,
+        string $outputFile,
+        #[SensitiveParameter]
+        string $ecdhKeypair
+    ): bool {
         /* Input validation: */
         if (self::strlen($ecdhKeypair) !== ParagonIE_Sodium_Compat::CRYPTO_BOX_KEYPAIRBYTES) {
             throw new TypeError('Argument 3 must be CRYPTO_BOX_KEYPAIRBYTES bytes');
@@ -303,19 +235,16 @@ class ParagonIE_Sodium_File extends ParagonIE_Sodium_Core_Util
 
         $publicKey = ParagonIE_Sodium_Compat::crypto_box_publickey($ecdhKeypair);
 
-        /** @var int $size */
         $size = filesize($inputFile);
         if (!is_int($size)) {
             throw new SodiumException('Could not obtain the file size');
         }
 
-        /** @var resource $ifp */
         $ifp = fopen($inputFile, 'rb');
         if (!is_resource($ifp)) {
             throw new SodiumException('Could not open input file for reading');
         }
 
-        /** @var resource $ofp */
         $ofp = fopen($outputFile, 'wb');
         if (!is_resource($ofp)) {
             fclose($ifp);
@@ -348,7 +277,7 @@ class ParagonIE_Sodium_File extends ParagonIE_Sodium_Core_Util
         try {
             ParagonIE_Sodium_Compat::memzero($nonce);
             ParagonIE_Sodium_Compat::memzero($ephKeypair);
-        } catch (SodiumException $ex) {
+        } catch (SodiumException) {
             if (isset($ephKeypair)) {
                 unset($ephKeypair);
             }
@@ -366,30 +295,15 @@ class ParagonIE_Sodium_File extends ParagonIE_Sodium_Core_Util
      * @return string                   BLAKE2b hash
      * @throws SodiumException
      * @throws TypeError
-     * @psalm-suppress FailedTypeResolution
      */
     public static function generichash(
-        $filePath,
-        #[\SensitiveParameter]
-        $key = '',
-        $outputLength = 32
-    ) {
-        /* Type checks: */
-        if (!is_string($filePath)) {
-            throw new TypeError('Argument 1 must be a string, ' . gettype($filePath) . ' given.');
-        }
-        if (!is_string($key)) {
-            if (is_null($key)) {
-                $key = '';
-            } else {
-                throw new TypeError('Argument 2 must be a string, ' . gettype($key) . ' given.');
-            }
-        }
-        if (!is_int($outputLength)) {
-            if (!is_numeric($outputLength)) {
-                throw new TypeError('Argument 3 must be an integer, ' . gettype($outputLength) . ' given.');
-            }
-            $outputLength = (int) $outputLength;
+        string $filePath,
+        #[SensitiveParameter]
+        ?string $key = '',
+        int $outputLength = 32
+    ): string {
+        if (is_null($key)) {
+            $key = '';
         }
 
         /* Input validation: */
@@ -408,22 +322,18 @@ class ParagonIE_Sodium_File extends ParagonIE_Sodium_Core_Util
             throw new SodiumException('Argument 3 must be at least CRYPTO_GENERICHASH_BYTES_MAX');
         }
 
-        /** @var int $size */
         $size = filesize($filePath);
         if (!is_int($size)) {
             throw new SodiumException('Could not obtain the file size');
         }
 
-        /** @var resource $fp */
         $fp = fopen($filePath, 'rb');
         if (!is_resource($fp)) {
             throw new SodiumException('Could not open input file for reading');
         }
         $ctx = ParagonIE_Sodium_Compat::crypto_generichash_init($key, $outputLength);
         while ($size > 0) {
-            $blockSize = $size > 64
-                ? 64
-                : $size;
+            $blockSize = min($size, 64);
             $read = fread($fp, $blockSize);
             if (!is_string($read)) {
                 throw new SodiumException('Could not read input file');
@@ -451,47 +361,30 @@ class ParagonIE_Sodium_File extends ParagonIE_Sodium_Core_Util
      * @throws TypeError
      */
     public static function secretbox(
-        $inputFile,
-        $outputFile,
-        $nonce,
-        #[\SensitiveParameter]
-        $key
-    ) {
-        /* Type checks: */
-        if (!is_string($inputFile)) {
-            throw new TypeError('Argument 1 must be a string, ' . gettype($inputFile) . ' given..');
-        }
-        if (!is_string($outputFile)) {
-            throw new TypeError('Argument 2 must be a string, ' . gettype($outputFile) . ' given.');
-        }
-        if (!is_string($nonce)) {
-            throw new TypeError('Argument 3 must be a string, ' . gettype($nonce) . ' given.');
-        }
-
+        string $inputFile,
+        string $outputFile,
+        string $nonce,
+        #[SensitiveParameter]
+        string $key
+    ): bool {
         /* Input validation: */
         if (self::strlen($nonce) !== ParagonIE_Sodium_Compat::CRYPTO_SECRETBOX_NONCEBYTES) {
             throw new TypeError('Argument 3 must be CRYPTO_SECRETBOX_NONCEBYTES bytes');
         }
-        if (!is_string($key)) {
-            throw new TypeError('Argument 4 must be a string, ' . gettype($key) . ' given.');
-        }
         if (self::strlen($key) !== ParagonIE_Sodium_Compat::CRYPTO_SECRETBOX_KEYBYTES) {
             throw new TypeError('Argument 4 must be CRYPTO_SECRETBOX_KEYBYTES bytes');
         }
 
-        /** @var int $size */
         $size = filesize($inputFile);
         if (!is_int($size)) {
             throw new SodiumException('Could not obtain the file size');
         }
 
-        /** @var resource $ifp */
         $ifp = fopen($inputFile, 'rb');
         if (!is_resource($ifp)) {
             throw new SodiumException('Could not open input file for reading');
         }
 
-        /** @var resource $ofp */
         $ofp = fopen($outputFile, 'wb');
         if (!is_resource($ofp)) {
             fclose($ifp);
@@ -503,6 +396,7 @@ class ParagonIE_Sodium_File extends ParagonIE_Sodium_Core_Util
         fclose($ofp);
         return $res;
     }
+
     /**
      * Seal a file (rather than a string). Uses less memory than
      * ParagonIE_Sodium_Compat::crypto_secretbox_open(), but produces
@@ -521,26 +415,12 @@ class ParagonIE_Sodium_File extends ParagonIE_Sodium_Core_Util
      * @throws TypeError
      */
     public static function secretbox_open(
-        $inputFile,
-        $outputFile,
-        $nonce,
-        #[\SensitiveParameter]
-        $key
-    ) {
-        /* Type checks: */
-        if (!is_string($inputFile)) {
-            throw new TypeError('Argument 1 must be a string, ' . gettype($inputFile) . ' given.');
-        }
-        if (!is_string($outputFile)) {
-            throw new TypeError('Argument 2 must be a string, ' . gettype($outputFile) . ' given.');
-        }
-        if (!is_string($nonce)) {
-            throw new TypeError('Argument 3 must be a string, ' . gettype($nonce) . ' given.');
-        }
-        if (!is_string($key)) {
-            throw new TypeError('Argument 4 must be a string, ' . gettype($key) . ' given.');
-        }
-
+        string $inputFile,
+        string $outputFile,
+        string $nonce,
+        #[SensitiveParameter]
+        string $key
+    ): bool {
         /* Input validation: */
         if (self::strlen($nonce) !== ParagonIE_Sodium_Compat::CRYPTO_SECRETBOX_NONCEBYTES) {
             throw new TypeError('Argument 4 must be CRYPTO_SECRETBOX_NONCEBYTES bytes');
@@ -549,19 +429,16 @@ class ParagonIE_Sodium_File extends ParagonIE_Sodium_Core_Util
             throw new TypeError('Argument 4 must be CRYPTO_SECRETBOXBOX_KEYBYTES bytes');
         }
 
-        /** @var int $size */
         $size = filesize($inputFile);
         if (!is_int($size)) {
             throw new SodiumException('Could not obtain the file size');
         }
 
-        /** @var resource $ifp */
         $ifp = fopen($inputFile, 'rb');
         if (!is_resource($ifp)) {
             throw new SodiumException('Could not open input file for reading');
         }
 
-        /** @var resource $ofp */
         $ofp = fopen($outputFile, 'wb');
         if (!is_resource($ofp)) {
             fclose($ifp);
@@ -573,7 +450,7 @@ class ParagonIE_Sodium_File extends ParagonIE_Sodium_Core_Util
         fclose($ofp);
         try {
             ParagonIE_Sodium_Compat::memzero($key);
-        } catch (SodiumException $ex) {
+        } catch (SodiumException) {
             /** @psalm-suppress PossiblyUndefinedVariable */
             unset($key);
         }
@@ -593,33 +470,20 @@ class ParagonIE_Sodium_File extends ParagonIE_Sodium_Core_Util
      * @throws TypeError
      */
     public static function sign(
-        $filePath,
-        #[\SensitiveParameter]
-        $secretKey
-    ) {
-        /* Type checks: */
-        if (!is_string($filePath)) {
-            throw new TypeError('Argument 1 must be a string, ' . gettype($filePath) . ' given.');
-        }
-        if (!is_string($secretKey)) {
-            throw new TypeError('Argument 2 must be a string, ' . gettype($secretKey) . ' given.');
-        }
-
+        string $filePath,
+        #[SensitiveParameter]
+        string $secretKey
+    ): string {
         /* Input validation: */
         if (self::strlen($secretKey) !== ParagonIE_Sodium_Compat::CRYPTO_SIGN_SECRETKEYBYTES) {
             throw new TypeError('Argument 2 must be CRYPTO_SIGN_SECRETKEYBYTES bytes');
         }
-        if (PHP_INT_SIZE === 4) {
-            return self::sign_core32($filePath, $secretKey);
-        }
 
-        /** @var int $size */
         $size = filesize($filePath);
         if (!is_int($size)) {
             throw new SodiumException('Could not obtain the file size');
         }
 
-        /** @var resource $fp */
         $fp = fopen($filePath, 'rb');
         if (!is_resource($fp)) {
             throw new SodiumException('Could not open input file for reading');
@@ -632,8 +496,7 @@ class ParagonIE_Sodium_File extends ParagonIE_Sodium_Core_Util
         $az[31] = self::intToChr((self::chrToInt($az[31]) & 63) | 64);
 
         $hs = hash_init('sha512');
-        self::hash_update($hs, self::substr($az, 32, 32));
-        /** @var resource $hs */
+        hash_update($hs, self::substr($az, 32, 32));
         $hs = self::updateHashWithFile($hs, $fp, $size);
 
         /** @var string $nonceHash */
@@ -651,9 +514,8 @@ class ParagonIE_Sodium_File extends ParagonIE_Sodium_Core_Util
         );
 
         $hs = hash_init('sha512');
-        self::hash_update($hs, self::substr($sig, 0, 32));
-        self::hash_update($hs, self::substr($pk, 0, 32));
-        /** @var resource $hs */
+        hash_update($hs, self::substr($sig, 0, 32));
+        hash_update($hs, self::substr($pk, 0, 32));
         $hs = self::updateHashWithFile($hs, $fp, $size);
 
         /** @var string $hramHash */
@@ -670,7 +532,7 @@ class ParagonIE_Sodium_File extends ParagonIE_Sodium_Core_Util
 
         try {
             ParagonIE_Sodium_Compat::memzero($az);
-        } catch (SodiumException $ex) {
+        } catch (SodiumException) {
             $az = null;
         }
         fclose($fp);
@@ -691,22 +553,8 @@ class ParagonIE_Sodium_File extends ParagonIE_Sodium_Core_Util
      * @throws TypeError
      * @throws Exception
      */
-    public static function verify(
-        $sig,
-        $filePath,
-        $publicKey
-    ) {
-        /* Type checks: */
-        if (!is_string($sig)) {
-            throw new TypeError('Argument 1 must be a string, ' . gettype($sig) . ' given.');
-        }
-        if (!is_string($filePath)) {
-            throw new TypeError('Argument 2 must be a string, ' . gettype($filePath) . ' given.');
-        }
-        if (!is_string($publicKey)) {
-            throw new TypeError('Argument 3 must be a string, ' . gettype($publicKey) . ' given.');
-        }
-
+    public static function verify(string $sig, string $filePath, string $publicKey): bool
+    {
         /* Input validation: */
         if (self::strlen($sig) !== ParagonIE_Sodium_Compat::CRYPTO_SIGN_BYTES) {
             throw new TypeError('Argument 1 must be CRYPTO_SIGN_BYTES bytes');
@@ -718,9 +566,6 @@ class ParagonIE_Sodium_File extends ParagonIE_Sodium_Core_Util
             throw new SodiumException('Signature is too short');
         }
 
-        if (PHP_INT_SIZE === 4) {
-            return self::verify_core32($sig, $filePath, $publicKey);
-        }
 
         /* Security checks */
         if (
@@ -744,39 +589,31 @@ class ParagonIE_Sodium_File extends ParagonIE_Sodium_Core_Util
             throw new SodiumException('All zero public key');
         }
 
-        /** @var int $size */
         $size = filesize($filePath);
         if (!is_int($size)) {
             throw new SodiumException('Could not obtain the file size');
         }
 
-        /** @var resource $fp */
         $fp = fopen($filePath, 'rb');
         if (!is_resource($fp)) {
             throw new SodiumException('Could not open input file for reading');
         }
 
-        /** @var bool The original value of ParagonIE_Sodium_Compat::$fastMult */
+        /* The original value of ParagonIE_Sodium_Compat::$fastMult */
         $orig = ParagonIE_Sodium_Compat::$fastMult;
 
         // Set ParagonIE_Sodium_Compat::$fastMult to true to speed up verification.
         ParagonIE_Sodium_Compat::$fastMult = true;
 
-        /** @var ParagonIE_Sodium_Core_Curve25519_Ge_P3 $A */
         $A = ParagonIE_Sodium_Core_Ed25519::ge_frombytes_negate_vartime($publicKey);
 
         $hs = hash_init('sha512');
-        self::hash_update($hs, self::substr($sig, 0, 32));
-        self::hash_update($hs, self::substr($publicKey, 0, 32));
-        /** @var resource $hs */
+        hash_update($hs, self::substr($sig, 0, 32));
+        hash_update($hs, self::substr($publicKey, 0, 32));
+
         $hs = self::updateHashWithFile($hs, $fp, $size);
-        /** @var string $hDigest */
         $hDigest = hash_final($hs, true);
-
-        /** @var string $h */
         $h = ParagonIE_Sodium_Core_Ed25519::sc_reduce($hDigest) . self::substr($hDigest, 32);
-
-        /** @var ParagonIE_Sodium_Core_Curve25519_Ge_P2 $R */
         $R = ParagonIE_Sodium_Core_Ed25519::ge_double_scalarmult_vartime(
             $h,
             $A,
@@ -804,20 +641,14 @@ class ParagonIE_Sodium_File extends ParagonIE_Sodium_Core_Util
      * @throws SodiumException
      * @throws TypeError
      */
-    protected static function box_encrypt($ifp, $ofp, $mlen, $nonce, $boxKeypair)
-    {
-        if (PHP_INT_SIZE === 4) {
-            return self::secretbox_encrypt(
-                $ifp,
-                $ofp,
-                $mlen,
-                $nonce,
-                ParagonIE_Sodium_Crypto32::box_beforenm(
-                    ParagonIE_Sodium_Crypto32::box_secretkey($boxKeypair),
-                    ParagonIE_Sodium_Crypto32::box_publickey($boxKeypair)
-                )
-            );
-        }
+    protected static function box_encrypt(
+        $ifp,
+        $ofp,
+        int $mlen,
+        string $nonce,
+        #[SensitiveParameter]
+        string $boxKeypair
+    ): bool {
         return self::secretbox_encrypt(
             $ifp,
             $ofp,
@@ -841,20 +672,14 @@ class ParagonIE_Sodium_File extends ParagonIE_Sodium_Core_Util
      * @throws SodiumException
      * @throws TypeError
      */
-    protected static function box_decrypt($ifp, $ofp, $mlen, $nonce, $boxKeypair)
-    {
-        if (PHP_INT_SIZE === 4) {
-            return self::secretbox_decrypt(
-                $ifp,
-                $ofp,
-                $mlen,
-                $nonce,
-                ParagonIE_Sodium_Crypto32::box_beforenm(
-                    ParagonIE_Sodium_Crypto32::box_secretkey($boxKeypair),
-                    ParagonIE_Sodium_Crypto32::box_publickey($boxKeypair)
-                )
-            );
-        }
+    protected static function box_decrypt(
+        $ifp,
+        $ofp,
+        int $mlen,
+        string $nonce,
+        #[SensitiveParameter]
+        string $boxKeypair
+    ): bool {
         return self::secretbox_decrypt(
             $ifp,
             $ofp,
@@ -879,28 +704,25 @@ class ParagonIE_Sodium_File extends ParagonIE_Sodium_Core_Util
      * @throws SodiumException
      * @throws TypeError
      */
-    protected static function secretbox_encrypt($ifp, $ofp, $mlen, $nonce, $key)
-    {
-        if (PHP_INT_SIZE === 4) {
-            return self::secretbox_encrypt_core32($ifp, $ofp, $mlen, $nonce, $key);
-        }
-
+    protected static function secretbox_encrypt(
+        $ifp,
+        $ofp,
+        int $mlen,
+        string $nonce,
+        #[SensitiveParameter]
+        string $key
+    ): bool {
         $plaintext = fread($ifp, 32);
         if (!is_string($plaintext)) {
             throw new SodiumException('Could not read input file');
         }
         $first32 = self::ftell($ifp);
 
-        /** @var string $subkey */
         $subkey = ParagonIE_Sodium_Core_HSalsa20::hsalsa20($nonce, $key);
-
-        /** @var string $realNonce */
         $realNonce = ParagonIE_Sodium_Core_Util::substr($nonce, 16, 8);
-
-        /** @var string $block0 */
         $block0 = str_repeat("\x00", 32);
 
-        /** @var int $mlen - Length of the plaintext message */
+        /* Length of the plaintext message */
         $mlen0 = $mlen;
         if ($mlen0 > 64 - ParagonIE_Sodium_Crypto::secretbox_xsalsa20poly1305_ZEROBYTES) {
             $mlen0 = 64 - ParagonIE_Sodium_Crypto::secretbox_xsalsa20poly1305_ZEROBYTES;
@@ -935,22 +757,16 @@ class ParagonIE_Sodium_File extends ParagonIE_Sodium_Core_Util
         fwrite($ofp, $cBlock);
         $mlen -= 32;
 
-        /** @var int $iter */
         $iter = 1;
-
-        /** @var int $incr */
         $incr = self::BUFFER_SIZE >> 6;
-
         /*
          * Set the cursor to the end of the first half-block. All future bytes will
          * generated from salsa20_xor_ic, starting from 1 (second block).
          */
-        fseek($ifp, $first32, SEEK_SET);
+        fseek($ifp, $first32);
 
         while ($mlen > 0) {
-            $blockSize = $mlen > self::BUFFER_SIZE
-                ? self::BUFFER_SIZE
-                : $mlen;
+            $blockSize = min($mlen, self::BUFFER_SIZE);
             $plaintext = fread($ifp, $blockSize);
             if (!is_string($plaintext)) {
                 throw new SodiumException('Could not read input file');
@@ -970,7 +786,7 @@ class ParagonIE_Sodium_File extends ParagonIE_Sodium_Core_Util
         try {
             ParagonIE_Sodium_Compat::memzero($block0);
             ParagonIE_Sodium_Compat::memzero($subkey);
-        } catch (SodiumException $ex) {
+        } catch (SodiumException) {
             $block0 = null;
             $subkey = null;
         }
@@ -980,9 +796,9 @@ class ParagonIE_Sodium_File extends ParagonIE_Sodium_Core_Util
          * Write the Poly1305 authentication tag that provides integrity
          * over the ciphertext (encrypt-then-MAC)
          */
-        fseek($ofp, $start, SEEK_SET);
+        fseek($ofp, $start);
         fwrite($ofp, $state->finish(), ParagonIE_Sodium_Compat::CRYPTO_SECRETBOX_MACBYTES);
-        fseek($ofp, $end, SEEK_SET);
+        fseek($ofp, $end);
         unset($state);
 
         return true;
@@ -1000,23 +816,21 @@ class ParagonIE_Sodium_File extends ParagonIE_Sodium_Core_Util
      * @throws SodiumException
      * @throws TypeError
      */
-    protected static function secretbox_decrypt($ifp, $ofp, $mlen, $nonce, $key)
-    {
-        if (PHP_INT_SIZE === 4) {
-            return self::secretbox_decrypt_core32($ifp, $ofp, $mlen, $nonce, $key);
-        }
+    protected static function secretbox_decrypt(
+        $ifp,
+        $ofp,
+        int $mlen,
+        string $nonce,
+        #[SensitiveParameter]
+        string $key
+    ): bool {
         $tag = fread($ifp, 16);
         if (!is_string($tag)) {
             throw new SodiumException('Could not read input file');
         }
 
-        /** @var string $subkey */
         $subkey = ParagonIE_Sodium_Core_HSalsa20::hsalsa20($nonce, $key);
-
-        /** @var string $realNonce */
         $realNonce = ParagonIE_Sodium_Core_Util::substr($nonce, 16, 8);
-
-        /** @var string $block0 */
         $block0 = ParagonIE_Sodium_Core_Salsa20::salsa20(
             64,
             ParagonIE_Sodium_Core_Util::substr($nonce, 16, 8),
@@ -1046,18 +860,12 @@ class ParagonIE_Sodium_File extends ParagonIE_Sodium_Core_Util
             )
         );
         $mlen -= 32;
-
-        /** @var int $iter */
         $iter = 1;
-
-        /** @var int $incr */
         $incr = self::BUFFER_SIZE >> 6;
 
         /* Decrypts ciphertext, writes to output file. */
         while ($mlen > 0) {
-            $blockSize = $mlen > self::BUFFER_SIZE
-                ? self::BUFFER_SIZE
-                : $mlen;
+            $blockSize = min($mlen, self::BUFFER_SIZE);
             $ciphertext = fread($ifp, $blockSize);
             if (!is_string($ciphertext)) {
                 throw new SodiumException('Could not read input file');
@@ -1087,33 +895,22 @@ class ParagonIE_Sodium_File extends ParagonIE_Sodium_Core_Util
     protected static function onetimeauth_verify(
         ParagonIE_Sodium_Core_Poly1305_State $state,
         $ifp,
-        $tag = '',
-        $mlen = 0
-    ) {
-        /** @var int $pos */
+        string $tag = '',
+        int $mlen = 0
+    ): bool {
         $pos = self::ftell($ifp);
-
-        /** @var int $iter */
-        $iter = 1;
-
-        /** @var int $incr */
-        $incr = self::BUFFER_SIZE >> 6;
-
         while ($mlen > 0) {
-            $blockSize = $mlen > self::BUFFER_SIZE
-                ? self::BUFFER_SIZE
-                : $mlen;
+            $blockSize = min($mlen, self::BUFFER_SIZE);
             $ciphertext = fread($ifp, $blockSize);
             if (!is_string($ciphertext)) {
                 throw new SodiumException('Could not read input file');
             }
             $state->update($ciphertext);
             $mlen -= $blockSize;
-            $iter += $incr;
         }
         $res = ParagonIE_Sodium_Core_Util::verify_16($tag, $state->finish());
 
-        fseek($ifp, $pos, SEEK_SET);
+        fseek($ifp, $pos);
         return $res;
     }
 
@@ -1121,43 +918,26 @@ class ParagonIE_Sodium_File extends ParagonIE_Sodium_Core_Util
      * Update a hash context with the contents of a file, without
      * loading the entire file into memory.
      *
-     * @param resource|HashContext $hash
+     * @param HashContext $hash
      * @param resource $fp
      * @param int $size
-     * @return resource|object Resource on PHP < 7.2, HashContext object on PHP >= 7.2
+     * @return HashContext Resource on PHP < 7.2, HashContext object on PHP >= 7.2
      * @throws SodiumException
      * @throws TypeError
-     * @psalm-suppress PossiblyInvalidArgument
-     *                 PHP 7.2 changes from a resource to an object,
-     *                 which causes Psalm to complain about an error.
-     * @psalm-suppress TypeCoercion
-     *                 Ditto.
      */
-    public static function updateHashWithFile($hash, $fp, $size = 0)
+    public static function updateHashWithFile(HashContext $hash, $fp, int $size = 0): HashContext
     {
-        /* Type checks: */
-        if (PHP_VERSION_ID < 70200) {
-            if (!is_resource($hash)) {
-                throw new TypeError('Argument 1 must be a resource, ' . gettype($hash) . ' given.');
-            }
-        } else {
-            if (!is_object($hash)) {
-                throw new TypeError('Argument 1 must be an object (PHP 7.2+), ' . gettype($hash) . ' given.');
-            }
-        }
-
+        /**
+         * @psalm-suppress DocblockTypeContradiction
+         * We can't statically type resources.
+         */
         if (!is_resource($fp)) {
             throw new TypeError('Argument 2 must be a resource, ' . gettype($fp) . ' given.');
         }
-        if (!is_int($size)) {
-            throw new TypeError('Argument 3 must be an integer, ' . gettype($size) . ' given.');
-        }
-
-        /** @var int $originalPosition */
         $originalPosition = self::ftell($fp);
 
         // Move file pointer to beginning of file
-        fseek($fp, 0, SEEK_SET);
+        fseek($fp, 0);
         for ($i = 0; $i < $size; $i += self::BUFFER_SIZE) {
             /** @var string|bool $message */
             $message = fread(
@@ -1169,417 +949,24 @@ class ParagonIE_Sodium_File extends ParagonIE_Sodium_Core_Util
             if (!is_string($message)) {
                 throw new SodiumException('Unexpected error reading from file.');
             }
-            /** @var string $message */
-            /** @psalm-suppress InvalidArgument */
-            self::hash_update($hash, $message);
+            hash_update($hash, $message);
         }
         // Reset file pointer's position
-        fseek($fp, $originalPosition, SEEK_SET);
+        fseek($fp, $originalPosition);
         return $hash;
     }
 
-    /**
-     * Sign a file (rather than a string). Uses less memory than
-     * ParagonIE_Sodium_Compat::crypto_sign_detached(), but produces
-     * the same result. (32-bit)
-     *
-     * @param string $filePath  Absolute path to a file on the filesystem
-     * @param string $secretKey Secret signing key
-     *
-     * @return string           Ed25519 signature
-     * @throws SodiumException
-     * @throws TypeError
-     */
-    private static function sign_core32($filePath, $secretKey)
-    {
-        $size = filesize($filePath);
-        if (!is_int($size)) {
-            throw new SodiumException('Could not obtain the file size');
-        }
-
-        $fp = fopen($filePath, 'rb');
-        if (!is_resource($fp)) {
-            throw new SodiumException('Could not open input file for reading');
-        }
-
-        /** @var string $az */
-        $az = hash('sha512', self::substr($secretKey, 0, 32), true);
-
-        $az[0] = self::intToChr(self::chrToInt($az[0]) & 248);
-        $az[31] = self::intToChr((self::chrToInt($az[31]) & 63) | 64);
-
-        $hs = hash_init('sha512');
-        self::hash_update($hs, self::substr($az, 32, 32));
-        /** @var resource $hs */
-        $hs = self::updateHashWithFile($hs, $fp, $size);
-
-        $nonceHash = hash_final($hs, true);
-        $pk = self::substr($secretKey, 32, 32);
-        $nonce = ParagonIE_Sodium_Core32_Ed25519::sc_reduce($nonceHash) . self::substr($nonceHash, 32);
-        $sig = ParagonIE_Sodium_Core32_Ed25519::ge_p3_tobytes(
-            ParagonIE_Sodium_Core32_Ed25519::ge_scalarmult_base($nonce)
-        );
-
-        $hs = hash_init('sha512');
-        self::hash_update($hs, self::substr($sig, 0, 32));
-        self::hash_update($hs, self::substr($pk, 0, 32));
-        /** @var resource $hs */
-        $hs = self::updateHashWithFile($hs, $fp, $size);
-
-        $hramHash = hash_final($hs, true);
-
-        $hram = ParagonIE_Sodium_Core32_Ed25519::sc_reduce($hramHash);
-
-        $sigAfter = ParagonIE_Sodium_Core32_Ed25519::sc_muladd($hram, $az, $nonce);
-
-        /** @var string $sig */
-        $sig = self::substr($sig, 0, 32) . self::substr($sigAfter, 0, 32);
-
-        try {
-            ParagonIE_Sodium_Compat::memzero($az);
-        } catch (SodiumException $ex) {
-            $az = null;
-        }
-        fclose($fp);
-        return $sig;
-    }
-
-    /**
-     *
-     * Verify a file (rather than a string). Uses less memory than
-     * ParagonIE_Sodium_Compat::crypto_sign_verify_detached(), but
-     * produces the same result. (32-bit)
-     *
-     * @param string $sig       Ed25519 signature
-     * @param string $filePath  Absolute path to a file on the filesystem
-     * @param string $publicKey Signing public key
-     *
-     * @return bool
-     * @throws SodiumException
-     * @throws Exception
-     */
-    public static function verify_core32($sig, $filePath, $publicKey)
-    {
-        /* Security checks */
-        if (ParagonIE_Sodium_Core32_Ed25519::check_S_lt_L(self::substr($sig, 32, 32))) {
-            throw new SodiumException('S < L - Invalid signature');
-        }
-        if (ParagonIE_Sodium_Core32_Ed25519::small_order($sig)) {
-            throw new SodiumException('Signature is on too small of an order');
-        }
-
-        if ((self::chrToInt($sig[63]) & 224) !== 0) {
-            throw new SodiumException('Invalid signature');
-        }
-        $d = 0;
-        for ($i = 0; $i < 32; ++$i) {
-            $d |= self::chrToInt($publicKey[$i]);
-        }
-        if ($d === 0) {
-            throw new SodiumException('All zero public key');
-        }
-
-        /** @var int|bool $size */
-        $size = filesize($filePath);
-        if (!is_int($size)) {
-            throw new SodiumException('Could not obtain the file size');
-        }
-        /** @var int $size */
-
-        /** @var resource|bool $fp */
-        $fp = fopen($filePath, 'rb');
-        if (!is_resource($fp)) {
-            throw new SodiumException('Could not open input file for reading');
-        }
-        /** @var resource $fp */
-
-        /** @var bool The original value of ParagonIE_Sodium_Compat::$fastMult */
-        $orig = ParagonIE_Sodium_Compat::$fastMult;
-
-        // Set ParagonIE_Sodium_Compat::$fastMult to true to speed up verification.
-        ParagonIE_Sodium_Compat::$fastMult = true;
-
-        /** @var ParagonIE_Sodium_Core32_Curve25519_Ge_P3 $A */
-        $A = ParagonIE_Sodium_Core32_Ed25519::ge_frombytes_negate_vartime($publicKey);
-
-        $hs = hash_init('sha512');
-        self::hash_update($hs, self::substr($sig, 0, 32));
-        self::hash_update($hs, self::substr($publicKey, 0, 32));
-        /** @var resource $hs */
-        $hs = self::updateHashWithFile($hs, $fp, $size);
-        /** @var string $hDigest */
-        $hDigest = hash_final($hs, true);
-
-        /** @var string $h */
-        $h = ParagonIE_Sodium_Core32_Ed25519::sc_reduce($hDigest) . self::substr($hDigest, 32);
-
-        /** @var ParagonIE_Sodium_Core32_Curve25519_Ge_P2 $R */
-        $R = ParagonIE_Sodium_Core32_Ed25519::ge_double_scalarmult_vartime(
-            $h,
-            $A,
-            self::substr($sig, 32)
-        );
-
-        /** @var string $rcheck */
-        $rcheck = ParagonIE_Sodium_Core32_Ed25519::ge_tobytes($R);
-
-        // Close the file handle
-        fclose($fp);
-
-        // Reset ParagonIE_Sodium_Compat::$fastMult to what it was before.
-        ParagonIE_Sodium_Compat::$fastMult = $orig;
-        return self::verify_32($rcheck, self::substr($sig, 0, 32));
-    }
-
-    /**
-     * Encrypt a file (32-bit)
-     *
-     * @param resource $ifp
-     * @param resource $ofp
-     * @param int $mlen
-     * @param string $nonce
-     * @param string $key
-     * @return bool
-     * @throws SodiumException
-     * @throws TypeError
-     */
-    protected static function secretbox_encrypt_core32($ifp, $ofp, $mlen, $nonce, $key)
-    {
-        $plaintext = fread($ifp, 32);
-        if (!is_string($plaintext)) {
-            throw new SodiumException('Could not read input file');
-        }
-        $first32 = self::ftell($ifp);
-
-        /** @var string $subkey */
-        $subkey = ParagonIE_Sodium_Core32_HSalsa20::hsalsa20($nonce, $key);
-
-        /** @var string $realNonce */
-        $realNonce = ParagonIE_Sodium_Core32_Util::substr($nonce, 16, 8);
-
-        /** @var string $block0 */
-        $block0 = str_repeat("\x00", 32);
-
-        /** @var int $mlen - Length of the plaintext message */
-        $mlen0 = $mlen;
-        if ($mlen0 > 64 - ParagonIE_Sodium_Crypto::secretbox_xsalsa20poly1305_ZEROBYTES) {
-            $mlen0 = 64 - ParagonIE_Sodium_Crypto::secretbox_xsalsa20poly1305_ZEROBYTES;
-        }
-        $block0 .= ParagonIE_Sodium_Core32_Util::substr($plaintext, 0, $mlen0);
-
-        /** @var string $block0 */
-        $block0 = ParagonIE_Sodium_Core32_Salsa20::salsa20_xor(
-            $block0,
-            $realNonce,
-            $subkey
-        );
-
-        $state = new ParagonIE_Sodium_Core32_Poly1305_State(
-            ParagonIE_Sodium_Core32_Util::substr(
-                $block0,
-                0,
-                ParagonIE_Sodium_Crypto::onetimeauth_poly1305_KEYBYTES
-            )
-        );
-
-        // Pre-write 16 blank bytes for the Poly1305 tag
-        $start = self::ftell($ofp);
-        fwrite($ofp, str_repeat("\x00", 16));
-
-        /** @var string $c */
-        $cBlock = ParagonIE_Sodium_Core32_Util::substr(
-            $block0,
-            ParagonIE_Sodium_Crypto::secretbox_xsalsa20poly1305_ZEROBYTES
-        );
-        $state->update($cBlock);
-        fwrite($ofp, $cBlock);
-        $mlen -= 32;
-
-        /** @var int $iter */
-        $iter = 1;
-
-        /** @var int $incr */
-        $incr = self::BUFFER_SIZE >> 6;
-
-        /*
-         * Set the cursor to the end of the first half-block. All future bytes will
-         * generated from salsa20_xor_ic, starting from 1 (second block).
-         */
-        fseek($ifp, $first32, SEEK_SET);
-
-        while ($mlen > 0) {
-            $blockSize = $mlen > self::BUFFER_SIZE
-                ? self::BUFFER_SIZE
-                : $mlen;
-            $plaintext = fread($ifp, $blockSize);
-            if (!is_string($plaintext)) {
-                throw new SodiumException('Could not read input file');
-            }
-            $cBlock = ParagonIE_Sodium_Core32_Salsa20::salsa20_xor_ic(
-                $plaintext,
-                $realNonce,
-                $iter,
-                $subkey
-            );
-            fwrite($ofp, $cBlock, $blockSize);
-            $state->update($cBlock);
-
-            $mlen -= $blockSize;
-            $iter += $incr;
-        }
-        try {
-            ParagonIE_Sodium_Compat::memzero($block0);
-            ParagonIE_Sodium_Compat::memzero($subkey);
-        } catch (SodiumException $ex) {
-            $block0 = null;
-            $subkey = null;
-        }
-        $end = self::ftell($ofp);
-
-        /*
-         * Write the Poly1305 authentication tag that provides integrity
-         * over the ciphertext (encrypt-then-MAC)
-         */
-        fseek($ofp, $start, SEEK_SET);
-        fwrite($ofp, $state->finish(), ParagonIE_Sodium_Compat::CRYPTO_SECRETBOX_MACBYTES);
-        fseek($ofp, $end, SEEK_SET);
-        unset($state);
-
-        return true;
-    }
-
-    /**
-     * Decrypt a file (32-bit)
-     *
-     * @param resource $ifp
-     * @param resource $ofp
-     * @param int $mlen
-     * @param string $nonce
-     * @param string $key
-     * @return bool
-     * @throws SodiumException
-     * @throws TypeError
-     */
-    protected static function secretbox_decrypt_core32($ifp, $ofp, $mlen, $nonce, $key)
-    {
-        $tag = fread($ifp, 16);
-        if (!is_string($tag)) {
-            throw new SodiumException('Could not read input file');
-        }
-
-        /** @var string $subkey */
-        $subkey = ParagonIE_Sodium_Core32_HSalsa20::hsalsa20($nonce, $key);
-
-        /** @var string $realNonce */
-        $realNonce = ParagonIE_Sodium_Core32_Util::substr($nonce, 16, 8);
-
-        /** @var string $block0 */
-        $block0 = ParagonIE_Sodium_Core32_Salsa20::salsa20(
-            64,
-            ParagonIE_Sodium_Core32_Util::substr($nonce, 16, 8),
-            $subkey
-        );
-
-        /* Verify the Poly1305 MAC -before- attempting to decrypt! */
-        $state = new ParagonIE_Sodium_Core32_Poly1305_State(self::substr($block0, 0, 32));
-        if (!self::onetimeauth_verify_core32($state, $ifp, $tag, $mlen)) {
-            throw new SodiumException('Invalid MAC');
-        }
-
-        /*
-         * Set the cursor to the end of the first half-block. All future bytes will
-         * generated from salsa20_xor_ic, starting from 1 (second block).
-         */
-        $first32 = fread($ifp, 32);
-        if (!is_string($first32)) {
-            throw new SodiumException('Could not read input file');
-        }
-        $first32len = self::strlen($first32);
-        fwrite(
-            $ofp,
-            self::xorStrings(
-                self::substr($block0, 32, $first32len),
-                self::substr($first32, 0, $first32len)
-            )
-        );
-        $mlen -= 32;
-
-        /** @var int $iter */
-        $iter = 1;
-
-        /** @var int $incr */
-        $incr = self::BUFFER_SIZE >> 6;
-
-        /* Decrypts ciphertext, writes to output file. */
-        while ($mlen > 0) {
-            $blockSize = $mlen > self::BUFFER_SIZE
-                ? self::BUFFER_SIZE
-                : $mlen;
-            $ciphertext = fread($ifp, $blockSize);
-            if (!is_string($ciphertext)) {
-                throw new SodiumException('Could not read input file');
-            }
-            $pBlock = ParagonIE_Sodium_Core32_Salsa20::salsa20_xor_ic(
-                $ciphertext,
-                $realNonce,
-                $iter,
-                $subkey
-            );
-            fwrite($ofp, $pBlock, $blockSize);
-            $mlen -= $blockSize;
-            $iter += $incr;
-        }
-        return true;
-    }
-
-    /**
-     * One-time message authentication for 32-bit systems
-     *
-     * @param ParagonIE_Sodium_Core32_Poly1305_State $state
-     * @param resource $ifp
-     * @param string $tag
-     * @param int $mlen
-     * @return bool
-     * @throws SodiumException
-     * @throws TypeError
-     */
-    protected static function onetimeauth_verify_core32(
-        ParagonIE_Sodium_Core32_Poly1305_State $state,
-        $ifp,
-        $tag = '',
-        $mlen = 0
-    ) {
-        /** @var int $pos */
-        $pos = self::ftell($ifp);
-
-        while ($mlen > 0) {
-            $blockSize = $mlen > self::BUFFER_SIZE
-                ? self::BUFFER_SIZE
-                : $mlen;
-            $ciphertext = fread($ifp, $blockSize);
-            if (!is_string($ciphertext)) {
-                throw new SodiumException('Could not read input file');
-            }
-            $state->update($ciphertext);
-            $mlen -= $blockSize;
-        }
-        $res = ParagonIE_Sodium_Core32_Util::verify_16($tag, $state->finish());
-
-        fseek($ifp, $pos, SEEK_SET);
-        return $res;
-    }
-
     /**
      * @param resource $resource
      * @return int
      * @throws SodiumException
      */
-    private static function ftell($resource)
+    private static function ftell($resource): int
     {
         $return = ftell($resource);
         if (!is_int($return)) {
             throw new SodiumException('ftell() returned false');
         }
-        return (int) $return;
+        return $return;
     }
 }

diff --git a/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/PHP52/SplFixedArray.php b/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/PHP52/SplFixedArray.php
deleted file mode 100644 (file)
index c333ad4..0000000
--- a/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/PHP52/SplFixedArray.php
+++ /dev/null
@@ -1,189 +0,0 @@
-<?php
-
-if (class_exists('SplFixedArray')) {
-    return;
-}
-
-/**
- * The SplFixedArray class provides the main functionalities of array. The
- * main differences between a SplFixedArray and a normal PHP array is that
- * the SplFixedArray is of fixed length and allows only integers within
- * the range as indexes. The advantage is that it allows a faster array
- * implementation.
- */
-class SplFixedArray implements Iterator, ArrayAccess, Countable
-{
-    /** @var array<int, mixed> */
-    private $internalArray = array();
-
-    /** @var int $size */
-    private $size = 0;
-
-    /**
-     * SplFixedArray constructor.
-     * @param int $size
-     */
-    public function __construct($size = 0)
-    {
-        $this->size = $size;
-        $this->internalArray = array();
-    }
-
-    /**
-     * @return int
-     */
-    public function count()
-    {
-        return count($this->internalArray);
-    }
-
-    /**
-     * @return array
-     */
-    public function toArray()
-    {
-        ksort($this->internalArray);
-        return (array) $this->internalArray;
-    }
-
-    /**
-     * @param array $array
-     * @param bool $save_indexes
-     * @return SplFixedArray
-     * @psalm-suppress MixedAssignment
-     */
-    public static function fromArray(array $array, $save_indexes = true)
-    {
-        $self = new SplFixedArray(count($array));
-        if($save_indexes) {
-            foreach($array as $key => $value) {
-                $self[(int) $key] = $value;
-            }
-        } else {
-            $i = 0;
-            foreach (array_values($array) as $value) {
-                $self[$i] = $value;
-                $i++;
-            }
-        }
-        return $self;
-    }
-
-    /**
-     * @return int
-     */
-    public function getSize()
-    {
-        return $this->size;
-    }
-
-    /**
-     * @param int $size
-     * @return bool
-     */
-    public function setSize($size)
-    {
-        $this->size = $size;
-        return true;
-    }
-
-    /**
-     * @param string|int $index
-     * @return bool
-     */
-    public function offsetExists($index)
-    {
-        return array_key_exists((int) $index, $this->internalArray);
-    }
-
-    /**
-     * @param string|int $index
-     * @return mixed
-     */
-    public function offsetGet($index)
-    {
-        /** @psalm-suppress MixedReturnStatement */
-        return $this->internalArray[(int) $index];
-    }
-
-    /**
-     * @param string|int $index
-     * @param mixed $newval
-     * @psalm-suppress MixedAssignment
-     */
-    public function offsetSet($index, $newval)
-    {
-        $this->internalArray[(int) $index] = $newval;
-    }
-
-    /**
-     * @param string|int $index
-     */
-    public function offsetUnset($index)
-    {
-        unset($this->internalArray[(int) $index]);
-    }
-
-    /**
-     * Rewind iterator back to the start
-     * @link https://php.net/manual/en/splfixedarray.rewind.php
-     * @return void
-     * @since 5.3.0
-     */
-    public function rewind()
-    {
-        reset($this->internalArray);
-    }
-
-    /**
-     * Return current array entry
-     * @link https://php.net/manual/en/splfixedarray.current.php
-     * @return mixed The current element value.
-     * @since 5.3.0
-     */
-    public function current()
-    {
-        /** @psalm-suppress MixedReturnStatement */
-        return current($this->internalArray);
-    }
-
-    /**
-     * Return current array index
-     * @return int The current array index.
-     */
-    public function key()
-    {
-        return key($this->internalArray);
-    }
-
-    /**
-     * @return void
-     */
-    public function next()
-    {
-        next($this->internalArray);
-    }
-
-    /**
-     * Check whether the array contains more elements
-     * @link https://php.net/manual/en/splfixedarray.valid.php
-     * @return bool true if the array contains any more elements, false otherwise.
-     */
-    public function valid()
-    {
-        if (empty($this->internalArray)) {
-            return false;
-        }
-        $result = next($this->internalArray) !== false;
-        prev($this->internalArray);
-        return $result;
-    }
-
-    /**
-     * Do nothing.
-     */
-    public function __wakeup()
-    {
-        // NOP
-    }
-}
\ No newline at end of file

diff --git a/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/SodiumException.php b/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/SodiumException.php
index a3176d7dd595d62e28ad8227123ae6522208946a..b80c1590a38655718c138a8e8f7b82e7f9e9a270 100644 (file)
--- a/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/SodiumException.php
+++ b/wcfsetup/install/files/lib/system/api/paragonie/sodium_compat/src/SodiumException.php
@@ -1,11 +1,13 @@
 <?php
+declare(strict_types=1);
 
-if (!class_exists('SodiumException', false)) {
-    /**
-     * Class SodiumException
-     */
-    class SodiumException extends Exception
-    {
+if (class_exists('SodiumException', false)) {
+    return;
+}
+/**
+ * Class SodiumException
+ */
+class SodiumException extends Exception
+{
 
-    }
 }

diff --git a/wcfsetup/install/files/lib/system/api/psr/cache/CHANGELOG.md b/wcfsetup/install/files/lib/system/api/psr/cache/CHANGELOG.md
new file mode 100644 (file)
index 0000000..58ddab0
--- /dev/null
+++ b/wcfsetup/install/files/lib/system/api/psr/cache/CHANGELOG.md
@@ -0,0 +1,16 @@
+# Changelog
+
+All notable changes to this project will be documented in this file, in reverse chronological order by release.
+
+## 1.0.1 - 2016-08-06
+
+### Fixed
+
+- Make spacing consistent in phpdoc annotations php-fig/cache#9 - chalasr
+- Fix grammar in phpdoc annotations php-fig/cache#10 - chalasr
+- Be more specific in docblocks that `getItems()` and `deleteItems()` take an array of strings (`string[]`) compared to just `array` php-fig/cache#8 - GrahamCampbell
+- For `expiresAt()` and `expiresAfter()` in CacheItemInterface fix docblock to specify null as a valid parameters as well as an implementation of DateTimeInterface php-fig/cache#7 - GrahamCampbell
+
+## 1.0.0 - 2015-12-11
+
+Initial stable release; reflects accepted PSR-6 specification

diff --git a/wcfsetup/install/files/lib/system/api/psr/cache/LICENSE.txt b/wcfsetup/install/files/lib/system/api/psr/cache/LICENSE.txt
new file mode 100644 (file)
index 0000000..b1c2c97
--- /dev/null
+++ b/wcfsetup/install/files/lib/system/api/psr/cache/LICENSE.txt
@@ -0,0 +1,19 @@
+Copyright (c) 2015 PHP Framework Interoperability Group
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

diff --git a/wcfsetup/install/files/lib/system/api/psr/cache/README.md b/wcfsetup/install/files/lib/system/api/psr/cache/README.md
new file mode 100644 (file)
index 0000000..9855a31
--- /dev/null
+++ b/wcfsetup/install/files/lib/system/api/psr/cache/README.md
@@ -0,0 +1,12 @@
+Caching Interface
+==============
+
+This repository holds all interfaces related to [PSR-6 (Caching Interface)][psr-url].
+
+Note that this is not a Caching implementation of its own. It is merely interfaces that describe the components of a Caching mechanism.
+
+The installable [package][package-url] and [implementations][implementation-url] are listed on Packagist.
+
+[psr-url]: https://www.php-fig.org/psr/psr-6/
+[package-url]: https://packagist.org/packages/psr/cache
+[implementation-url]: https://packagist.org/providers/psr/cache-implementation

diff --git a/wcfsetup/install/files/lib/system/api/psr/cache/composer.json b/wcfsetup/install/files/lib/system/api/psr/cache/composer.json
new file mode 100644 (file)
index 0000000..4b68797
--- /dev/null
+++ b/wcfsetup/install/files/lib/system/api/psr/cache/composer.json
@@ -0,0 +1,25 @@
+{
+    "name": "psr/cache",
+    "description": "Common interface for caching libraries",
+    "keywords": ["psr", "psr-6", "cache"],
+    "license": "MIT",
+    "authors": [
+        {
+            "name": "PHP-FIG",
+            "homepage": "https://www.php-fig.org/"
+        }
+    ],
+    "require": {
+        "php": ">=8.0.0"
+    },
+    "autoload": {
+        "psr-4": {
+            "Psr\\Cache\\": "src/"
+        }
+    },
+    "extra": {
+        "branch-alias": {
+            "dev-master": "1.0.x-dev"
+        }
+    }
+}

diff --git a/wcfsetup/install/files/lib/system/api/psr/cache/src/CacheException.php b/wcfsetup/install/files/lib/system/api/psr/cache/src/CacheException.php
new file mode 100644 (file)
index 0000000..bb785f4
--- /dev/null
+++ b/wcfsetup/install/files/lib/system/api/psr/cache/src/CacheException.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace Psr\Cache;
+
+/**
+ * Exception interface for all exceptions thrown by an Implementing Library.
+ */
+interface CacheException extends \Throwable
+{
+}

diff --git a/wcfsetup/install/files/lib/system/api/psr/cache/src/CacheItemInterface.php b/wcfsetup/install/files/lib/system/api/psr/cache/src/CacheItemInterface.php
new file mode 100644 (file)
index 0000000..2b2e4bb
--- /dev/null
+++ b/wcfsetup/install/files/lib/system/api/psr/cache/src/CacheItemInterface.php
@@ -0,0 +1,105 @@
+<?php
+
+namespace Psr\Cache;
+
+/**
+ * CacheItemInterface defines an interface for interacting with objects inside a cache.
+ *
+ * Each Item object MUST be associated with a specific key, which can be set
+ * according to the implementing system and is typically passed by the
+ * Cache\CacheItemPoolInterface object.
+ *
+ * The Cache\CacheItemInterface object encapsulates the storage and retrieval of
+ * cache items. Each Cache\CacheItemInterface is generated by a
+ * Cache\CacheItemPoolInterface object, which is responsible for any required
+ * setup as well as associating the object with a unique Key.
+ * Cache\CacheItemInterface objects MUST be able to store and retrieve any type
+ * of PHP value defined in the Data section of the specification.
+ *
+ * Calling Libraries MUST NOT instantiate Item objects themselves. They may only
+ * be requested from a Pool object via the getItem() method.  Calling Libraries
+ * SHOULD NOT assume that an Item created by one Implementing Library is
+ * compatible with a Pool from another Implementing Library.
+ */
+interface CacheItemInterface
+{
+    /**
+     * Returns the key for the current cache item.
+     *
+     * The key is loaded by the Implementing Library, but should be available to
+     * the higher level callers when needed.
+     *
+     * @return string
+     *   The key string for this cache item.
+     */
+    public function getKey(): string;
+
+    /**
+     * Retrieves the value of the item from the cache associated with this object's key.
+     *
+     * The value returned must be identical to the value originally stored by set().
+     *
+     * If isHit() returns false, this method MUST return null. Note that null
+     * is a legitimate cached value, so the isHit() method SHOULD be used to
+     * differentiate between "null value was found" and "no value was found."
+     *
+     * @return mixed
+     *   The value corresponding to this cache item's key, or null if not found.
+     */
+    public function get(): mixed;
+
+    /**
+     * Confirms if the cache item lookup resulted in a cache hit.
+     *
+     * Note: This method MUST NOT have a race condition between calling isHit()
+     * and calling get().
+     *
+     * @return bool
+     *   True if the request resulted in a cache hit. False otherwise.
+     */
+    public function isHit(): bool;
+
+    /**
+     * Sets the value represented by this cache item.
+     *
+     * The $value argument may be any item that can be serialized by PHP,
+     * although the method of serialization is left up to the Implementing
+     * Library.
+     *
+     * @param mixed $value
+     *   The serializable value to be stored.
+     *
+     * @return static
+     *   The invoked object.
+     */
+    public function set(mixed $value): static;
+
+    /**
+     * Sets the expiration time for this cache item.
+     *
+     * @param ?\DateTimeInterface $expiration
+     *   The point in time after which the item MUST be considered expired.
+     *   If null is passed explicitly, a default value MAY be used. If none is set,
+     *   the value should be stored permanently or for as long as the
+     *   implementation allows.
+     *
+     * @return static
+     *   The called object.
+     */
+    public function expiresAt(?\DateTimeInterface $expiration): static;
+
+    /**
+     * Sets the expiration time for this cache item.
+     *
+     * @param int|\DateInterval|null $time
+     *   The period of time from the present after which the item MUST be considered
+     *   expired. An integer parameter is understood to be the time in seconds until
+     *   expiration. If null is passed explicitly, a default value MAY be used.
+     *   If none is set, the value should be stored permanently or for as long as the
+     *   implementation allows.
+     *
+     * @return static
+     *   The called object.
+     */
+    public function expiresAfter(int|\DateInterval|null $time): static;
+}

diff --git a/wcfsetup/install/files/lib/system/api/psr/cache/src/CacheItemPoolInterface.php b/wcfsetup/install/files/lib/system/api/psr/cache/src/CacheItemPoolInterface.php
new file mode 100644 (file)
index 0000000..4b3017c
--- /dev/null
+++ b/wcfsetup/install/files/lib/system/api/psr/cache/src/CacheItemPoolInterface.php
@@ -0,0 +1,138 @@
+<?php
+
+namespace Psr\Cache;
+
+/**
+ * CacheItemPoolInterface generates CacheItemInterface objects.
+ *
+ * The primary purpose of Cache\CacheItemPoolInterface is to accept a key from
+ * the Calling Library and return the associated Cache\CacheItemInterface object.
+ * It is also the primary point of interaction with the entire cache collection.
+ * All configuration and initialization of the Pool is left up to an
+ * Implementing Library.
+ */
+interface CacheItemPoolInterface
+{
+    /**
+     * Returns a Cache Item representing the specified key.
+     *
+     * This method must always return a CacheItemInterface object, even in case of
+     * a cache miss. It MUST NOT return null.
+     *
+     * @param string $key
+     *   The key for which to return the corresponding Cache Item.
+     *
+     * @throws InvalidArgumentException
+     *   If the $key string is not a legal value a \Psr\Cache\InvalidArgumentException
+     *   MUST be thrown.
+     *
+     * @return CacheItemInterface
+     *   The corresponding Cache Item.
+     */
+    public function getItem(string $key): CacheItemInterface;
+
+    /**
+     * Returns a traversable set of cache items.
+     *
+     * @param string[] $keys
+     *   An indexed array of keys of items to retrieve.
+     *
+     * @throws InvalidArgumentException
+     *   If any of the keys in $keys are not a legal value a \Psr\Cache\InvalidArgumentException
+     *   MUST be thrown.
+     *
+     * @return iterable
+     *   An iterable collection of Cache Items keyed by the cache keys of
+     *   each item. A Cache item will be returned for each key, even if that
+     *   key is not found. However, if no keys are specified then an empty
+     *   traversable MUST be returned instead.
+     */
+    public function getItems(array $keys = []): iterable;
+
+    /**
+     * Confirms if the cache contains specified cache item.
+     *
+     * Note: This method MAY avoid retrieving the cached value for performance reasons.
+     * This could result in a race condition with CacheItemInterface::get(). To avoid
+     * such situation use CacheItemInterface::isHit() instead.
+     *
+     * @param string $key
+     *   The key for which to check existence.
+     *
+     * @throws InvalidArgumentException
+     *   If the $key string is not a legal value a \Psr\Cache\InvalidArgumentException
+     *   MUST be thrown.
+     *
+     * @return bool
+     *   True if item exists in the cache, false otherwise.
+     */
+    public function hasItem(string $key): bool;
+
+    /**
+     * Deletes all items in the pool.
+     *
+     * @return bool
+     *   True if the pool was successfully cleared. False if there was an error.
+     */
+    public function clear(): bool;
+
+    /**
+     * Removes the item from the pool.
+     *
+     * @param string $key
+     *   The key to delete.
+     *
+     * @throws InvalidArgumentException
+     *   If the $key string is not a legal value a \Psr\Cache\InvalidArgumentException
+     *   MUST be thrown.
+     *
+     * @return bool
+     *   True if the item was successfully removed. False if there was an error.
+     */
+    public function deleteItem(string $key): bool;
+
+    /**
+     * Removes multiple items from the pool.
+     *
+     * @param string[] $keys
+     *   An array of keys that should be removed from the pool.
+     *
+     * @throws InvalidArgumentException
+     *   If any of the keys in $keys are not a legal value a \Psr\Cache\InvalidArgumentException
+     *   MUST be thrown.
+     *
+     * @return bool
+     *   True if the items were successfully removed. False if there was an error.
+     */
+    public function deleteItems(array $keys): bool;
+
+    /**
+     * Persists a cache item immediately.
+     *
+     * @param CacheItemInterface $item
+     *   The cache item to save.
+     *
+     * @return bool
+     *   True if the item was successfully persisted. False if there was an error.
+     */
+    public function save(CacheItemInterface $item): bool;
+
+    /**
+     * Sets a cache item to be persisted later.
+     *
+     * @param CacheItemInterface $item
+     *   The cache item to save.
+     *
+     * @return bool
+     *   False if the item could not be queued or if a commit was attempted and failed. True otherwise.
+     */
+    public function saveDeferred(CacheItemInterface $item): bool;
+
+    /**
+     * Persists any deferred cache items.
+     *
+     * @return bool
+     *   True if all not-yet-saved items were successfully saved or there were none. False otherwise.
+     */
+    public function commit(): bool;
+}

diff --git a/wcfsetup/install/files/lib/system/api/psr/cache/src/InvalidArgumentException.php b/wcfsetup/install/files/lib/system/api/psr/cache/src/InvalidArgumentException.php
new file mode 100644 (file)
index 0000000..be7c6fa
--- /dev/null
+++ b/wcfsetup/install/files/lib/system/api/psr/cache/src/InvalidArgumentException.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace Psr\Cache;
+
+/**
+ * Exception interface for invalid cache arguments.
+ *
+ * Any time an invalid argument is passed into a method it must throw an
+ * exception class which implements Psr\Cache\InvalidArgumentException.
+ */
+interface InvalidArgumentException extends CacheException
+{
+}

diff --git a/wcfsetup/install/files/lib/system/api/web-token/jwt-library/Checker/ClaimCheckerManager.php b/wcfsetup/install/files/lib/system/api/web-token/jwt-library/Checker/ClaimCheckerManager.php
index 5b7230d3e7a26f52c02d50be58f23b188ef58de0..64f0c405b467bee140d71a6bbdcda1b23ef6a4f1 100644 (file)
--- a/wcfsetup/install/files/lib/system/api/web-token/jwt-library/Checker/ClaimCheckerManager.php
+++ b/wcfsetup/install/files/lib/system/api/web-token/jwt-library/Checker/ClaimCheckerManager.php
@@ -22,7 +22,7 @@ class ClaimCheckerManager
     /**
      * @param ClaimChecker[] $checkers
      */
-    public function __construct(array $checkers)
+    public function __construct(iterable $checkers)
     {
         foreach ($checkers as $checker) {
             $this->add($checker);

diff --git a/wcfsetup/install/files/lib/system/api/web-token/jwt-library/Checker/HeaderCheckerManager.php b/wcfsetup/install/files/lib/system/api/web-token/jwt-library/Checker/HeaderCheckerManager.php
index 124bfe920e0c8f9e566979212f72b7d8088b0a77..1b05be6e869ede2360a6f4da61d8f0c76c8467c4 100644 (file)
--- a/wcfsetup/install/files/lib/system/api/web-token/jwt-library/Checker/HeaderCheckerManager.php
+++ b/wcfsetup/install/files/lib/system/api/web-token/jwt-library/Checker/HeaderCheckerManager.php
@@ -28,7 +28,7 @@ class HeaderCheckerManager
      * @param HeaderChecker[] $checkers
      * @param TokenTypeSupport[] $tokenTypes
      */
-    public function __construct(array $checkers, array $tokenTypes)
+    public function __construct(iterable $checkers, iterable $tokenTypes)
     {
         foreach ($checkers as $checker) {
             $this->add($checker);

diff --git a/wcfsetup/install/files/lib/system/api/web-token/jwt-library/Console/GeneratorCommand.php b/wcfsetup/install/files/lib/system/api/web-token/jwt-library/Console/GeneratorCommand.php
index 8f4f58cb4e22276309f230148da278af78df5518..daf7230b39fa25d4afbb5c9968962a066936d874 100644 (file)
--- a/wcfsetup/install/files/lib/system/api/web-token/jwt-library/Console/GeneratorCommand.php
+++ b/wcfsetup/install/files/lib/system/api/web-token/jwt-library/Console/GeneratorCommand.php
@@ -5,8 +5,8 @@ declare(strict_types=1);
 namespace Jose\Component\Console;
 
 use InvalidArgumentException;
+use Jose\Component\Core\Util\Base64UrlSafe;
 use Jose\Component\KeyManagement\JWKFactory;
-use ParagonIE\ConstantTime\Base64UrlSafe;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
 use function is_bool;

diff --git a/wcfsetup/install/files/lib/system/api/web-token/jwt-library/Console/KeyAnalyzerCommand.php b/wcfsetup/install/files/lib/system/api/web-token/jwt-library/Console/KeyAnalyzerCommand.php
index 368fdfa651cc63f81d8ab374f34e1ab67c96e638..0c269b7fa4c66c55ea5777c76612f8bde395b7e3 100644 (file)
--- a/wcfsetup/install/files/lib/system/api/web-token/jwt-library/Console/KeyAnalyzerCommand.php
+++ b/wcfsetup/install/files/lib/system/api/web-token/jwt-library/Console/KeyAnalyzerCommand.php
@@ -26,7 +26,7 @@ final class KeyAnalyzerCommand extends Command
 
     public function __construct(
         private readonly KeyAnalyzerManager $analyzerManager,
-        string $name = null
+        ?string $name = null
     ) {
         parent::__construct($name);
     }

diff --git a/wcfsetup/install/files/lib/system/api/web-token/jwt-library/Console/KeysetAnalyzerCommand.php b/wcfsetup/install/files/lib/system/api/web-token/jwt-library/Console/KeysetAnalyzerCommand.php
index 826afa0c3c2e98fd111bedb1937b3bd44ed338a2..95dfd2f7a0e8fa09f348319c2784e390426caafa 100644 (file)
--- a/wcfsetup/install/files/lib/system/api/web-token/jwt-library/Console/KeysetAnalyzerCommand.php
+++ b/wcfsetup/install/files/lib/system/api/web-token/jwt-library/Console/KeysetAnalyzerCommand.php
@@ -29,7 +29,7 @@ final class KeysetAnalyzerCommand extends Command
     public function __construct(
         private readonly KeysetAnalyzerManager $keysetAnalyzerManager,
         private readonly KeyAnalyzerManager $keyAnalyzerManager,
-        string $name = null
+        ?string $name = null
     ) {
         parent::__construct($name);
     }

diff --git a/wcfsetup/install/files/lib/system/api/web-token/jwt-library/Console/NoneKeyGeneratorCommand.php b/wcfsetup/install/files/lib/system/api/web-token/jwt-library/Console/NoneKeyGeneratorCommand.php
index 86dd6cf91b07fd68ff41ef092093f48c96e8b8ee..ec1e1b59df5e6a5b32f09cb13c0e0b01d31af846 100644 (file)
--- a/wcfsetup/install/files/lib/system/api/web-token/jwt-library/Console/NoneKeyGeneratorCommand.php
+++ b/wcfsetup/install/files/lib/system/api/web-token/jwt-library/Console/NoneKeyGeneratorCommand.php
@@ -5,6 +5,7 @@ declare(strict_types=1);
 namespace Jose\Component\Console;
 
 use Jose\Component\KeyManagement\JWKFactory;
+use Symfony\Component\Console\Attribute\AsCommand;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 

diff --git a/wcfsetup/install/files/lib/system/api/web-token/jwt-library/Console/PublicKeyCommand.php b/wcfsetup/install/files/lib/system/api/web-token/jwt-library/Console/PublicKeyCommand.php
index 81bd93fb96e038ada8312f8d4c54f12902999b2e..fd721b723104338e129f200e8ebb8dfc178516dc 100644 (file)
--- a/wcfsetup/install/files/lib/system/api/web-token/jwt-library/Console/PublicKeyCommand.php
+++ b/wcfsetup/install/files/lib/system/api/web-token/jwt-library/Console/PublicKeyCommand.php
@@ -7,6 +7,7 @@ namespace Jose\Component\Console;
 use InvalidArgumentException;
 use Jose\Component\Core\JWK;
 use Jose\Component\Core\Util\JsonConverter;
+use Symfony\Component\Console\Attribute\AsCommand;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;

diff --git a/wcfsetup/install/files/lib/system/api/web-token/jwt-library/Console/X5ULoaderCommand.php b/wcfsetup/install/files/lib/system/api/web-token/jwt-library/Console/X5ULoaderCommand.php
index 2592c5ba20715f14993153486d0aefdf4d491012..5c7ae16709185563c4cb1c1495e9a5e53664c259 100644 (file)
--- a/wcfsetup/install/files/lib/system/api/web-token/jwt-library/Console/X5ULoaderCommand.php
+++ b/wcfsetup/install/files/lib/system/api/web-token/jwt-library/Console/X5ULoaderCommand.php
@@ -6,6 +6,7 @@ namespace Jose\Component\Console;
 
 use InvalidArgumentException;
 use Jose\Component\KeyManagement\X5UFactory;
+use Symfony\Component\Console\Attribute\AsCommand;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;

diff --git a/wcfsetup/install/files/lib/system/api/web-token/jwt-library/Core/AlgorithmManager.php b/wcfsetup/install/files/lib/system/api/web-token/jwt-library/Core/AlgorithmManager.php
index 147921b5e77fcc5f0f6aaa58d59f84d9e88c27d7..c528c9b4630a15b36c6da3bcf00d60fc301824e5 100644 (file)
--- a/wcfsetup/install/files/lib/system/api/web-token/jwt-library/Core/AlgorithmManager.php
+++ b/wcfsetup/install/files/lib/system/api/web-token/jwt-library/Core/AlgorithmManager.php
@@ -17,7 +17,7 @@ class AlgorithmManager
     /**
      * @param Algorithm[] $algorithms
      */
-    public function __construct(array $algorithms)
+    public function __construct(iterable $algorithms)
     {
         foreach ($algorithms as $algorithm) {
             $this->add($algorithm);

diff --git a/wcfsetup/install/files/lib/system/api/web-token/jwt-library/Core/AlgorithmManagerFactory.php b/wcfsetup/install/files/lib/system/api/web-token/jwt-library/Core/AlgorithmManagerFactory.php
index 3854e668fcfcc11664689839a02bc6cd38c53b3b..4303e512c123cda34c1077e8f1c74feb981d95df 100644 (file)
--- a/wcfsetup/install/files/lib/system/api/web-token/jwt-library/Core/AlgorithmManagerFactory.php
+++ b/wcfsetup/install/files/lib/system/api/web-token/jwt-library/Core/AlgorithmManagerFactory.php
@@ -17,7 +17,7 @@ class AlgorithmManagerFactory
     /**
      * @param Algorithm[] $algorithms
      */
-    public function __construct(array $algorithms = [])
+    public function __construct(iterable $algorithms = [])
     {
         foreach ($algorithms as $algorithm) {
             $this->add($algorithm->name(), $algorithm);

diff --git a/wcfsetup/install/files/lib/system/api/web-token/jwt-library/Core/JWK.php b/wcfsetup/install/files/lib/system/api/web-token/jwt-library/Core/JWK.php
index 9685becf53013bc68f211bb8dbf2d5c6c8648f52..27b4bf3092e238e860f8067d6b2f07f616289019 100644 (file)
--- a/wcfsetup/install/files/lib/system/api/web-token/jwt-library/Core/JWK.php
+++ b/wcfsetup/install/files/lib/system/api/web-token/jwt-library/Core/JWK.php
@@ -5,8 +5,8 @@ declare(strict_types=1);
 namespace Jose\Component\Core;
 
 use InvalidArgumentException;
+use Jose\Component\Core\Util\Base64UrlSafe;
 use JsonSerializable;
-use ParagonIE\ConstantTime\Base64UrlSafe;
 use function array_key_exists;
 use function in_array;
 use function is_array;

diff --git a/wcfsetup/install/files/lib/system/api/web-token/jwt-library/Core/Util/Base64UrlSafe.php b/wcfsetup/install/files/lib/system/api/web-token/jwt-library/Core/Util/Base64UrlSafe.php
new file mode 100644 (file)
index 0000000..e6a6b36
--- /dev/null
+++ b/wcfsetup/install/files/lib/system/api/web-token/jwt-library/Core/Util/Base64UrlSafe.php
@@ -0,0 +1,220 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Jose\Component\Core\Util;
+
+/**
+ *  Copyright (c) 2016 - 2022 Paragon Initiative Enterprises.
+ *  Copyright (c) 2014 Steve "Sc00bz" Thomas (steve at tobtu dot com)
+ *
+ *  Permission is hereby granted, free of charge, to any person obtaining a copy
+ *  of this software and associated documentation files (the "Software"), to deal
+ *  in the Software without restriction, including without limitation the rights
+ *  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ *  copies of the Software, and to permit persons to whom the Software is
+ *  furnished to do so, subject to the following conditions:
+ *
+ *  The above copyright notice and this permission notice shall be included in all
+ *  copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ *  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ *  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ *  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ *  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ *  SOFTWARE.
+ */
+
+use RangeException;
+
+/**
+ * @readonly
+ */
+final class Base64UrlSafe
+{
+    public static function encode(string $binString): string
+    {
+        return static::doEncode($binString, true);
+    }
+
+    public static function encodeUnpadded(string $src): string
+    {
+        return static::doEncode($src, false);
+    }
+
+    public static function decode(string $encodedString, bool $strictPadding = false): string
+    {
+        $srcLen = self::safeStrlen($encodedString);
+        if ($srcLen === 0) {
+            return '';
+        }
+
+        if ($strictPadding) {
+            if (($srcLen & 3) === 0) {
+                if ($encodedString[$srcLen - 1] === '=') {
+                    $srcLen--;
+                    if ($encodedString[$srcLen - 1] === '=') {
+                        $srcLen--;
+                    }
+                }
+            }
+            if (($srcLen & 3) === 1) {
+                throw new RangeException('Incorrect padding');
+            }
+            if ($encodedString[$srcLen - 1] === '=') {
+                throw new RangeException('Incorrect padding');
+            }
+        } else {
+            $encodedString = rtrim($encodedString, '=');
+            $srcLen = self::safeStrlen($encodedString);
+        }
+
+        $err = 0;
+        $dest = '';
+        for ($i = 0; $i + 4 <= $srcLen; $i += 4) {
+            /** @var array<int, int> $chunk */
+            $chunk = unpack('C*', self::safeSubstr($encodedString, $i, 4));
+            $c0 = static::decode6Bits($chunk[1]);
+            $c1 = static::decode6Bits($chunk[2]);
+            $c2 = static::decode6Bits($chunk[3]);
+            $c3 = static::decode6Bits($chunk[4]);
+
+            $dest .= pack(
+                'CCC',
+                ((($c0 << 2) | ($c1 >> 4)) & 0xff),
+                ((($c1 << 4) | ($c2 >> 2)) & 0xff),
+                ((($c2 << 6) | $c3) & 0xff)
+            );
+            $err |= ($c0 | $c1 | $c2 | $c3) >> 8;
+        }
+
+        if ($i < $srcLen) {
+            /** @var array<int, int> $chunk */
+            $chunk = unpack('C*', self::safeSubstr($encodedString, $i, $srcLen - $i));
+            $c0 = static::decode6Bits($chunk[1]);
+
+            if ($i + 2 < $srcLen) {
+                $c1 = static::decode6Bits($chunk[2]);
+                $c2 = static::decode6Bits($chunk[3]);
+                $dest .= pack('CC', ((($c0 << 2) | ($c1 >> 4)) & 0xff), ((($c1 << 4) | ($c2 >> 2)) & 0xff));
+                $err |= ($c0 | $c1 | $c2) >> 8;
+                if ($strictPadding) {
+                    $err |= ($c2 << 6) & 0xff;
+                }
+            } elseif ($i + 1 < $srcLen) {
+                $c1 = static::decode6Bits($chunk[2]);
+                $dest .= pack('C', ((($c0 << 2) | ($c1 >> 4)) & 0xff));
+                $err |= ($c0 | $c1) >> 8;
+                if ($strictPadding) {
+                    $err |= ($c1 << 4) & 0xff;
+                }
+            } elseif ($strictPadding) {
+                $err |= 1;
+            }
+        }
+        $check = ($err === 0);
+        if (! $check) {
+            throw new RangeException('Base64::decode() only expects characters in the correct base64 alphabet');
+        }
+        return $dest;
+    }
+
+    public static function decodeNoPadding(string $encodedString): string
+    {
+        $srcLen = self::safeStrlen($encodedString);
+        if ($srcLen === 0) {
+            return '';
+        }
+        if (($srcLen & 3) === 0) {
+            if ($encodedString[$srcLen - 1] === '=') {
+                throw new InvalidArgumentException("decodeNoPadding() doesn't tolerate padding");
+            }
+            if (($srcLen & 3) > 1) {
+                if ($encodedString[$srcLen - 2] === '=') {
+                    throw new InvalidArgumentException("decodeNoPadding() doesn't tolerate padding");
+                }
+            }
+        }
+        return static::decode($encodedString, true);
+    }
+
+    private static function doEncode(string $src, bool $pad = true): string
+    {
+        $dest = '';
+        $srcLen = self::safeStrlen($src);
+        for ($i = 0; $i + 3 <= $srcLen; $i += 3) {
+            /** @var array<int, int> $chunk */
+            $chunk = unpack('C*', self::safeSubstr($src, $i, 3));
+            $b0 = $chunk[1];
+            $b1 = $chunk[2];
+            $b2 = $chunk[3];
+
+            $dest .=
+                static::encode6Bits($b0 >> 2) .
+                static::encode6Bits((($b0 << 4) | ($b1 >> 4)) & 63) .
+                static::encode6Bits((($b1 << 2) | ($b2 >> 6)) & 63) .
+                static::encode6Bits($b2 & 63);
+        }
+
+        if ($i < $srcLen) {
+            /** @var array<int, int> $chunk */
+            $chunk = unpack('C*', self::safeSubstr($src, $i, $srcLen - $i));
+            $b0 = $chunk[1];
+            if ($i + 1 < $srcLen) {
+                $b1 = $chunk[2];
+                $dest .=
+                    static::encode6Bits($b0 >> 2) .
+                    static::encode6Bits((($b0 << 4) | ($b1 >> 4)) & 63) .
+                    static::encode6Bits(($b1 << 2) & 63);
+                if ($pad) {
+                    $dest .= '=';
+                }
+            } else {
+                $dest .=
+                    static::encode6Bits($b0 >> 2) .
+                    static::encode6Bits(($b0 << 4) & 63);
+                if ($pad) {
+                    $dest .= '==';
+                }
+            }
+        }
+        return $dest;
+    }
+
+    private static function decode6Bits(int $src): int
+    {
+        $ret = -1;
+        $ret += (((0x40 - $src) & ($src - 0x5b)) >> 8) & ($src - 64);
+        $ret += (((0x60 - $src) & ($src - 0x7b)) >> 8) & ($src - 70);
+        $ret += (((0x2f - $src) & ($src - 0x3a)) >> 8) & ($src + 5);
+        $ret += (((0x2c - $src) & ($src - 0x2e)) >> 8) & 63;
+
+        return $ret + ((((0x5e - $src) & ($src - 0x60)) >> 8) & 64);
+    }
+
+    private static function encode6Bits(int $src): string
+    {
+        $diff = 0x41;
+        $diff += ((25 - $src) >> 8) & 6;
+        $diff -= ((51 - $src) >> 8) & 75;
+        $diff -= ((61 - $src) >> 8) & 13;
+        $diff += ((62 - $src) >> 8) & 49;
+
+        return pack('C', $src + $diff);
+    }
+
+    private static function safeStrlen(string $str): int
+    {
+        return mb_strlen($str, '8bit');
+    }
+
+    private static function safeSubstr(string $str, int $start = 0, $length = null): string
+    {
+        if ($length === 0) {
+            return '';
+        }
+        return mb_substr($str, $start, $length, '8bit');
+    }
+}

diff --git a/wcfsetup/install/files/lib/system/api/web-token/jwt-library/Core/Util/ECKey.php b/wcfsetup/install/files/lib/system/api/web-token/jwt-library/Core/Util/ECKey.php
index 6cef96876793f577747bb3c6206cc40c7bc51253..f84123acc9907317c63e9d24857a13e9c705be34 100644 (file)
--- a/wcfsetup/install/files/lib/system/api/web-token/jwt-library/Core/Util/ECKey.php
+++ b/wcfsetup/install/files/lib/system/api/web-token/jwt-library/Core/Util/ECKey.php
@@ -6,13 +6,11 @@ namespace Jose\Component\Core\Util;
 
 use InvalidArgumentException;
 use Jose\Component\Core\JWK;
-use ParagonIE\ConstantTime\Base64UrlSafe;
 use RuntimeException;
 use function extension_loaded;
 use function is_array;
 use function is_string;
 use const OPENSSL_KEYTYPE_EC;
-use const PHP_EOL;
 use const STR_PAD_LEFT;
 
 /**
@@ -39,10 +37,10 @@ final class ECKey
             default => throw new InvalidArgumentException('Unsupported curve.'),
         };
         $der .= self::getKey($jwk);
-        $pem = '-----BEGIN PUBLIC KEY-----' . PHP_EOL;
-        $pem .= chunk_split(base64_encode($der), 64, PHP_EOL);
+        $pem = '-----BEGIN PUBLIC KEY-----' . "\n";
+        $pem .= chunk_split(base64_encode($der), 64, "\n");
 
-        return $pem . ('-----END PUBLIC KEY-----' . PHP_EOL);
+        return $pem . ('-----END PUBLIC KEY-----' . "\n");
     }
 
     public static function convertPrivateKeyToPEM(JWK $jwk): string
@@ -55,10 +53,10 @@ final class ECKey
             default => throw new InvalidArgumentException('Unsupported curve.'),
         };
         $der .= self::getKey($jwk);
-        $pem = '-----BEGIN EC PRIVATE KEY-----' . PHP_EOL;
-        $pem .= chunk_split(base64_encode($der), 64, PHP_EOL);
+        $pem = '-----BEGIN EC PRIVATE KEY-----' . "\n";
+        $pem .= chunk_split(base64_encode($der), 64, "\n");
 
-        return $pem . ('-----END EC PRIVATE KEY-----' . PHP_EOL);
+        return $pem . ('-----END EC PRIVATE KEY-----' . "\n");
     }
 
     /**

diff --git a/wcfsetup/install/files/lib/system/api/web-token/jwt-library/Core/Util/RSAKey.php b/wcfsetup/install/files/lib/system/api/web-token/jwt-library/Core/Util/RSAKey.php
index 7b47d5cc5c8d56d8dd9c42679265b91863a90246..c28fe661e400244ed70684227bab52e021617d42 100644 (file)
--- a/wcfsetup/install/files/lib/system/api/web-token/jwt-library/Core/Util/RSAKey.php
+++ b/wcfsetup/install/files/lib/system/api/web-token/jwt-library/Core/Util/RSAKey.php
@@ -6,7 +6,6 @@ namespace Jose\Component\Core\Util;
 
 use InvalidArgumentException;
 use Jose\Component\Core\JWK;
-use ParagonIE\ConstantTime\Base64UrlSafe;
 use RuntimeException;
 use SpomkyLabs\Pki\ASN1\Type\Constructed\Sequence;
 use SpomkyLabs\Pki\ASN1\Type\Primitive\BitString;

diff --git a/wcfsetup/install/files/lib/system/api/web-token/jwt-library/Encryption/Algorithm/ContentEncryption/AESCBCHS.php b/wcfsetup/install/files/lib/system/api/web-token/jwt-library/Encryption/Algorithm/ContentEncryption/AESCBCHS.php
index 8395db17eba7a27f9b4663cb9e94871c3fc712ae..20395fa08bc590c74bf7d90caf6a1712d27109ad 100644 (file)
--- a/wcfsetup/install/files/lib/system/api/web-token/jwt-library/Encryption/Algorithm/ContentEncryption/AESCBCHS.php
+++ b/wcfsetup/install/files/lib/system/api/web-token/jwt-library/Encryption/Algorithm/ContentEncryption/AESCBCHS.php
@@ -4,8 +4,8 @@ declare(strict_types=1);
 
 namespace Jose\Component\Encryption\Algorithm\ContentEncryption;
 
+use Jose\Component\Core\Util\Base64UrlSafe;
 use Jose\Component\Encryption\Algorithm\ContentEncryptionAlgorithm;
-use ParagonIE\ConstantTime\Base64UrlSafe;
 use RuntimeException;
 use function extension_loaded;
 use const OPENSSL_RAW_DATA;

diff --git a/wcfsetup/install/files/lib/system/api/web-token/jwt-library/Encryption/Algorithm/ContentEncryption/AESGCM.php b/wcfsetup/install/files/lib/system/api/web-token/jwt-library/Encryption/Algorithm/ContentEncryption/AESGCM.php
index c939df464245e9dce6ec2b9d9684f16c5a782927..0b1bf43f89e143298969eebf13050039303c3925 100644 (file)
--- a/wcfsetup/install/files/lib/system/api/web-token/jwt-library/Encryption/Algorithm/ContentEncryption/AESGCM.php
+++ b/wcfsetup/install/files/lib/system/api/web-token/jwt-library/Encryption/Algorithm/ContentEncryption/AESGCM.php
@@ -4,8 +4,8 @@ declare(strict_types=1);
 
 namespace Jose\Component\Encryption\Algorithm\ContentEncryption;
 
+use Jose\Component\Core\Util\Base64UrlSafe;
 use Jose\Component\Encryption\Algorithm\ContentEncryptionAlgorithm;
-use ParagonIE\ConstantTime\Base64UrlSafe;
 use RuntimeException;
 use function extension_loaded;
 use const OPENSSL_RAW_DATA;

diff --git a/wcfsetup/install/files/lib/system/api/web-token/jwt-library/Encryption/Algorithm/KeyEncryption/AESGCMKW.php b/wcfsetup/install/files/lib/system/api/web-token/jwt-library/Encryption/Algorithm/KeyEncryption/AESGCMKW.php
index 82db172ca8a96690de6cde1a47ba71ff83d3d472..37c79d9f0739e3a6464c88b1d0819c10f1b520b1 100644 (file)
--- a/wcfsetup/install/files/lib/system/api/web-token/jwt-library/Encryption/Algorithm/KeyEncryption/AESGCMKW.php
+++ b/wcfsetup/install/files/lib/system/api/web-token/jwt-library/Encryption/Algorithm/KeyEncryption/AESGCMKW.php
@@ -7,7 +7,7 @@ namespace Jose\Component\Encryption\Algorithm\KeyEncryption;
 use AESKW\Wrapper as WrapperInterface;
 use InvalidArgumentException;
 use Jose\Component\Core\JWK;
-use ParagonIE\ConstantTime\Base64UrlSafe;
+use Jose\Component\Core\Util\Base64UrlSafe;
 use RuntimeException;
 use function extension_loaded;
 use function in_array;

diff --git a/wcfsetup/install/files/lib/system/api/web-token/jwt-library/Encryption/Algorithm/KeyEncryption/AESKW.php b/wcfsetup/install/files/lib/system/api/web-token/jwt-library/Encryption/Algorithm/KeyEncryption/AESKW.php
index 909f2a1e124c0005f93aaf62684296b3c7a2aff3..15c408acc31318e26f90eb70a7f9a6927afcfec6 100644 (file)
--- a/wcfsetup/install/files/lib/system/api/web-token/jwt-library/Encryption/Algorithm/KeyEncryption/AESKW.php
+++ b/wcfsetup/install/files/lib/system/api/web-token/jwt-library/Encryption/Algorithm/KeyEncryption/AESKW.php
@@ -7,7 +7,7 @@ namespace Jose\Component\Encryption\Algorithm\KeyEncryption;
 use AESKW\Wrapper as WrapperInterface;
 use InvalidArgumentException;
 use Jose\Component\Core\JWK;
-use ParagonIE\ConstantTime\Base64UrlSafe;
+use Jose\Component\Core\Util\Base64UrlSafe;
 use RuntimeException;
 use function in_array;
 use function is_string;

diff --git a/wcfsetup/install/files/lib/system/api/web-token/jwt-library/Encryption/Algorithm/KeyEncryption/AbstractECDH.php b/wcfsetup/install/files/lib/system/api/web-token/jwt-library/Encryption/Algorithm/KeyEncryption/AbstractECDH.php
index 9027a8e749a72b21324363e059e157242e3f4719..1af2818fd6ecb20a8a85a89d537ac9aa7bbe473c 100644 (file)
--- a/wcfsetup/install/files/lib/system/api/web-token/jwt-library/Encryption/Algorithm/KeyEncryption/AbstractECDH.php
+++ b/wcfsetup/install/files/lib/system/api/web-token/jwt-library/Encryption/Algorithm/KeyEncryption/AbstractECDH.php
@@ -7,13 +7,13 @@ namespace Jose\Component\Encryption\Algorithm\KeyEncryption;
 use Brick\Math\BigInteger;
 use InvalidArgumentException;
 use Jose\Component\Core\JWK;
+use Jose\Component\Core\Util\Base64UrlSafe;
 use Jose\Component\Core\Util\Ecc\Curve;
 use Jose\Component\Core\Util\Ecc\EcDH;
 use Jose\Component\Core\Util\Ecc\NistCurve;
 use Jose\Component\Core\Util\Ecc\PrivateKey;
 use Jose\Component\Core\Util\ECKey;
 use Jose\Component\Encryption\Algorithm\KeyEncryption\Util\ConcatKDF;
-use ParagonIE\ConstantTime\Base64UrlSafe;
 use RuntimeException;
 use Throwable;
 use function array_key_exists;

diff --git a/wcfsetup/install/files/lib/system/api/web-token/jwt-library/Encryption/Algorithm/KeyEncryption/Dir.php b/wcfsetup/install/files/lib/system/api/web-token/jwt-library/Encryption/Algorithm/KeyEncryption/Dir.php
index d01ec49214040accd12a3cc223be720d60a680eb..b4e2211a3ce0ec71ecf7fbdb24618b1568f55422 100644 (file)
--- a/wcfsetup/install/files/lib/system/api/web-token/jwt-library/Encryption/Algorithm/KeyEncryption/Dir.php
+++ b/wcfsetup/install/files/lib/system/api/web-token/jwt-library/Encryption/Algorithm/KeyEncryption/Dir.php
@@ -6,7 +6,7 @@ namespace Jose\Component\Encryption\Algorithm\KeyEncryption;
 
 use InvalidArgumentException;
 use Jose\Component\Core\JWK;
-use ParagonIE\ConstantTime\Base64UrlSafe;
+use Jose\Component\Core\Util\Base64UrlSafe;
 use function in_array;
 use function is_string;
 

diff --git a/wcfsetup/install/files/lib/system/api/web-token/jwt-library/Encryption/Algorithm/KeyEncryption/PBES2AESKW.php b/wcfsetup/install/files/lib/system/api/web-token/jwt-library/Encryption/Algorithm/KeyEncryption/PBES2AESKW.php
index a8222fc653d1e79e6367866e52995131173a8b38..a93f9ee97a508d37ae5367bff9dfd7df56bcfd97 100644 (file)
--- a/wcfsetup/install/files/lib/system/api/web-token/jwt-library/Encryption/Algorithm/KeyEncryption/PBES2AESKW.php
+++ b/wcfsetup/install/files/lib/system/api/web-token/jwt-library/Encryption/Algorithm/KeyEncryption/PBES2AESKW.php
@@ -10,7 +10,7 @@ use AESKW\A256KW;
 use AESKW\Wrapper as WrapperInterface;
 use InvalidArgumentException;
 use Jose\Component\Core\JWK;
-use ParagonIE\ConstantTime\Base64UrlSafe;
+use Jose\Component\Core\Util\Base64UrlSafe;
 use RuntimeException;
 use function in_array;
 use function is_int;

diff --git a/wcfsetup/install/files/lib/system/api/web-token/jwt-library/Encryption/Algorithm/KeyEncryption/Util/ConcatKDF.php b/wcfsetup/install/files/lib/system/api/web-token/jwt-library/Encryption/Algorithm/KeyEncryption/Util/ConcatKDF.php
index f753b6cc33b4a6a42f898ffc3fab61ed3c9d74ee..96e98e100de1e581f8e5bd21c871b76bf5cff415 100644 (file)
--- a/wcfsetup/install/files/lib/system/api/web-token/jwt-library/Encryption/Algorithm/KeyEncryption/Util/ConcatKDF.php
+++ b/wcfsetup/install/files/lib/system/api/web-token/jwt-library/Encryption/Algorithm/KeyEncryption/Util/ConcatKDF.php
@@ -5,7 +5,7 @@ declare(strict_types=1);
 namespace Jose\Component\Encryption\Algorithm\KeyEncryption\Util;
 
 use InvalidArgumentException;
-use ParagonIE\ConstantTime\Base64UrlSafe;
+use Jose\Component\Core\Util\Base64UrlSafe;
 use const STR_PAD_LEFT;
 
 /**

diff --git a/wcfsetup/install/files/lib/system/api/web-token/jwt-library/Encryption/Compression/CompressionMethod.php b/wcfsetup/install/files/lib/system/api/web-token/jwt-library/Encryption/Compression/CompressionMethod.php
index 85d2bf38a2cc20e0fee61bb00920c2c19baa6b78..16b316b47a6bc7d6865ac89de7e21fafcd425a94 100644 (file)
--- a/wcfsetup/install/files/lib/system/api/web-token/jwt-library/Encryption/Compression/CompressionMethod.php
+++ b/wcfsetup/install/files/lib/system/api/web-token/jwt-library/Encryption/Compression/CompressionMethod.php
@@ -4,6 +4,9 @@ declare(strict_types=1);
 
 namespace Jose\Component\Encryption\Compression;
 
+/**
+ * @deprecated This class is deprecated and will be removed in v4.0. Compression is not recommended for JWE.
+ */
 interface CompressionMethod
 {
     /**

diff --git a/wcfsetup/install/files/lib/system/api/web-token/jwt-library/Encryption/Compression/CompressionMethodManager.php b/wcfsetup/install/files/lib/system/api/web-token/jwt-library/Encryption/Compression/CompressionMethodManager.php
index 8a51e6a6bfb5f3af881b1587ed0fab9f1a72942d..3708e3a41c407982031ee8f5058c8138fa7c5fd9 100644 (file)
--- a/wcfsetup/install/files/lib/system/api/web-token/jwt-library/Encryption/Compression/CompressionMethodManager.php
+++ b/wcfsetup/install/files/lib/system/api/web-token/jwt-library/Encryption/Compression/CompressionMethodManager.php
@@ -7,6 +7,9 @@ namespace Jose\Component\Encryption\Compression;
 use InvalidArgumentException;
 use function array_key_exists;
 
+/**
+ * @deprecated This class is deprecated and will be removed in v4.0. Compression is not recommended for JWE.
+ */
 class CompressionMethodManager
 {
     /**
@@ -14,7 +17,10 @@ class CompressionMethodManager
      */
     private array $compressionMethods = [];
 
-    public function __construct(array $methods = [])
+    /**
+     * @param CompressionMethod[] $methods
+     */
+    public function __construct(iterable $methods = [])
     {
         foreach ($methods as $method) {
             $this->add($method);

diff --git a/wcfsetup/install/files/lib/system/api/web-token/jwt-library/Encryption/Compression/CompressionMethodManagerFactory.php b/wcfsetup/install/files/lib/system/api/web-token/jwt-library/Encryption/Compression/CompressionMethodManagerFactory.php
index 806424ef9aabbe1109d290523c6733c6928fdf9f..592ae7bbbb793d92e9caf50f4c0df91e7927952b 100644 (file)
--- a/wcfsetup/install/files/lib/system/api/web-token/jwt-library/Encryption/Compression/CompressionMethodManagerFactory.php
+++ b/wcfsetup/install/files/lib/system/api/web-token/jwt-library/Encryption/Compression/CompressionMethodManagerFactory.php
@@ -6,6 +6,9 @@ namespace Jose\Component\Encryption\Compression;
 
 use InvalidArgumentException;
 
+/**
+ * @deprecated This class is deprecated and will be removed in v4.0. Compression is not recommended for JWE.
+ */
 class CompressionMethodManagerFactory
 {
     /**

diff --git a/wcfsetup/install/files/lib/system/api/web-token/jwt-library/Encryption/Compression/Deflate.php b/wcfsetup/install/files/lib/system/api/web-token/jwt-library/Encryption/Compression/Deflate.php
index 3f87968510c2dd3fa38ca53423dca3eeea36ebe3..5c3deaa4e0a912a681d3dd6d81ace7ee10cba3de 100644 (file)
--- a/wcfsetup/install/files/lib/system/api/web-token/jwt-library/Encryption/Compression/Deflate.php
+++ b/wcfsetup/install/files/lib/system/api/web-token/jwt-library/Encryption/Compression/Deflate.php
@@ -8,6 +8,9 @@ use InvalidArgumentException;
 use Throwable;
 use function is_string;
 
+/**
+ * @deprecated This class is deprecated and will be removed in v4.0. Compression is not recommended for JWE.
+ */
 final class Deflate implements CompressionMethod
 {
     private int $compressionLevel = -1;

diff --git a/wcfsetup/install/files/lib/system/api/web-token/jwt-library/Encryption/JWEBuilder.php b/wcfsetup/install/files/lib/system/api/web-token/jwt-library/Encryption/JWEBuilder.php
index 73827c9c5750c13e04ec4c26e97b220900d202d9..505ae66728866dea09dd5f60a3d0f2eb8ec4b1a3 100644 (file)
--- a/wcfsetup/install/files/lib/system/api/web-token/jwt-library/Encryption/JWEBuilder.php
+++ b/wcfsetup/install/files/lib/system/api/web-token/jwt-library/Encryption/JWEBuilder.php
@@ -7,6 +7,7 @@ namespace Jose\Component\Encryption;
 use InvalidArgumentException;
 use Jose\Component\Core\AlgorithmManager;
 use Jose\Component\Core\JWK;
+use Jose\Component\Core\Util\Base64UrlSafe;
 use Jose\Component\Core\Util\JsonConverter;
 use Jose\Component\Core\Util\KeyChecker;
 use Jose\Component\Encryption\Algorithm\ContentEncryptionAlgorithm;
@@ -19,7 +20,6 @@ use Jose\Component\Encryption\Algorithm\KeyEncryptionAlgorithm;
 use Jose\Component\Encryption\Compression\CompressionMethod;
 use Jose\Component\Encryption\Compression\CompressionMethodManager;
 use LogicException;
-use ParagonIE\ConstantTime\Base64UrlSafe;
 use RuntimeException;
 use function array_key_exists;
 use function count;
@@ -51,9 +51,16 @@ class JWEBuilder
 
     public function __construct(
         AlgorithmManager $algorithmManager,
-        null|AlgorithmManager $contentEncryptionAlgorithmManager,
-        private readonly CompressionMethodManager $compressionManager
+        null|AlgorithmManager $contentEncryptionAlgorithmManager = null,
+        private readonly null|CompressionMethodManager $compressionManager = null
     ) {
+        if ($compressionManager !== null) {
+            trigger_deprecation(
+                'web-token/jwt-library',
+                '3.3.0',
+                'The parameter "$compressionManager" is deprecated and will be removed in 4.0.0. Compression is not recommended for JWE. Please set "null" instead.'
+            );
+        }
         if ($contentEncryptionAlgorithmManager !== null) {
             trigger_deprecation(
                 'web-token/jwt-library',
@@ -113,8 +120,9 @@ class JWEBuilder
 
     /**
      * Returns the compression method manager.
+     * @deprecated This method is deprecated and will be removed in v4.0. Compression is not recommended for JWE.
      */
-    public function getCompressionMethodManager(): CompressionMethodManager
+    public function getCompressionMethodManager(): null|CompressionMethodManager
     {
         return $this->compressionManager;
     }
@@ -124,9 +132,6 @@ class JWEBuilder
      */
     public function withPayload(string $payload): self
     {
-        if (mb_detect_encoding($payload, 'UTF-8', true) !== 'UTF-8') {
-            throw new InvalidArgumentException('The payload must be encoded in UTF-8');
-        }
         $clone = clone $this;
         $clone->payload = $payload;
 
@@ -519,7 +524,7 @@ class JWEBuilder
 
     private function getCompressionMethod(array $completeHeader): ?CompressionMethod
     {
-        if (! array_key_exists('zip', $completeHeader)) {
+        if ($this->compressionManager === null || ! array_key_exists('zip', $completeHeader)) {
             return null;
         }
 

diff --git a/wcfsetup/install/files/lib/system/api/web-token/jwt-library/Encryption/JWEBuilderFactory.php b/wcfsetup/install/files/lib/system/api/web-token/jwt-library/Encryption/JWEBuilderFactory.php
index 37f5d9b1066062dbed6d96b2a4fcfb901898837d..038050898ef286cbc20f16e8314de999184610e0 100644 (file)
--- a/wcfsetup/install/files/lib/system/api/web-token/jwt-library/Encryption/JWEBuilderFactory.php
+++ b/wcfsetup/install/files/lib/system/api/web-token/jwt-library/Encryption/JWEBuilderFactory.php
@@ -11,31 +11,43 @@ class JWEBuilderFactory
 {
     public function __construct(
         private readonly AlgorithmManagerFactory $algorithmManagerFactory,
-        private readonly CompressionMethodManagerFactory $compressionMethodManagerFactory
+        private readonly null|CompressionMethodManagerFactory $compressionMethodManagerFactory = null
     ) {
+        if ($compressionMethodManagerFactory !== null) {
+            trigger_deprecation(
+                'web-token/jwt-library',
+                '3.3.0',
+                'The parameter "$compressionMethodManagerFactory" is deprecated and will be removed in 4.0.0. Compression is not recommended for JWE. Please set "null" instead.'
+            );
+        }
     }
 
     /**
      * Creates a JWE Builder object using the given key encryption algorithms, content encryption algorithms and
      * compression methods.
      *
-     * @param string[] $keyEncryptionAlgorithms
-     * @param string[] $contentEncryptionAlgorithm
-     * @param string[] $compressionMethods
+     * @param array<string> $encryptionAlgorithms
+     * @param null|array<string> $contentEncryptionAlgorithm
+     * @param null|string[] $compressionMethods
      */
     public function create(
-        array $keyEncryptionAlgorithms,
-        array $contentEncryptionAlgorithm,
-        array $compressionMethods
+        array $encryptionAlgorithms,
+        null|array $contentEncryptionAlgorithm = null,
+        null|array $compressionMethods = null
     ): JWEBuilder {
-        $keyEncryptionAlgorithmManager = $this->algorithmManagerFactory->create($keyEncryptionAlgorithms);
-        $contentEncryptionAlgorithmManager = $this->algorithmManagerFactory->create($contentEncryptionAlgorithm);
-        $compressionMethodManager = $this->compressionMethodManagerFactory->create($compressionMethods);
-
-        return new JWEBuilder(
-            $keyEncryptionAlgorithmManager,
-            $contentEncryptionAlgorithmManager,
-            $compressionMethodManager
+        if ($contentEncryptionAlgorithm !== null) {
+            trigger_deprecation(
+                'web-token/jwt-library',
+                '3.3.0',
+                'The parameter "$contentEncryptionAlgorithm" is deprecated and will be removed in 4.0.0. Please set "null" instead.'
+            );
+            $encryptionAlgorithms = array_merge($encryptionAlgorithms, $contentEncryptionAlgorithm);
+        }
+        $encryptionAlgorithmManager = $this->algorithmManagerFactory->create($encryptionAlgorithms);
+        $compressionMethodManager = $compressionMethods === null ? null : $this->compressionMethodManagerFactory?->create(
+            $compressionMethods
         );
+
+        return new JWEBuilder($encryptionAlgorithmManager, null, $compressionMethodManager);
     }
 }

diff --git a/wcfsetup/install/files/lib/system/api/web-token/jwt-library/Encryption/JWEDecrypter.php b/wcfsetup/install/files/lib/system/api/web-token/jwt-library/Encryption/JWEDecrypter.php
index e688112efe6a5bb68855d7306ee550e6c377b255..0b17b4aaba8b3524d06b74825d2525c71dcc717e 100644 (file)
--- a/wcfsetup/install/files/lib/system/api/web-token/jwt-library/Encryption/JWEDecrypter.php
+++ b/wcfsetup/install/files/lib/system/api/web-token/jwt-library/Encryption/JWEDecrypter.php
@@ -31,8 +31,15 @@ class JWEDecrypter
     public function __construct(
         AlgorithmManager $algorithmManager,
         null|AlgorithmManager $contentEncryptionAlgorithmManager,
-        private readonly CompressionMethodManager $compressionMethodManager
+        private readonly null|CompressionMethodManager $compressionMethodManager = null
     ) {
+        if ($compressionMethodManager !== null) {
+            trigger_deprecation(
+                'web-token/jwt-library',
+                '3.3.0',
+                'The parameter "$compressionMethodManager" is deprecated and will be removed in 4.0.0. Compression is not recommended for JWE. Please set "null" instead.'
+            );
+        }
         if ($contentEncryptionAlgorithmManager !== null) {
             trigger_deprecation(
                 'web-token/jwt-library',
@@ -75,8 +82,9 @@ class JWEDecrypter
 
     /**
      * Returns the compression method manager.
+     * @deprecated This method is deprecated and will be removed in v4.0. Compression is not recommended for JWE.
      */
-    public function getCompressionMethodManager(): CompressionMethodManager
+    public function getCompressionMethodManager(): null|CompressionMethodManager
     {
         return $this->compressionMethodManager;
     }
@@ -107,7 +115,7 @@ class JWEDecrypter
         JWE &$jwe,
         JWKSet $jwkset,
         int $recipient,
-        JWK &$jwk = null,
+        ?JWK &$jwk = null,
         ?JWK $senderKey = null
     ): bool {
         if ($jwkset->count() === 0) {
@@ -134,7 +142,7 @@ class JWEDecrypter
         JWE $jwe,
         JWKSet $jwkset,
         int $i,
-        JWK &$successJwk = null,
+        ?JWK &$successJwk = null,
         ?JWK $senderKey = null
     ): ?string {
         $recipient = $jwe->getRecipient($i);
@@ -270,12 +278,13 @@ class JWEDecrypter
 
     private function decompressIfNeeded(string $payload, array $completeHeaders): string
     {
-        if (array_key_exists('zip', $completeHeaders)) {
-            $compression_method = $this->compressionMethodManager->get($completeHeaders['zip']);
-            $payload = $compression_method->uncompress($payload);
+        if ($this->compressionMethodManager === null || ! array_key_exists('zip', $completeHeaders)) {
+            return $payload;
         }
 
-        return $payload;
+        $compression_method = $this->compressionMethodManager->get($completeHeaders['zip']);
+
+        return $compression_method->uncompress($payload);
     }
 
     private function checkCompleteHeader(array $completeHeaders): void

diff --git a/wcfsetup/install/files/lib/system/api/web-token/jwt-library/Encryption/JWEDecrypterFactory.php b/wcfsetup/install/files/lib/system/api/web-token/jwt-library/Encryption/JWEDecrypterFactory.php
index a61ef3bae836c217dff5af8cd1a70dedcc3751ad..0df9b7daed86a4d9f1f9679b5e2f49d02b667671 100644 (file)
--- a/wcfsetup/install/files/lib/system/api/web-token/jwt-library/Encryption/JWEDecrypterFactory.php
+++ b/wcfsetup/install/files/lib/system/api/web-token/jwt-library/Encryption/JWEDecrypterFactory.php
@@ -11,27 +11,38 @@ class JWEDecrypterFactory
 {
     public function __construct(
         private readonly AlgorithmManagerFactory $algorithmManagerFactory,
-        private readonly CompressionMethodManagerFactory $compressionMethodManagerFactory
+        private readonly null|CompressionMethodManagerFactory $compressionMethodManagerFactory = null
     ) {
+        if ($compressionMethodManagerFactory !== null) {
+            trigger_deprecation(
+                'web-token/jwt-library',
+                '3.3.0',
+                'The parameter "$compressionMethodManagerFactory" is deprecated and will be removed in 4.0.0. Compression is not recommended for JWE. Please set "null" instead.'
+            );
+        }
     }
 
     /**
      * Creates a JWE Decrypter object using the given key encryption algorithms, content encryption algorithms and
      * compression methods.
      *
-     * @param string[] $keyEncryptionAlgorithms
-     * @param string[] $contentEncryptionAlgorithms
-     * @param string[] $compressionMethods
+     * @param string[] $encryptionAlgorithms
+     * @param null|string[] $contentEncryptionAlgorithms
+     * @param null|string[] $compressionMethods
      */
     public function create(
-        array $keyEncryptionAlgorithms,
-        array $contentEncryptionAlgorithms,
-        array $compressionMethods
+        array $encryptionAlgorithms,
+        null|array $contentEncryptionAlgorithms = null,
+        null|array $compressionMethods = null
     ): JWEDecrypter {
-        $algorithmManager = $this->algorithmManagerFactory->create(
-            array_merge($keyEncryptionAlgorithms, $contentEncryptionAlgorithms)
+        if ($contentEncryptionAlgorithms !== null) {
+            $encryptionAlgorithms = array_merge($encryptionAlgorithms, $contentEncryptionAlgorithms);
+        }
+
+        $algorithmManager = $this->algorithmManagerFactory->create($encryptionAlgorithms);
+        $compressionMethodManager = $compressionMethods === null ? null : $this->compressionMethodManagerFactory?->create(
+            $compressionMethods
         );
-        $compressionMethodManager = $this->compressionMethodManagerFactory->create($compressionMethods);
 
         return new JWEDecrypter($algorithmManager, null, $compressionMethodManager);
     }

diff --git a/wcfsetup/install/files/lib/system/api/web-token/jwt-library/Encryption/JWELoaderFactory.php b/wcfsetup/install/files/lib/system/api/web-token/jwt-library/Encryption/JWELoaderFactory.php
index 818e2d486314df320a5144445b0524dab46f1577..98159109a3ab706e9d219fde1c38ad036d8a8693 100644 (file)
--- a/wcfsetup/install/files/lib/system/api/web-token/jwt-library/Encryption/JWELoaderFactory.php
+++ b/wcfsetup/install/files/lib/system/api/web-token/jwt-library/Encryption/JWELoaderFactory.php
@@ -22,17 +22,16 @@ class JWELoaderFactory
      */
     public function create(
         array $serializers,
-        array $keyEncryptionAlgorithms,
-        array $contentEncryptionAlgorithms,
-        array $compressionMethods,
+        array $encryptionAlgorithms,
+        null|array $contentEncryptionAlgorithms = null,
+        null|array $compressionMethods = null,
         array $headerCheckers = []
     ): JWELoader {
+        if ($contentEncryptionAlgorithms !== null) {
+            $encryptionAlgorithms = array_merge($encryptionAlgorithms, $contentEncryptionAlgorithms);
+        }
         $serializerManager = $this->jweSerializerManagerFactory->create($serializers);
-        $jweDecrypter = $this->jweDecrypterFactory->create(
-            $keyEncryptionAlgorithms,
-            $contentEncryptionAlgorithms,
-            $compressionMethods
-        );
+        $jweDecrypter = $this->jweDecrypterFactory->create($encryptionAlgorithms, null, $compressionMethods);
         if ($this->headerCheckerManagerFactory !== null) {
             $headerCheckerManager = $this->headerCheckerManagerFactory->create($headerCheckers);
         } else {

diff --git a/wcfsetup/install/files/lib/system/api/web-token/jwt-library/Encryption/Serializer/CompactSerializer.php b/wcfsetup/install/files/lib/system/api/web-token/jwt-library/Encryption/Serializer/CompactSerializer.php
index ba015e8a179a6e0dd7d9f711e6aa618ddcf10c44..4c38ff39b7a9e43120cf182936358b9a9c2a1998 100644 (file)
--- a/wcfsetup/install/files/lib/system/api/web-token/jwt-library/Encryption/Serializer/CompactSerializer.php
+++ b/wcfsetup/install/files/lib/system/api/web-token/jwt-library/Encryption/Serializer/CompactSerializer.php
@@ -5,11 +5,11 @@ declare(strict_types=1);
 namespace Jose\Component\Encryption\Serializer;
 
 use InvalidArgumentException;
+use Jose\Component\Core\Util\Base64UrlSafe;
 use Jose\Component\Core\Util\JsonConverter;
 use Jose\Component\Encryption\JWE;
 use Jose\Component\Encryption\Recipient;
 use LogicException;
-use ParagonIE\ConstantTime\Base64UrlSafe;
 use Throwable;
 use function count;
 use function is_array;

diff --git a/wcfsetup/install/files/lib/system/api/web-token/jwt-library/Encryption/Serializer/JSONFlattenedSerializer.php b/wcfsetup/install/files/lib/system/api/web-token/jwt-library/Encryption/Serializer/JSONFlattenedSerializer.php
index 6ecf28e3eca037b9d8f002351df369f5a2d60496..02ea352eec01db0e9ddc3f9492558d54377d0f22 100644 (file)
--- a/wcfsetup/install/files/lib/system/api/web-token/jwt-library/Encryption/Serializer/JSONFlattenedSerializer.php
+++ b/wcfsetup/install/files/lib/system/api/web-token/jwt-library/Encryption/Serializer/JSONFlattenedSerializer.php
@@ -5,10 +5,10 @@ declare(strict_types=1);
 namespace Jose\Component\Encryption\Serializer;
 
 use InvalidArgumentException;
+use Jose\Component\Core\Util\Base64UrlSafe;
 use Jose\Component\Core\Util\JsonConverter;
 use Jose\Component\Encryption\JWE;
 use Jose\Component\Encryption\Recipient;
-use ParagonIE\ConstantTime\Base64UrlSafe;
 use function array_key_exists;
 use function count;
 use function is_array;

diff --git a/wcfsetup/install/files/lib/system/api/web-token/jwt-library/Encryption/Serializer/JSONGeneralSerializer.php b/wcfsetup/install/files/lib/system/api/web-token/jwt-library/Encryption/Serializer/JSONGeneralSerializer.php
index 96f23dc0a098cc4f426fdd8daef58db416895a9c..15b963a34ef2701387765d9b27ec18d2f4101036 100644 (file)
--- a/wcfsetup/install/files/lib/system/api/web-token/jwt-library/Encryption/Serializer/JSONGeneralSerializer.php
+++ b/wcfsetup/install/files/lib/system/api/web-token/jwt-library/Encryption/Serializer/JSONGeneralSerializer.php
@@ -5,11 +5,11 @@ declare(strict_types=1);
 namespace Jose\Component\Encryption\Serializer;
 
 use InvalidArgumentException;
+use Jose\Component\Core\Util\Base64UrlSafe;
 use Jose\Component\Core\Util\JsonConverter;
 use Jose\Component\Encryption\JWE;
 use Jose\Component\Encryption\Recipient;
 use LogicException;
-use ParagonIE\ConstantTime\Base64UrlSafe;
 use function array_key_exists;
 use function count;
 use function is_array;

diff --git a/wcfsetup/install/files/lib/system/api/web-token/jwt-library/Encryption/Serializer/JWESerializerManager.php b/wcfsetup/install/files/lib/system/api/web-token/jwt-library/Encryption/Serializer/JWESerializerManager.php
index 14641bbaa672b73ddd48d1024473cbc000cf8d82..5082c798833e50e4fa388b8b7c775b4e7c0776d3 100644 (file)
--- a/wcfsetup/install/files/lib/system/api/web-token/jwt-library/Encryption/Serializer/JWESerializerManager.php
+++ b/wcfsetup/install/files/lib/system/api/web-token/jwt-library/Encryption/Serializer/JWESerializerManager.php
@@ -17,7 +17,7 @@ class JWESerializerManager
     /**
      * @param JWESerializer[] $serializers
      */
-    public function __construct(array $serializers)
+    public function __construct(iterable $serializers)
     {
         foreach ($serializers as $serializer) {
             $this->add($serializer);

diff --git a/wcfsetup/install/files/lib/system/api/web-token/jwt-library/KeyManagement/Analyzer/ESKeyAnalyzer.php b/wcfsetup/install/files/lib/system/api/web-token/jwt-library/KeyManagement/Analyzer/ESKeyAnalyzer.php
index 2c0038618f85ff18045bff6fe6e21bdfb9a82fe5..081a6b29286b40e2871df8e9b2f402569cb8cb69 100644 (file)
--- a/wcfsetup/install/files/lib/system/api/web-token/jwt-library/KeyManagement/Analyzer/ESKeyAnalyzer.php
+++ b/wcfsetup/install/files/lib/system/api/web-token/jwt-library/KeyManagement/Analyzer/ESKeyAnalyzer.php
@@ -6,8 +6,8 @@ namespace Jose\Component\KeyManagement\Analyzer;
 
 use Brick\Math\BigInteger;
 use Jose\Component\Core\JWK;
+use Jose\Component\Core\Util\Base64UrlSafe;
 use Jose\Component\Core\Util\Ecc\Curve;
-use ParagonIE\ConstantTime\Base64UrlSafe;
 use function is_string;
 
 abstract class ESKeyAnalyzer implements KeyAnalyzer

diff --git a/wcfsetup/install/files/lib/system/api/web-token/jwt-library/KeyManagement/Analyzer/HSKeyAnalyzer.php b/wcfsetup/install/files/lib/system/api/web-token/jwt-library/KeyManagement/Analyzer/HSKeyAnalyzer.php
index 0e283a5a0cc0a83200e3060436511916e2c78cae..35b7157c75e7a2f6252a47c1f5055168cad74937 100644 (file)
--- a/wcfsetup/install/files/lib/system/api/web-token/jwt-library/KeyManagement/Analyzer/HSKeyAnalyzer.php
+++ b/wcfsetup/install/files/lib/system/api/web-token/jwt-library/KeyManagement/Analyzer/HSKeyAnalyzer.php
@@ -5,7 +5,7 @@ declare(strict_types=1);
 namespace Jose\Component\KeyManagement\Analyzer;
 
 use Jose\Component\Core\JWK;
-use ParagonIE\ConstantTime\Base64UrlSafe;
+use Jose\Component\Core\Util\Base64UrlSafe;
 use function is_string;
 
 abstract class HSKeyAnalyzer implements KeyAnalyzer

diff --git a/wcfsetup/install/files/lib/system/api/web-token/jwt-library/KeyManagement/Analyzer/OctAnalyzer.php b/wcfsetup/install/files/lib/system/api/web-token/jwt-library/KeyManagement/Analyzer/OctAnalyzer.php
index 2405179337abe31555df156e8bd836f41e9aeacf..1d76910655e030539ba7442960570d5194b19840 100644 (file)
--- a/wcfsetup/install/files/lib/system/api/web-token/jwt-library/KeyManagement/Analyzer/OctAnalyzer.php
+++ b/wcfsetup/install/files/lib/system/api/web-token/jwt-library/KeyManagement/Analyzer/OctAnalyzer.php
@@ -5,7 +5,7 @@ declare(strict_types=1);
 namespace Jose\Component\KeyManagement\Analyzer;
 
 use Jose\Component\Core\JWK;
-use ParagonIE\ConstantTime\Base64UrlSafe;
+use Jose\Component\Core\Util\Base64UrlSafe;
 use function is_string;
 
 final class OctAnalyzer implements KeyAnalyzer

diff --git a/wcfsetup/install/files/lib/system/api/web-token/jwt-library/KeyManagement/Analyzer/RsaAnalyzer.php b/wcfsetup/install/files/lib/system/api/web-token/jwt-library/KeyManagement/Analyzer/RsaAnalyzer.php
index 43f0b1f586f41a10dd4cd93235f469923ea41d43..9a354c7e093b150c0aa09c2776b4f3a54f2aa205 100644 (file)
--- a/wcfsetup/install/files/lib/system/api/web-token/jwt-library/KeyManagement/Analyzer/RsaAnalyzer.php
+++ b/wcfsetup/install/files/lib/system/api/web-token/jwt-library/KeyManagement/Analyzer/RsaAnalyzer.php
@@ -6,7 +6,7 @@ namespace Jose\Component\KeyManagement\Analyzer;
 
 use InvalidArgumentException;
 use Jose\Component\Core\JWK;
-use ParagonIE\ConstantTime\Base64UrlSafe;
+use Jose\Component\Core\Util\Base64UrlSafe;
 use function is_array;
 use function is_string;
 

diff --git a/wcfsetup/install/files/lib/system/api/web-token/jwt-library/KeyManagement/Analyzer/ZxcvbnKeyAnalyzer.php b/wcfsetup/install/files/lib/system/api/web-token/jwt-library/KeyManagement/Analyzer/ZxcvbnKeyAnalyzer.php
index 2f5ccb9ab6357fe3a8d69d39ef5f2d61075dca57..43a75fa19bc7fd331b7ec996a36c5d06973fd0ad 100644 (file)
--- a/wcfsetup/install/files/lib/system/api/web-token/jwt-library/KeyManagement/Analyzer/ZxcvbnKeyAnalyzer.php
+++ b/wcfsetup/install/files/lib/system/api/web-token/jwt-library/KeyManagement/Analyzer/ZxcvbnKeyAnalyzer.php
@@ -5,7 +5,7 @@ declare(strict_types=1);
 namespace Jose\Component\KeyManagement\Analyzer;
 
 use Jose\Component\Core\JWK;
-use ParagonIE\ConstantTime\Base64UrlSafe;
+use Jose\Component\Core\Util\Base64UrlSafe;
 use Throwable;
 use ZxcvbnPhp\Zxcvbn;
 use function is_string;

diff --git a/wcfsetup/install/files/lib/system/api/web-token/jwt-library/KeyManagement/JWKFactory.php b/wcfsetup/install/files/lib/system/api/web-token/jwt-library/KeyManagement/JWKFactory.php
index bf42b02771b3379c9c4db8be33e4ba7b53c72223..1bf4ac45cd3e4c592e39ca3de60c9f5db3dc76f6 100644 (file)
--- a/wcfsetup/install/files/lib/system/api/web-token/jwt-library/KeyManagement/JWKFactory.php
+++ b/wcfsetup/install/files/lib/system/api/web-token/jwt-library/KeyManagement/JWKFactory.php
@@ -7,11 +7,11 @@ namespace Jose\Component\KeyManagement;
 use InvalidArgumentException;
 use Jose\Component\Core\JWK;
 use Jose\Component\Core\JWKSet;
+use Jose\Component\Core\Util\Base64UrlSafe;
 use Jose\Component\Core\Util\ECKey;
 use Jose\Component\KeyManagement\KeyConverter\KeyConverter;
 use Jose\Component\KeyManagement\KeyConverter\RSAKey;
 use OpenSSLCertificate;
-use ParagonIE\ConstantTime\Base64UrlSafe;
 use RuntimeException;
 use Throwable;
 use function array_key_exists;

diff --git a/wcfsetup/install/files/lib/system/api/web-token/jwt-library/KeyManagement/KeyConverter/ECKey.php b/wcfsetup/install/files/lib/system/api/web-token/jwt-library/KeyManagement/KeyConverter/ECKey.php
index 8ee1bfad406bd3d69b92f1ab451578855c5d641c..6c3f61a73c3176fd2e43ee48b2b2b4038f927ad7 100644 (file)
--- a/wcfsetup/install/files/lib/system/api/web-token/jwt-library/KeyManagement/KeyConverter/ECKey.php
+++ b/wcfsetup/install/files/lib/system/api/web-token/jwt-library/KeyManagement/KeyConverter/ECKey.php
@@ -5,7 +5,7 @@ declare(strict_types=1);
 namespace Jose\Component\KeyManagement\KeyConverter;
 
 use InvalidArgumentException;
-use ParagonIE\ConstantTime\Base64UrlSafe;
+use Jose\Component\Core\Util\Base64UrlSafe;
 use SpomkyLabs\Pki\CryptoEncoding\PEM;
 use SpomkyLabs\Pki\CryptoTypes\Asymmetric\EC\ECPrivateKey;
 use SpomkyLabs\Pki\CryptoTypes\Asymmetric\EC\ECPublicKey;

diff --git a/wcfsetup/install/files/lib/system/api/web-token/jwt-library/KeyManagement/KeyConverter/KeyConverter.php b/wcfsetup/install/files/lib/system/api/web-token/jwt-library/KeyManagement/KeyConverter/KeyConverter.php
index 82442bb7d49c2bcfaf0772ccb3901ba43f56ab17..f72c66b491c5589b316d13813854e6292170a31f 100644 (file)
--- a/wcfsetup/install/files/lib/system/api/web-token/jwt-library/KeyManagement/KeyConverter/KeyConverter.php
+++ b/wcfsetup/install/files/lib/system/api/web-token/jwt-library/KeyManagement/KeyConverter/KeyConverter.php
@@ -4,14 +4,17 @@ declare(strict_types=1);
 
 namespace Jose\Component\KeyManagement\KeyConverter;
 
+use Brick\Math\BigInteger;
 use InvalidArgumentException;
+use Jose\Component\Core\Util\Base64UrlSafe;
 use OpenSSLCertificate;
-use ParagonIE\ConstantTime\Base64UrlSafe;
 use ParagonIE\Sodium\Core\Ed25519;
 use RuntimeException;
 use SpomkyLabs\Pki\CryptoEncoding\PEM;
+use SpomkyLabs\Pki\CryptoTypes\AlgorithmIdentifier\AlgorithmIdentifier;
 use SpomkyLabs\Pki\CryptoTypes\Asymmetric\PrivateKey;
 use SpomkyLabs\Pki\CryptoTypes\Asymmetric\PublicKey;
+use SpomkyLabs\Pki\CryptoTypes\Asymmetric\RSA\RSASSAPSSPrivateKey;
 use Throwable;
 use function array_key_exists;
 use function assert;
@@ -25,7 +28,6 @@ use const E_PARSE;
 use const OPENSSL_KEYTYPE_EC;
 use const OPENSSL_KEYTYPE_RSA;
 use const OPENSSL_RAW_DATA;
-use const PHP_EOL;
 use const PREG_PATTERN_ORDER;
 
 /**
@@ -142,10 +144,10 @@ final class KeyConverter
             throw new InvalidArgumentException('The certificate chain is empty');
         }
         foreach ($x5c as $id => $cert) {
-            $x5c[$id] = '-----BEGIN CERTIFICATE-----' . PHP_EOL . chunk_split(
+            $x5c[$id] = '-----BEGIN CERTIFICATE-----' . "\n" . chunk_split(
                 (string) $cert,
                 64,
-                PHP_EOL
+                "\n"
             ) . '-----END CERTIFICATE-----';
             $x509 = openssl_x509_read($x5c[$id]);
             if ($x509 === false) {
@@ -229,29 +231,79 @@ final class KeyConverter
     private static function tryToLoadOtherKeyTypes(string $input): array
     {
         $pem = PEM::fromString($input);
+        return match ($pem->type()) {
+            PEM::TYPE_PUBLIC_KEY => self::loadPublicKey($pem),
+            PEM::TYPE_PRIVATE_KEY => self::loadPrivateKey($pem),
+            default => throw new InvalidArgumentException('Unsupported key type'),
+        };
+    }
+
+    /**
+     * @return array<string, mixed>
+     */
+    private static function loadPrivateKey(PEM $pem): array
+    {
         try {
             $key = PrivateKey::fromPEM($pem);
-            $curve = self::getCurve($key->algorithmIdentifier()->oid());
-            $values = [
-                'kty' => 'OKP',
-                'crv' => $curve,
-                'd' => Base64UrlSafe::encodeUnpadded($key->privateKeyData()),
-            ];
-            return self::populatePoints($key, $values);
-        } catch (Throwable) {
+            switch ($key->algorithmIdentifier()->oid()) {
+                case AlgorithmIdentifier::OID_RSASSA_PSS_ENCRYPTION:
+                    assert($key instanceof RSASSAPSSPrivateKey);
+                    return [
+                        'kty' => 'RSA',
+                        'n' => self::convertDecimalToBas64Url($key->modulus()),
+                        'e' => self::convertDecimalToBas64Url($key->publicExponent()),
+                        'd' => self::convertDecimalToBas64Url($key->privateExponent()),
+                        'dp' => self::convertDecimalToBas64Url($key->exponent1()),
+                        'dq' => self::convertDecimalToBas64Url($key->exponent2()),
+                        'p' => self::convertDecimalToBas64Url($key->prime1()),
+                        'q' => self::convertDecimalToBas64Url($key->prime2()),
+                        'qi' => self::convertDecimalToBas64Url($key->coefficient()),
+                    ];
+                case AlgorithmIdentifier::OID_ED25519:
+                case AlgorithmIdentifier::OID_ED448:
+                case AlgorithmIdentifier::OID_X25519:
+                case AlgorithmIdentifier::OID_X448:
+                    $curve = self::getCurve($key->algorithmIdentifier()->oid());
+                    $values = [
+                        'kty' => 'OKP',
+                        'crv' => $curve,
+                        'd' => Base64UrlSafe::encodeUnpadded($key->privateKeyData()),
+                    ];
+                    return self::populatePoints($key, $values);
+                default:
+                    throw new InvalidArgumentException('Unsupported key type');
+            }
+        } catch (Throwable $e) {
+            throw new InvalidArgumentException('Unable to load the key.', 0, $e);
         }
-        try {
-            $key = PublicKey::fromPEM($pem);
-            $curve = self::getCurve($key->algorithmIdentifier()->oid());
-            self::checkType($curve);
-            return [
-                'kty' => 'OKP',
-                'crv' => $curve,
-                'x' => Base64UrlSafe::encodeUnpadded((string) $key->subjectPublicKey()),
-            ];
-        } catch (Throwable) {
+    }
+
+    /**
+     * @return array<string, mixed>
+     */
+    private static function loadPublicKey(PEM $pem): array
+    {
+        $key = PublicKey::fromPEM($pem);
+        switch ($key->algorithmIdentifier()->oid()) {
+            case AlgorithmIdentifier::OID_ED25519:
+            case AlgorithmIdentifier::OID_ED448:
+            case AlgorithmIdentifier::OID_X25519:
+            case AlgorithmIdentifier::OID_X448:
+                $curve = self::getCurve($key->algorithmIdentifier()->oid());
+                self::checkType($curve);
+                return [
+                    'kty' => 'OKP',
+                    'crv' => $curve,
+                    'x' => Base64UrlSafe::encodeUnpadded((string) $key->subjectPublicKey()),
+                ];
+            default:
+                throw new InvalidArgumentException('Unsupported key type');
         }
-        throw new InvalidArgumentException('Unsupported key type');
+    }
+
+    private static function convertDecimalToBas64Url(string $decimal): string
+    {
+        return Base64UrlSafe::encodeUnpadded(BigInteger::fromBase($decimal, 10)->toBytes());
     }
 
     /**
@@ -312,12 +364,16 @@ final class KeyConverter
      */
     private static function sanitizePEM(string &$pem): void
     {
-        preg_match_all('#(-.*-)#', $pem, $matches, PREG_PATTERN_ORDER);
+        $number = preg_match_all('#(-.*-)#', $pem, $matches, PREG_PATTERN_ORDER);
+        if ($number !== 2) {
+            throw new InvalidArgumentException('Unable to load the key');
+        }
+
         $ciphertext = preg_replace('#-.*-|\r|\n| #', '', $pem);
 
-        $pem = $matches[0][0] . PHP_EOL;
-        $pem .= chunk_split($ciphertext ?? '', 64, PHP_EOL);
-        $pem .= $matches[0][1] . PHP_EOL;
+        $pem = $matches[0][0] . "\n";
+        $pem .= chunk_split($ciphertext ?? '', 64, "\n");
+        $pem .= $matches[0][1] . "\n";
     }
 
     /**
@@ -348,16 +404,16 @@ final class KeyConverter
             throw new InvalidArgumentException('Unable to load the key');
         }
 
-        $pem = $result[0][0] . PHP_EOL;
+        $pem = $result[0][0] . "\n";
         $pem .= chunk_split(base64_encode($decoded), 64);
 
-        return $pem . ($result[0][1] . PHP_EOL);
+        return $pem . ($result[0][1] . "\n");
     }
 
     private static function convertDerToPem(string $der_data): string
     {
-        $pem = chunk_split(base64_encode($der_data), 64, PHP_EOL);
+        $pem = chunk_split(base64_encode($der_data), 64, "\n");
 
-        return '-----BEGIN CERTIFICATE-----' . PHP_EOL . $pem . '-----END CERTIFICATE-----' . PHP_EOL;
+        return '-----BEGIN CERTIFICATE-----' . "\n" . $pem . '-----END CERTIFICATE-----' . "\n";
     }
 }

diff --git a/wcfsetup/install/files/lib/system/api/web-token/jwt-library/KeyManagement/KeyConverter/RSAKey.php b/wcfsetup/install/files/lib/system/api/web-token/jwt-library/KeyManagement/KeyConverter/RSAKey.php
index ff98ea3761f0b1e57bbea2bb1d094ef1b0e92891..fe48e87dde4509360bb968a059e65a261bd3e6a7 100644 (file)
--- a/wcfsetup/install/files/lib/system/api/web-token/jwt-library/KeyManagement/KeyConverter/RSAKey.php
+++ b/wcfsetup/install/files/lib/system/api/web-token/jwt-library/KeyManagement/KeyConverter/RSAKey.php
@@ -6,8 +6,8 @@ namespace Jose\Component\KeyManagement\KeyConverter;
 
 use InvalidArgumentException;
 use Jose\Component\Core\JWK;
+use Jose\Component\Core\Util\Base64UrlSafe;
 use Jose\Component\Core\Util\BigInteger;
-use ParagonIE\ConstantTime\Base64UrlSafe;
 use RuntimeException;
 use function array_key_exists;
 use function extension_loaded;

diff --git a/wcfsetup/install/files/lib/system/api/web-token/jwt-library/KeyManagement/UrlKeySetFactory.php b/wcfsetup/install/files/lib/system/api/web-token/jwt-library/KeyManagement/UrlKeySetFactory.php
index 6bd2553ca719a269f90c17a36c5dee78f0e0183f..ede4d62d7b48f4aa881dcbc1c37b579b54dd8839 100644 (file)
--- a/wcfsetup/install/files/lib/system/api/web-token/jwt-library/KeyManagement/UrlKeySetFactory.php
+++ b/wcfsetup/install/files/lib/system/api/web-token/jwt-library/KeyManagement/UrlKeySetFactory.php
@@ -4,9 +4,11 @@ declare(strict_types=1);
 
 namespace Jose\Component\KeyManagement;
 
+use Psr\Cache\CacheItemPoolInterface;
 use Psr\Http\Client\ClientInterface;
 use Psr\Http\Message\RequestFactoryInterface;
 use RuntimeException;
+use Symfony\Component\Cache\Adapter\NullAdapter;
 use Symfony\Contracts\HttpClient\HttpClientInterface;
 use function assert;
 
@@ -15,6 +17,10 @@ use function assert;
  */
 abstract class UrlKeySetFactory
 {
+    private CacheItemPoolInterface $cacheItemPool;
+
+    private int $expiresAfter = 3600;
+
     public function __construct(
         private readonly ClientInterface|HttpClientInterface $client,
         private readonly null|RequestFactoryInterface $requestFactory = null
@@ -35,6 +41,13 @@ abstract class UrlKeySetFactory
                 ClientInterface::class
             ));
         }
+        $this->cacheItemPool = new NullAdapter();
+    }
+
+    public function enabledCache(CacheItemPoolInterface $cacheItemPool, int $expiresAfter = 3600): void
+    {
+        $this->cacheItemPool = $cacheItemPool;
+        $this->expiresAfter = $expiresAfter;
     }
 
     /**
@@ -42,10 +55,22 @@ abstract class UrlKeySetFactory
      */
     protected function getContent(string $url, array $header = []): string
     {
-        if ($this->client instanceof HttpClientInterface) {
-            return $this->sendSymfonyRequest($url, $header);
+        $cacheKey = hash('xxh128', $url);
+        $item = $this->cacheItemPool->getItem($cacheKey);
+        if ($item->isHit()) {
+            return $item->get();
         }
-        return $this->sendPsrRequest($url, $header);
+
+        $content = $this->client instanceof HttpClientInterface ? $this->sendSymfonyRequest(
+            $url,
+            $header
+        ) : $this->sendPsrRequest($url, $header);
+        $item = $this->cacheItemPool->getItem($cacheKey);
+        $item->expiresAfter($this->expiresAfter);
+        $item->set($content);
+        $this->cacheItemPool->save($item);
+
+        return $content;
     }
 
     /**

diff --git a/wcfsetup/install/files/lib/system/api/web-token/jwt-library/KeyManagement/X5UFactory.php b/wcfsetup/install/files/lib/system/api/web-token/jwt-library/KeyManagement/X5UFactory.php
index 1eaf9bf52fb2afe2b5c79fb57eeabdc4605914a1..f08c2d8ed6a5e623d8d3d695724f5a0d2e419967 100644 (file)
--- a/wcfsetup/install/files/lib/system/api/web-token/jwt-library/KeyManagement/X5UFactory.php
+++ b/wcfsetup/install/files/lib/system/api/web-token/jwt-library/KeyManagement/X5UFactory.php
@@ -11,7 +11,6 @@ use Jose\Component\KeyManagement\KeyConverter\KeyConverter;
 use RuntimeException;
 use function is_array;
 use function is_string;
-use const PHP_EOL;
 
 class X5UFactory extends UrlKeySetFactory
 {
@@ -29,7 +28,7 @@ class X5UFactory extends UrlKeySetFactory
         $keys = [];
         foreach ($data as $kid => $cert) {
             if (mb_strpos((string) $cert, '-----BEGIN CERTIFICATE-----') === false) {
-                $cert = '-----BEGIN CERTIFICATE-----' . PHP_EOL . $cert . PHP_EOL . '-----END CERTIFICATE-----';
+                $cert = '-----BEGIN CERTIFICATE-----' . "\n" . $cert . "\n" . '-----END CERTIFICATE-----';
             }
             $jwk = KeyConverter::loadKeyFromCertificate($cert);
             if (is_string($kid)) {

diff --git a/wcfsetup/install/files/lib/system/api/web-token/jwt-library/NestedToken/NestedTokenBuilderFactory.php b/wcfsetup/install/files/lib/system/api/web-token/jwt-library/NestedToken/NestedTokenBuilderFactory.php
index 81269e829aec99033b97dbc9d543cb270e2853b3..f3f9259ff2ee8fb3796d5205397bb1c4ebeba284 100644 (file)
--- a/wcfsetup/install/files/lib/system/api/web-token/jwt-library/NestedToken/NestedTokenBuilderFactory.php
+++ b/wcfsetup/install/files/lib/system/api/web-token/jwt-library/NestedToken/NestedTokenBuilderFactory.php
@@ -24,25 +24,24 @@ class NestedTokenBuilderFactory
      * compression methods.
      *
      * @param array<string> $jwe_serializers
-     * @param array<string> $keyEncryptionAlgorithms
-     * @param array<string> $contentEncryptionAlgorithms
-     * @param array<string> $compressionMethods
+     * @param array<string> $encryptionAlgorithms
+     * @param null|array<string> $contentEncryptionAlgorithms
+     * @param null|array<string> $compressionMethods
      * @param array<string> $jws_serializers
      * @param array<string> $signatureAlgorithms
      */
     public function create(
         array $jwe_serializers,
-        array $keyEncryptionAlgorithms,
-        array $contentEncryptionAlgorithms,
-        array $compressionMethods,
+        array $encryptionAlgorithms,
+        null|array $contentEncryptionAlgorithms,
+        null|array $compressionMethods,
         array $jws_serializers,
         array $signatureAlgorithms
     ): NestedTokenBuilder {
-        $jweBuilder = $this->jweBuilderFactory->create(
-            $keyEncryptionAlgorithms,
-            $contentEncryptionAlgorithms,
-            $compressionMethods
-        );
+        if ($contentEncryptionAlgorithms !== null) {
+            $encryptionAlgorithms = array_merge($encryptionAlgorithms, $contentEncryptionAlgorithms);
+        }
+        $jweBuilder = $this->jweBuilderFactory->create($encryptionAlgorithms, null, $compressionMethods);
         $jweSerializerManager = $this->jweSerializerManagerFactory->create($jwe_serializers);
         $jwsBuilder = $this->jwsBuilderFactory->create($signatureAlgorithms);
         $jwsSerializerManager = $this->jwsSerializerManagerFactory->create($jws_serializers);

diff --git a/wcfsetup/install/files/lib/system/api/web-token/jwt-library/NestedToken/NestedTokenLoaderFactory.php b/wcfsetup/install/files/lib/system/api/web-token/jwt-library/NestedToken/NestedTokenLoaderFactory.php
index eb2d7bd598ae68e1b857b41907d7b3adc5f543cb..632ff5e87e169f4afb192962b208051b60dda7be 100644 (file)
--- a/wcfsetup/install/files/lib/system/api/web-token/jwt-library/NestedToken/NestedTokenLoaderFactory.php
+++ b/wcfsetup/install/files/lib/system/api/web-token/jwt-library/NestedToken/NestedTokenLoaderFactory.php
@@ -22,7 +22,7 @@ class NestedTokenLoaderFactory
      * @param array<string> $jweSerializers
      * @param array<string> $keyEncryptionAlgorithms
      * @param array<string> $contentEncryptionAlgorithms
-     * @param array<string> $compressionMethods
+     * @param null|array<string> $compressionMethods
      * @param array<string> $jweHeaderCheckers
      * @param array<string> $jwsSerializers
      * @param array<string> $signatureAlgorithms
@@ -31,8 +31,8 @@ class NestedTokenLoaderFactory
     public function create(
         array $jweSerializers,
         array $keyEncryptionAlgorithms,
-        array $contentEncryptionAlgorithms,
-        array $compressionMethods,
+        null|array $contentEncryptionAlgorithms,
+        null|array $compressionMethods,
         array $jweHeaderCheckers,
         array $jwsSerializers,
         array $signatureAlgorithms,

diff --git a/wcfsetup/install/files/lib/system/api/web-token/jwt-library/Signature/Algorithm/EdDSA.php b/wcfsetup/install/files/lib/system/api/web-token/jwt-library/Signature/Algorithm/EdDSA.php
index 6d59ce4d4887c926fe3515338cad15219767b131..cd09113e3dfe4b48661f0df0ad7ae1bcab2253bb 100644 (file)
--- a/wcfsetup/install/files/lib/system/api/web-token/jwt-library/Signature/Algorithm/EdDSA.php
+++ b/wcfsetup/install/files/lib/system/api/web-token/jwt-library/Signature/Algorithm/EdDSA.php
@@ -6,7 +6,7 @@ namespace Jose\Component\Signature\Algorithm;
 
 use InvalidArgumentException;
 use Jose\Component\Core\JWK;
-use ParagonIE\ConstantTime\Base64UrlSafe;
+use Jose\Component\Core\Util\Base64UrlSafe;
 use ParagonIE\Sodium\Core\Ed25519;
 use RuntimeException;
 use function assert;

diff --git a/wcfsetup/install/files/lib/system/api/web-token/jwt-library/Signature/Algorithm/HMAC.php b/wcfsetup/install/files/lib/system/api/web-token/jwt-library/Signature/Algorithm/HMAC.php
index badda9871c7575bc01d84c63def37a38d92acba7..92436b00732cbc46e997c8a5d4c1010db7ecf029 100644 (file)
--- a/wcfsetup/install/files/lib/system/api/web-token/jwt-library/Signature/Algorithm/HMAC.php
+++ b/wcfsetup/install/files/lib/system/api/web-token/jwt-library/Signature/Algorithm/HMAC.php
@@ -6,7 +6,7 @@ namespace Jose\Component\Signature\Algorithm;
 
 use InvalidArgumentException;
 use Jose\Component\Core\JWK;
-use ParagonIE\ConstantTime\Base64UrlSafe;
+use Jose\Component\Core\Util\Base64UrlSafe;
 use function in_array;
 use function is_string;
 

diff --git a/wcfsetup/install/files/lib/system/api/web-token/jwt-library/Signature/JWSBuilder.php b/wcfsetup/install/files/lib/system/api/web-token/jwt-library/Signature/JWSBuilder.php
index 84201cc6c171aeae6c493a0253889a07bf611ac3..3c1a1661d465acf04a11119b633c4dc36c12a3d2 100644 (file)
--- a/wcfsetup/install/files/lib/system/api/web-token/jwt-library/Signature/JWSBuilder.php
+++ b/wcfsetup/install/files/lib/system/api/web-token/jwt-library/Signature/JWSBuilder.php
@@ -8,12 +8,12 @@ use InvalidArgumentException;
 use Jose\Component\Core\Algorithm;
 use Jose\Component\Core\AlgorithmManager;
 use Jose\Component\Core\JWK;
+use Jose\Component\Core\Util\Base64UrlSafe;
 use Jose\Component\Core\Util\JsonConverter;
 use Jose\Component\Core\Util\KeyChecker;
 use Jose\Component\Signature\Algorithm\MacAlgorithm;
 use Jose\Component\Signature\Algorithm\SignatureAlgorithm;
 use LogicException;
-use ParagonIE\ConstantTime\Base64UrlSafe;
 use RuntimeException;
 use function array_key_exists;
 use function count;

diff --git a/wcfsetup/install/files/lib/system/api/web-token/jwt-library/Signature/JWSVerifier.php b/wcfsetup/install/files/lib/system/api/web-token/jwt-library/Signature/JWSVerifier.php
index d750a507d296b8921879b4cfc8c5e677a6363715..1944c4ddff87ed0a17039f887ea62fa12e78b6c2 100644 (file)
--- a/wcfsetup/install/files/lib/system/api/web-token/jwt-library/Signature/JWSVerifier.php
+++ b/wcfsetup/install/files/lib/system/api/web-token/jwt-library/Signature/JWSVerifier.php
@@ -9,10 +9,10 @@ use Jose\Component\Core\Algorithm;
 use Jose\Component\Core\AlgorithmManager;
 use Jose\Component\Core\JWK;
 use Jose\Component\Core\JWKSet;
+use Jose\Component\Core\Util\Base64UrlSafe;
 use Jose\Component\Core\Util\KeyChecker;
 use Jose\Component\Signature\Algorithm\MacAlgorithm;
 use Jose\Component\Signature\Algorithm\SignatureAlgorithm;
-use ParagonIE\ConstantTime\Base64UrlSafe;
 use Throwable;
 
 class JWSVerifier
@@ -59,7 +59,7 @@ class JWSVerifier
         JWKSet $jwkset,
         int $signatureIndex,
         ?string $detachedPayload = null,
-        JWK &$jwk = null
+        ?JWK &$jwk = null
     ): bool {
         if ($jwkset->count() === 0) {
             throw new InvalidArgumentException('There is no key in the key set.');
@@ -78,7 +78,7 @@ class JWSVerifier
         JWKSet $jwkset,
         Signature $signature,
         ?string $detachedPayload = null,
-        JWK &$successJwk = null
+        ?JWK &$successJwk = null
     ): bool {
         $input = $this->getInputToVerify($jws, $signature, $detachedPayload);
         $algorithm = $this->getAlgorithm($signature);

diff --git a/wcfsetup/install/files/lib/system/api/web-token/jwt-library/Signature/Serializer/CompactSerializer.php b/wcfsetup/install/files/lib/system/api/web-token/jwt-library/Signature/Serializer/CompactSerializer.php
index 3a657a147893acc16765eef532be3066edbebbe2..03a9c0d7846b5ee9e233fbbb8c851c29a8f8568e 100644 (file)
--- a/wcfsetup/install/files/lib/system/api/web-token/jwt-library/Signature/Serializer/CompactSerializer.php
+++ b/wcfsetup/install/files/lib/system/api/web-token/jwt-library/Signature/Serializer/CompactSerializer.php
@@ -5,10 +5,10 @@ declare(strict_types=1);
 namespace Jose\Component\Signature\Serializer;
 
 use InvalidArgumentException;
+use Jose\Component\Core\Util\Base64UrlSafe;
 use Jose\Component\Core\Util\JsonConverter;
 use Jose\Component\Signature\JWS;
 use LogicException;
-use ParagonIE\ConstantTime\Base64UrlSafe;
 use Throwable;
 use function count;
 use function is_array;

diff --git a/wcfsetup/install/files/lib/system/api/web-token/jwt-library/Signature/Serializer/JSONFlattenedSerializer.php b/wcfsetup/install/files/lib/system/api/web-token/jwt-library/Signature/Serializer/JSONFlattenedSerializer.php
index 1a8b4cb006e539a0241a177fcb8fcf1d8bb8f4d5..93dae92c38aaf1adc3419ff6042490b86409c371 100644 (file)
--- a/wcfsetup/install/files/lib/system/api/web-token/jwt-library/Signature/Serializer/JSONFlattenedSerializer.php
+++ b/wcfsetup/install/files/lib/system/api/web-token/jwt-library/Signature/Serializer/JSONFlattenedSerializer.php
@@ -5,9 +5,9 @@ declare(strict_types=1);
 namespace Jose\Component\Signature\Serializer;
 
 use InvalidArgumentException;
+use Jose\Component\Core\Util\Base64UrlSafe;
 use Jose\Component\Core\Util\JsonConverter;
 use Jose\Component\Signature\JWS;
-use ParagonIE\ConstantTime\Base64UrlSafe;
 use function count;
 use function is_array;
 

diff --git a/wcfsetup/install/files/lib/system/api/web-token/jwt-library/Signature/Serializer/JSONGeneralSerializer.php b/wcfsetup/install/files/lib/system/api/web-token/jwt-library/Signature/Serializer/JSONGeneralSerializer.php
index 1905e645e42991ac156662f716882dc65a599447..43acd0e0ae1d242966461e877004ebd200c2ebdf 100644 (file)
--- a/wcfsetup/install/files/lib/system/api/web-token/jwt-library/Signature/Serializer/JSONGeneralSerializer.php
+++ b/wcfsetup/install/files/lib/system/api/web-token/jwt-library/Signature/Serializer/JSONGeneralSerializer.php
@@ -5,10 +5,10 @@ declare(strict_types=1);
 namespace Jose\Component\Signature\Serializer;
 
 use InvalidArgumentException;
+use Jose\Component\Core\Util\Base64UrlSafe;
 use Jose\Component\Core\Util\JsonConverter;
 use Jose\Component\Signature\JWS;
 use LogicException;
-use ParagonIE\ConstantTime\Base64UrlSafe;
 use function array_key_exists;
 use function count;
 use function is_array;

diff --git a/wcfsetup/install/files/lib/system/api/web-token/jwt-library/Signature/Serializer/JWSSerializerManager.php b/wcfsetup/install/files/lib/system/api/web-token/jwt-library/Signature/Serializer/JWSSerializerManager.php
index fdf5b481c80fbe5e5af2190fe2a6adf823df6124..ebdfc70dfaf30ba412254eaa44b6328d40dc4071 100644 (file)
--- a/wcfsetup/install/files/lib/system/api/web-token/jwt-library/Signature/Serializer/JWSSerializerManager.php
+++ b/wcfsetup/install/files/lib/system/api/web-token/jwt-library/Signature/Serializer/JWSSerializerManager.php
@@ -17,7 +17,7 @@ class JWSSerializerManager
     /**
      * @param JWSSerializer[] $serializers
      */
-    public function __construct(array $serializers)
+    public function __construct(iterable $serializers)
     {
         foreach ($serializers as $serializer) {
             $this->add($serializer);

diff --git a/wcfsetup/install/files/lib/system/api/web-token/jwt-library/composer.json b/wcfsetup/install/files/lib/system/api/web-token/jwt-library/composer.json
index bf35f837be0cde862cdfc6b77c6f486bdfbee65f..fee12b4785ee484d9b881b0f9c51fbfedb8f1bdc 100644 (file)
--- a/wcfsetup/install/files/lib/system/api/web-token/jwt-library/composer.json
+++ b/wcfsetup/install/files/lib/system/api/web-token/jwt-library/composer.json
@@ -42,12 +42,13 @@
         "ext-json": "*",
         "ext-mbstring": "*",
         "brick/math": "^0.9|^0.10|^0.11|^0.12",
-        "paragonie/constant_time_encoding": "^2.6",
-        "paragonie/sodium_compat": "^1.20",
+        "paragonie/constant_time_encoding": "^2.6|^3.0",
+        "paragonie/sodium_compat": "^1.20|^2.0",
+        "psr/cache": "^3.0",
         "psr/clock": "^1.0",
         "psr/http-factory": "^1.0",
         "psr/http-client": "^1.0",
-        "spomky-labs/pki-framework": "^1.0",
+        "spomky-labs/pki-framework": "^1.2.1",
         "symfony/console": "^5.4|^6.0|^7.0",
         "symfony/http-client": "^5.4|^6.0|^7.0",
         "symfony/polyfill-mbstring": "^1.12"