Changeset 36220

Timestamp:

01/08/2016 03:27:58 AM (9 years ago)

Author:

dd32

Message:

Update to Random_Compat 1.1.5 to fix an issue with older libSodium modules.

Props sarciszewski.
Fixes #35327 for trunk.

Location:

trunk/src/wp-includes/random_compat

Files:

• random.php (modified) (2 diffs)
• random_bytes_libsodium_legacy.php (copied) (copied from trunk/src/wp-includes/random_compat/random_bytes_libsodium.php) (1 diff)

trunk/src/wp-includes/random_compat/random.php

@@ -59 +59 @@
         if (extension_loaded('libsodium')) {
             // See random_bytes_libsodium.php
-            require_once $RandomCompatDIR.'/random_bytes_libsodium.php';
+            if (PHP_VERSION_ID >= 50300 && function_exists('\\Sodium\\randombytes_buf')) {
+                require_once $RandomCompatDIR.'/random_bytes_libsodium.php';
+            } elseif (method_exists('Sodium', 'randombytes_buf')) {
+                require_once $RandomCompatDIR.'/random_bytes_libsodium_legacy.php';
+            }
         }
         if (
@@ -76 +80 @@
             
             // See random_bytes_dev_urandom.php
-            require_once $RandomCompatDIR.'/random_bytes_dev_urandom.php';
-        }
+                require_once $RandomCompatDIR.'/random_bytes_dev_urandom.php';
+            }
         if (
             !function_exists('random_bytes') &&

trunk/src/wp-includes/random_compat/random_bytes_libsodium_legacy.php

@@ -64 +64 @@
                 ? 1073741824
                 : $bytes - $i;
-            $buf .= \Sodium\randombytes_buf($n);
+            $buf .= Sodium::randombytes_buf($n);
         }
     } else {
-        $buf = \Sodium\randombytes_buf($bytes);
+        $buf = Sodium::randombytes_buf($bytes);
     }