Changeset 58752 for trunk/src/wp-includes/sodium_compat/lib/ristretto255.php

Timestamp:

07/18/2024 12:58:40 PM (2 years ago)

Author:

SergeyBiryukov

Message:

Upgrade/Install: Update sodium_compat to v1.21.1.

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

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

References:

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

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

Props jrf, dd32, paragoninitiativeenterprises.
Fixes #61686.

File:

• trunk/src/wp-includes/sodium_compat/lib/ristretto255.php (modified) (13 diffs)

trunk/src/wp-includes/sodium_compat/lib/ristretto255.php

@@ -48 +48 @@
      * @throws SodiumException
      */
-    function sodium_crypto_core_ristretto255_add($p, $q)
-    {
+    function sodium_crypto_core_ristretto255_add(
+        #[\SensitiveParameter]
+        $p,
+        #[\SensitiveParameter]
+        $q
+    ) {
         return ParagonIE_Sodium_Compat::ristretto255_add($p, $q, true);
     }
@@ -61 +65 @@
      * @throws SodiumException
      */
-    function sodium_crypto_core_ristretto255_from_hash($s)
-    {
+    function sodium_crypto_core_ristretto255_from_hash(
+        #[\SensitiveParameter]
+        $s
+    ) {
         return ParagonIE_Sodium_Compat::ristretto255_from_hash($s, true);
     }
@@ -74 +80 @@
      * @throws SodiumException
      */
-    function sodium_crypto_core_ristretto255_is_valid_point($s)
-    {
+    function sodium_crypto_core_ristretto255_is_valid_point(
+        #[\SensitiveParameter]
+        $s
+    ) {
         return ParagonIE_Sodium_Compat::ristretto255_is_valid_point($s, true);
     }
@@ -100 +108 @@
      * @throws SodiumException
      */
-    function sodium_crypto_core_ristretto255_scalar_add($x, $y)
-    {
+    function sodium_crypto_core_ristretto255_scalar_add(
+        #[\SensitiveParameter]
+        $x,
+        #[\SensitiveParameter]
+        $y
+    ) {
         return ParagonIE_Sodium_Compat::ristretto255_scalar_add($x, $y, true);
     }
@@ -113 +125 @@
      * @throws SodiumException
      */
-    function sodium_crypto_core_ristretto255_scalar_complement($s)
-    {
+    function sodium_crypto_core_ristretto255_scalar_complement(
+        #[\SensitiveParameter]
+        $s
+    ) {
         return ParagonIE_Sodium_Compat::ristretto255_scalar_complement($s, true);
     }
@@ -126 +140 @@
      * @throws SodiumException
      */
-    function sodium_crypto_core_ristretto255_scalar_invert($p)
-    {
+    function sodium_crypto_core_ristretto255_scalar_invert(
+        #[\SensitiveParameter]
+        $p
+    ) {
         return ParagonIE_Sodium_Compat::ristretto255_scalar_invert($p, true);
     }
@@ -140 +156 @@
      * @throws SodiumException
      */
-    function sodium_crypto_core_ristretto255_scalar_mul($x, $y)
-    {
+    function sodium_crypto_core_ristretto255_scalar_mul(
+        #[\SensitiveParameter]
+        $x,
+        #[\SensitiveParameter]
+        $y
+    ) {
         return ParagonIE_Sodium_Compat::ristretto255_scalar_mul($x, $y, true);
     }
@@ -153 +173 @@
      * @throws SodiumException
      */
-    function sodium_crypto_core_ristretto255_scalar_negate($s)
-    {
+    function sodium_crypto_core_ristretto255_scalar_negate(
+        #[\SensitiveParameter]
+        $s
+    ) {
         return ParagonIE_Sodium_Compat::ristretto255_scalar_negate($s, true);
     }
@@ -178 +200 @@
      * @throws SodiumException
      */
-    function sodium_crypto_core_ristretto255_scalar_reduce($s)
-    {
+    function sodium_crypto_core_ristretto255_scalar_reduce(
+        #[\SensitiveParameter]
+        $s
+    ) {
         return ParagonIE_Sodium_Compat::ristretto255_scalar_reduce($s, true);
     }
@@ -192 +216 @@
      * @throws SodiumException
      */
-    function sodium_crypto_core_ristretto255_scalar_sub($x, $y)
-    {
+    function sodium_crypto_core_ristretto255_scalar_sub(
+        #[\SensitiveParameter]
+        $x,
+        #[\SensitiveParameter]
+        $y
+    ) {
         return ParagonIE_Sodium_Compat::ristretto255_scalar_sub($x, $y, true);
     }
@@ -206 +234 @@
      * @throws SodiumException
      */
-    function sodium_crypto_core_ristretto255_sub($p, $q)
-    {
+    function sodium_crypto_core_ristretto255_sub(
+        #[\SensitiveParameter]
+        $p,
+        #[\SensitiveParameter]
+        $q
+    ) {
         return ParagonIE_Sodium_Compat::ristretto255_sub($p, $q, true);
     }
@@ -220 +252 @@
      * @throws TypeError
      */
-    function sodium_crypto_scalarmult_ristretto255($n, $p)
-    {
+    function sodium_crypto_scalarmult_ristretto255(
+        #[\SensitiveParameter]
+        $n,
+        #[\SensitiveParameter]
+        $p
+    ) {
         return ParagonIE_Sodium_Compat::scalarmult_ristretto255($n, $p, true);
     }
@@ -233 +269 @@
      * @throws TypeError
      */
-    function sodium_crypto_scalarmult_ristretto255_base($n)
-    {
+    function sodium_crypto_scalarmult_ristretto255_base(
+        #[\SensitiveParameter]
+        $n
+    ) {
         return ParagonIE_Sodium_Compat::scalarmult_ristretto255_base($n, true);
     }