mirror of
https://github.com/WordPress/WordPress.git
synced 2024-06-29 08:15:01 +02:00
aa22aba0ba
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: * [https://github.com/paragonie/sodium_compat/pull/145 #145]: For WordPress, this ensures when Ed25519 is included, so too is the class it inherits from. * [https://github.com/paragonie/sodium_compat/issues/148 #148], [https://github.com/paragonie/sodium_compat/issues/149 #149]: For PHP 7.4+ with opcache preloading, this ensures the include guards don't fail. * [https://github.com/paragonie/sodium_compat/pull/144 #144]: Added `sodium_crypto_stream_xchacha20_xor_ic()` * See [https://github.com/php/php-src/pull/8276 pull request for php-src] (merged in PHP 8.2) * For motivation: [https://github.com/paragonie/halite/issues/178 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. Built from https://develop.svn.wordpress.org/trunk@54150 git-svn-id: http://core.svn.wordpress.org/trunk@53709 1a063a9b-81f0-0310-95a4-ce76da25c4cd
76 lines
2.8 KiB
PHP
76 lines
2.8 KiB
PHP
<?php
|
|
|
|
if (PHP_VERSION_ID < 70000) {
|
|
if (!is_callable('sodiumCompatAutoloader')) {
|
|
/**
|
|
* Sodium_Compat autoloader.
|
|
*
|
|
* @param string $class Class name to be autoloaded.
|
|
*
|
|
* @return bool Stop autoloading?
|
|
*/
|
|
function sodiumCompatAutoloader($class)
|
|
{
|
|
$namespace = 'ParagonIE_Sodium_';
|
|
// Does the class use the namespace prefix?
|
|
$len = strlen($namespace);
|
|
if (strncmp($namespace, $class, $len) !== 0) {
|
|
// no, move to the next registered autoloader
|
|
return false;
|
|
}
|
|
|
|
// Get the relative class name
|
|
$relative_class = substr($class, $len);
|
|
|
|
// Replace the namespace prefix with the base directory, replace namespace
|
|
// separators with directory separators in the relative class name, append
|
|
// with .php
|
|
$file = dirname(__FILE__) . '/src/' . str_replace('_', '/', $relative_class) . '.php';
|
|
// if the file exists, require it
|
|
if (file_exists($file)) {
|
|
require_once $file;
|
|
return true;
|
|
}
|
|
return false;
|
|
}
|
|
|
|
// Now that we have an autoloader, let's register it!
|
|
spl_autoload_register('sodiumCompatAutoloader');
|
|
}
|
|
} else {
|
|
require_once dirname(__FILE__) . '/autoload-php7.php';
|
|
}
|
|
|
|
/* Explicitly, always load the Compat class: */
|
|
if (!class_exists('ParagonIE_Sodium_Compat', false)) {
|
|
require_once dirname(__FILE__) . '/src/Compat.php';
|
|
}
|
|
|
|
if (!class_exists('SodiumException', false)) {
|
|
require_once dirname(__FILE__) . '/src/SodiumException.php';
|
|
}
|
|
if (PHP_VERSION_ID >= 50300) {
|
|
// Namespaces didn't exist before 5.3.0, so don't even try to use this
|
|
// unless PHP >= 5.3.0
|
|
require_once dirname(__FILE__) . '/lib/namespaced.php';
|
|
require_once dirname(__FILE__) . '/lib/sodium_compat.php';
|
|
} else {
|
|
require_once dirname(__FILE__) . '/src/PHP52/SplFixedArray.php';
|
|
}
|
|
if (PHP_VERSION_ID < 70200 || !extension_loaded('sodium')) {
|
|
if (PHP_VERSION_ID >= 50300 && !defined('SODIUM_CRYPTO_SCALARMULT_BYTES')) {
|
|
require_once dirname(__FILE__) . '/lib/php72compat_const.php';
|
|
}
|
|
if (PHP_VERSION_ID >= 70000) {
|
|
assert(class_exists('ParagonIE_Sodium_Compat'), 'Possible filesystem/autoloader bug?');
|
|
} else {
|
|
assert(class_exists('ParagonIE_Sodium_Compat'));
|
|
}
|
|
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/stream-xchacha20.php');
|
|
require_once(dirname(__FILE__) . '/lib/ristretto255.php');
|