Introduced isReachableFilePath() and isReadableFile().

[core.git] / inc / classes / main / scrypt / class_Scrypt.php

diff --git a/inc/classes/main/scrypt/class_Scrypt.php b/inc/classes/main/scrypt/class_Scrypt.php
index 8f4891d06bfe5c657fc7fe942a1669d5d757b1c7..3bc5d76c216c5f43861253ccaad03bcd1845021c 100644 (file)
--- a/inc/classes/main/scrypt/class_Scrypt.php
+++ b/inc/classes/main/scrypt/class_Scrypt.php
@@ -90,7 +90,7 @@ abstract class Scrypt extends BaseFrameworkSystem
                 $buffer_valid = true;
             }
         }
                 $buffer_valid = true;
             }
         }

-        if (!$buffer_valid && is_readable('/dev/urandom')) {
+        if (!$buffer_valid && BaseFrameworkSystem::isReadableFile('/dev/urandom')) {

             $f = fopen('/dev/urandom', 'r');
             $read = static::strlen($buffer);
             while ($read < $length) {
             $f = fopen('/dev/urandom', 'r');
             $read = static::strlen($buffer);
             while ($read < $length) {


@@ -131,15 +131,15 @@ abstract class Scrypt extends BaseFrameworkSystem
     public static function hashScrypt($password, $salt = false, $N = 16384, $r = 8, $p = 1)
     {
         if ($N == 0 || ($N & ($N - 1)) != 0) {
     public static function hashScrypt($password, $salt = false, $N = 16384, $r = 8, $p = 1)
     {
         if ($N == 0 || ($N & ($N - 1)) != 0) {

-            throw new \InvalidArgumentException("N must be > 0 and a power of 2");
+            throw new \InvalidArgumentException('N must be > 0 and a power of 2');

         }
 
         if ($N > PHP_INT_MAX / 128 / $r) {
         }
 
         if ($N > PHP_INT_MAX / 128 / $r) {

-            throw new \InvalidArgumentException("Parameter N is too large");
+            throw new \InvalidArgumentException('Parameter N is too large');

         }
 
         if ($r > PHP_INT_MAX / 128 / $p) {
         }
 
         if ($r > PHP_INT_MAX / 128 / $p) {

-            throw new \InvalidArgumentException("Parameter r is too large");
+            throw new \InvalidArgumentException('Parameter r is too large');

         }
 
         if ($salt === false) {
         }
 
         if ($salt === false) {