Changeset 51171 for branches/5.7/src/wp-includes/sodium_compat/autoload.php

Timestamp:

06/16/2021 05:28:49 PM (4 years ago)

Author:

SergeyBiryukov

Message:

Upgrade/Install: Update sodium_compat to v1.16.1.

The latest version of sodium_compat includes polyfills for new features slated to land in PHP 8.1:
​https://paragonie.com/blog/2021/05/ristretto255-for-php-community

It also fixes a race condition with the autoloader that caused an "undefined constant" error on some systems:
​https://github.com/paragonie/sodium_compat/issues/122

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

Follow-up to [49741].

Props paragoninitiativeenterprises, oxyrealm.
Merges [51002] to the 5.7 branch.
Fixes #53274.

Location:

branches/5.7

Files:

• . (modified) (1 prop)
• src/wp-includes/sodium_compat/autoload.php (modified) (2 diffs)

branches/5.7/src/wp-includes/sodium_compat/autoload.php

@@ -42 +42 @@
 }
 
+/* Explicitly, always load the Compat class: */
+require_once dirname(__FILE__) . '/src/Compat.php';
+
 if (!class_exists('SodiumException', false)) {
     require_once dirname(__FILE__) . '/src/SodiumException.php';
@@ -62 +65 @@
         assert(class_exists('ParagonIE_Sodium_Compat'));
     }
-    require_once (dirname(__FILE__) . '/lib/php72compat.php');
+    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
+    require_once(dirname(__FILE__) . '/lib/php72compat.php');
 }
+require_once(dirname(__FILE__) . '/lib/ristretto255.php');