Changeset 46859 for branches/5.3/src/wp-includes/sodium_compat/src/Core/Poly1305/State.php

Timestamp:

12/09/2019 04:44:58 PM (5 years ago)

Author:

SergeyBiryukov

Message:

Upgrade/Install: Update sodium_compat to v1.12.1.

This includes a speedup for signature verification on most platforms and bugfixes for 32-bit platforms.

Props paragoninitiativeenterprises, lukaswaudentio.
Merges [46858] to the 5.3 branch.
Fixes #48371.

Location:

branches/5.3

Files:

• . (modified) (1 prop)
• src/wp-includes/sodium_compat/src/Core/Poly1305/State.php (modified) (4 diffs)

branches/5.3/src/wp-includes/sodium_compat/src/Core/Poly1305/State.php

@@ -81 +81 @@
 
     /**
+     * Zero internal buffer upon destruction
+     */
+    public function __destruct()
+    {
+        $this->r[0] ^= $this->r[0];
+        $this->r[1] ^= $this->r[1];
+        $this->r[2] ^= $this->r[2];
+        $this->r[3] ^= $this->r[3];
+        $this->r[4] ^= $this->r[4];
+        $this->h[0] ^= $this->h[0];
+        $this->h[1] ^= $this->h[1];
+        $this->h[2] ^= $this->h[2];
+        $this->h[3] ^= $this->h[3];
+        $this->h[4] ^= $this->h[4];
+        $this->pad[0] ^= $this->pad[0];
+        $this->pad[1] ^= $this->pad[1];
+        $this->pad[2] ^= $this->pad[2];
+        $this->pad[3] ^= $this->pad[3];
+        $this->leftover = 0;
+        $this->final = true;
+    }
+
+    /**
      * @internal You should not use this directly from another application
      *
@@ -91 +114 @@
     {
         $bytes = self::strlen($message);
+        if ($bytes < 1) {
+            return $this;
+        }
 
         /* handle leftover */
@@ -112 +138 @@
 
             $this->blocks(
-                static::intArrayToString($this->buffer),
+                self::intArrayToString($this->buffer),
                 ParagonIE_Sodium_Core_Poly1305::BLOCK_SIZE
             );
@@ -297 +323 @@
             $this->blocks(
                 self::substr(
-                    static::intArrayToString($this->buffer),
+                    self::intArrayToString($this->buffer),
                     0,
                     ParagonIE_Sodium_Core_Poly1305::BLOCK_SIZE