diff -r 3d4e9c994f10 -r a86126ab1dd4 wp/wp-includes/sodium_compat/autoload.php --- a/wp/wp-includes/sodium_compat/autoload.php Tue Oct 22 16:11:46 2019 +0200 +++ b/wp/wp-includes/sodium_compat/autoload.php Tue Dec 15 13:49:49 2020 +0100 @@ -43,7 +43,17 @@ // 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')) { - require_once dirname(__FILE__) . '/lib/php72compat.php'; + 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'); }