Ticket #35327: 35327.44-branch.diff

src/wp-includes/random_compat/random.php

@@ -44 +44 @@
         /**
          * PHP 5.2.0 - 5.6.x way to implement random_bytes()
          * 
          * We use conditional statements here to define the function in accordance
          * to the operating environment. It's a micro-optimization.
          * 
          * In order of preference:
          *   1. Use libsodium if available.
          *   2. fread() /dev/urandom if available (never on Windows)
          *   3. mcrypt_create_iv($bytes, MCRYPT_CREATE_IV)
          *   4. COM('CAPICOM.Utilities.1')->GetRandom()
          *   5. openssl_random_pseudo_bytes() (absolute last resort)
          * 
          * See ERRATA.md for our reasoning behind this particular order
          */
-        if (extension_loaded('libsodium')) {
+        if (PHP_VERSION_ID >= 50300 && extension_loaded('libsodium') && function_exists('\\Sodium\\randombytes_buf')) {
             // See random_bytes_libsodium.php
             require_once $RandomCompatDIR.'/random_bytes_libsodium.php';
         }
         if (
             !function_exists('random_bytes') && 
             DIRECTORY_SEPARATOR === '/' &&
             @is_readable('/dev/urandom')
         ) {
             // DIRECTORY_SEPARATOR === '/' on Unix-like OSes -- this is a fast
             // way to exclude Windows.
             // 
             // Error suppression on is_readable() in case of an open_basedir or 
             // safe_mode failure. All we care about is whether or not we can 
             // read it at this point. If the PHP environment is going to panic 
             // over trying to see if the file can be read in the first place,