Merge pull request #102 from nicolas-grekas/libsodium

Fix compat with libsodium
paragonie · Oct 18, 2019 · b7115d0 · b7115d0
2 parents 462fce4 + 45d0035
commit b7115d0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/autoload.php b/autoload.php
@@ -45,7 +45,7 @@ function sodiumCompatAutoloader($class)
     require_once dirname(__FILE__) . '/lib/sodium_compat.php';
 }
 if (PHP_VERSION_ID < 70200 || !extension_loaded('sodium')) {
-    if (PHP_VERSION_ID >= 50300 && !defined('SODIUM_LIBRARY_VERSION_MAJOR')) {
+    if (PHP_VERSION_ID >= 50300 && !defined('SODIUM_LIBRARY_MAJOR_VERSION')) {
         require_once dirname(__FILE__) . '/lib/php72compat_const.php';
     }
     assert(class_exists('ParagonIE_Sodium_Compat'), 'Possible filesystem/autoloader bug?');

diff --git a/lib/php72compat_const.php b/lib/php72compat_const.php
@@ -1,8 +1,8 @@
 <?php
 
-const SODIUM_LIBRARY_VERSION_MAJOR = 9;
-const SODIUM_LIBRARY_VERSION_MINOR = 1;
-const SODIUM_VERSION_STRING = 'polyfill-1.0.8';
+const SODIUM_LIBRARY_MAJOR_VERSION = 9;
+const SODIUM_LIBRARY_MINOR_VERSION = 1;
+const SODIUM_LIBRARY_VERSION = '1.0.8';
 
 const SODIUM_BASE64_VARIANT_ORIGINAL = 1;
 const SODIUM_BASE64_VARIANT_ORIGINAL_NO_PADDING = 3;