Changeset 45355 for branches/5.2/src/wp-includes/sodium_compat/lib/php72compat.php

Timestamp:

05/17/2019 05:19:21 PM (5 years ago)

Author:

desrosj

Message:

Upgrade/Install: Update sodium_compat to v1.10.0.

This adds a runtime_speed_test() method for estimating if the 32-bit implementation is fast enough for expensive computations.

Merges [45344] to the 5.2 branch.

Props paragoninitiativeenterprises, tellyworth.
See #47186.

Location:

branches/5.2

Files:

• . (modified) (1 prop)
• src/wp-includes/sodium_compat/lib/php72compat.php (modified) (7 diffs)

branches/5.2/src/wp-includes/sodium_compat/lib/php72compat.php

@@ -108 +108 @@
      * @param string $nonce
      * @param string $key
-     * @return string
+     * @return string|bool
      */
     function sodium_crypto_aead_aes256gcm_decrypt($message, $assocData, $nonce, $key)
@@ -154 +154 @@
      * @param string $nonce
      * @param string $key
-     * @return string
+     * @return string|bool
      */
     function sodium_crypto_aead_chacha20poly1305_decrypt($message, $assocData, $nonce, $key)
@@ -200 +200 @@
      * @param string $nonce
      * @param string $key
-     * @return string
+     * @return string|bool
      */
     function sodium_crypto_aead_chacha20poly1305_ietf_decrypt($message, $assocData, $nonce, $key)
@@ -246 +246 @@
      * @param string $nonce
      * @param string $key
-     * @return string
+     * @return string|bool
      */
     function sodium_crypto_aead_xchacha20poly1305_ietf_decrypt($message, $assocData, $nonce, $key)
     {
         try {
-            return ParagonIE_Sodium_Compat::crypto_aead_xchacha20poly1305_ietf_decrypt($message, $assocData, $nonce, $key);
+            return ParagonIE_Sodium_Compat::crypto_aead_xchacha20poly1305_ietf_decrypt($message, $assocData, $nonce, $key, true);
         } catch (Error $ex) {
             return false;
@@ -272 +272 @@
     function sodium_crypto_aead_xchacha20poly1305_ietf_encrypt($message, $assocData, $nonce, $key)
     {
-        return ParagonIE_Sodium_Compat::crypto_aead_xchacha20poly1305_ietf_encrypt($message, $assocData, $nonce, $key);
+        return ParagonIE_Sodium_Compat::crypto_aead_xchacha20poly1305_ietf_encrypt($message, $assocData, $nonce, $key, true);
     }
 }
@@ -953 +953 @@
     /**
      * @see ParagonIE_Sodium_Compat::increment()
-     * @param &string $string
+     * @param string $string
      * @return void
      * @throws SodiumException
@@ -1010 +1010 @@
     /**
      * @see ParagonIE_Sodium_Compat::memzero()
-     * @param string &$str
+     * @param string $str
      * @return void
      * @throws SodiumException