Changeset 35922 for trunk/src/wp-includes/random_compat/random_bytes_dev_urandom.php

Timestamp:

12/14/2015 07:45:13 AM (9 years ago)

Author:

dd32

Message:

Update random_compat to latest master (~1.1.5)
Changes:

• Checks disable_classes for COM() before using to avoid PHP Warnings
• Uses stream_set_chunk_size() to avoid reading 8KiB from /dev/urandom unintentionally.

See #34948

File:

• trunk/src/wp-includes/random_compat/random_bytes_dev_urandom.php (modified) (1 diff)

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

@@ -63 +63 @@
             }
         }
-        /**
-         * stream_set_read_buffer() does not exist in HHVM
-         * 
-         * If we don't set the stream's read buffer to 0, PHP will
-         * internally buffer 8192 bytes, which can waste entropy
-         * 
-         * stream_set_read_buffer returns 0 on success
-         */
-        if (!empty($fp) && function_exists('stream_set_read_buffer')) {
-            stream_set_read_buffer($fp, RANDOM_COMPAT_READ_BUFFER);
+        if (!empty($fp)) {
+            /**
+             * stream_set_read_buffer() does not exist in HHVM
+             * 
+             * If we don't set the stream's read buffer to 0, PHP will
+             * internally buffer 8192 bytes, which can waste entropy
+             * 
+             * stream_set_read_buffer returns 0 on success
+             */
+            if (function_exists('stream_set_read_buffer')) {
+                stream_set_read_buffer($fp, RANDOM_COMPAT_READ_BUFFER);
+            }
+            if (function_exists('stream_set_chunk_size')) {
+                stream_set_chunk_size($fp, RANDOM_COMPAT_READ_BUFFER);
+            }
         }
     }