summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrey Andreev <narf@devilix.net>2014-10-02 01:19:06 +0200
committerAndrey Andreev <narf@devilix.net>2014-10-02 01:19:06 +0200
commite4b9cd64e2e7185ddf874ddf9861fe21961edb79 (patch)
treec4f059d4b68d9f0b75c3ea68ed2b83aad7cca98d
parentb627430ae60d7c5f13ecc2f289bce8185c218be0 (diff)
stream_set_chunk_size() requires PHP 5.4
-rwxr-xr-xsystem/core/Security.php3
-rw-r--r--system/core/compat/password.php4
2 files changed, 5 insertions, 2 deletions
diff --git a/system/core/Security.php b/system/core/Security.php
index b97df4647..15a66430a 100755
--- a/system/core/Security.php
+++ b/system/core/Security.php
@@ -573,7 +573,8 @@ class CI_Security {
if (is_readable('/dev/urandom') && ($fp = fopen('/dev/urandom', 'rb')) !== FALSE)
{
- stream_set_chunk_size($fp, $length);
+ // Try not to waste entropy ...
+ is_php('5.4') && stream_set_chunk_size($fp, $length);
$output = fread($fp, $length);
fclose($fp);
if ($output !== FALSE)
diff --git a/system/core/compat/password.php b/system/core/compat/password.php
index 60aa578db..1f67a5269 100644
--- a/system/core/compat/password.php
+++ b/system/core/compat/password.php
@@ -121,7 +121,9 @@ if ( ! function_exists('password_hash'))
return FALSE;
}
- stream_set_chunk_size($fp, 16);
+ // Try not to waste entropy ...
+ is_php('5.4') && stream_set_chunk_size($fp, 16);
+
$options['salt'] = '';
for ($read = 0; $read < 16; $read = ($func_override) ? mb_strlen($options['salt'], '8bit') : strlen($options['salt']))
{