Changeset 35600

Timestamp:

11/10/2015 11:59:15 AM (9 years ago)

Author:

dd32

Message:

Update random_compat to master.
Clarifies strings, Merges [35587] upstream.
See #34409, #28633

Location:

trunk/src/wp-includes/random_compat

Files:

• random.php (modified) (1 diff)
• random_bytes_com_dotnet.php (modified) (1 diff)
• random_bytes_dev_urandom.php (modified) (1 diff)
• random_bytes_libsodium.php (modified) (1 diff)
• random_bytes_mcrypt.php (modified) (1 diff)
• random_bytes_openssl.php (modified) (1 diff)

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

@@ -111 +111 @@
                     PHP_VERSION_ID >= 50300
                 ) ||
-                // Windows with PHP >= 5.3.4
-                PHP_VERSION_ID >= 50401 // Modification from upstream, see #34409
+                // Windows with PHP >= 5.4.1
+                PHP_VERSION_ID >= 50401
             )
         ) {

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

@@ -73 +73 @@
      */
     throw new Exception(
-        'PHP failed to generate random data.'
+        'Could not gather sufficient random data'
     );
 }

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

@@ -133 +133 @@
      */
     throw new Exception(
-        'PHP failed to generate random data.'
+        'Error reading from source device'
     );
 }

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

@@ -80 +80 @@
      */
     throw new Exception(
-        'PHP failed to generate random data.'
+        'Could not gather sufficient random data'
     );
 }

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

@@ -68 +68 @@
      */
     throw new Exception(
-        'PHP failed to generate random data.'
+        'Could not gather sufficient random data'
     );
 }

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

@@ -72 +72 @@
      */
     throw new Exception(
-        'PHP failed to generate random data.'
+        'Could not gather sufficient random data'
     );
 }