Changeset 54150 for trunk/src/wp-includes/sodium_compat/autoload.php

Timestamp:

09/14/2022 12:11:11 AM (2 years ago)

Author:

SergeyBiryukov

Message:

Upgrade/Install: Update sodium_compat to v1.18.0.

The latest version of sodium_compat includes some improvements, as well as a new feature which will also be included in PHP 8.2.

• Fixed issues with the PHP autoloader:
  • ​#145: For WordPress, this ensures when Ed25519 is included, so too is the class it inherits from.
  • ​#148, ​#149: For PHP 7.4+ with opcache preloading, this ensures the include guards don't fail.
• ​#144: Added sodium_crypto_stream_xchacha20_xor_ic()
  • See ​pull request for php-src (merged in PHP 8.2)
  • For motivation: ​paragonie/halite#178

Release notes:
​https://github.com/paragonie/sodium_compat/releases/tag/v1.18.0

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

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

Props jrf, paragoninitiativeenterprises.
Fixes #56564.

File:

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

trunk/src/wp-includes/sodium_compat/autoload.php

@@ -43 +43 @@
 
 /* Explicitly, always load the Compat class: */
-require_once dirname(__FILE__) . '/src/Compat.php';
+if (!class_exists('ParagonIE_Sodium_Compat', false)) {
+    require_once dirname(__FILE__) . '/src/Compat.php';
+}
 
 if (!class_exists('SodiumException', false)) {
@@ -70 +72 @@
     require_once(dirname(__FILE__) . '/lib/php72compat.php');
 }
+require_once(dirname(__FILE__) . '/lib/stream-xchacha20.php');
 require_once(dirname(__FILE__) . '/lib/ristretto255.php');