From bc9bb7eeca34c24486ae74fa4e062587ed1c8504 Mon Sep 17 00:00:00 2001 From: rugk Date: Mon, 17 Oct 2016 21:14:12 +0200 Subject: [PATCH] Remove old backup --- .../random_compat/lib/byte_safe_strings.php | 181 ---------------- .../random_compat/lib/cast_to_int.php | 71 ------- .../random_compat/lib/error_polyfill.php | 42 ---- .../paragonie__/random_compat/lib/random.php | 197 ------------------ .../lib/random_bytes_com_dotnet.php | 81 ------- .../lib/random_bytes_dev_urandom.php | 148 ------------- .../lib/random_bytes_libsodium.php | 86 -------- .../lib/random_bytes_libsodium_legacy.php | 86 -------- .../random_compat/lib/random_bytes_mcrypt.php | 76 ------- .../random_compat/lib/random_int.php | 191 ----------------- .../random_compat/other/build_phar.php | 57 ----- 11 files changed, 1216 deletions(-) delete mode 100644 vendor/paragonie__/random_compat/lib/byte_safe_strings.php delete mode 100644 vendor/paragonie__/random_compat/lib/cast_to_int.php delete mode 100644 vendor/paragonie__/random_compat/lib/error_polyfill.php delete mode 100644 vendor/paragonie__/random_compat/lib/random.php delete mode 100644 vendor/paragonie__/random_compat/lib/random_bytes_com_dotnet.php delete mode 100644 vendor/paragonie__/random_compat/lib/random_bytes_dev_urandom.php delete mode 100644 vendor/paragonie__/random_compat/lib/random_bytes_libsodium.php delete mode 100644 vendor/paragonie__/random_compat/lib/random_bytes_libsodium_legacy.php delete mode 100644 vendor/paragonie__/random_compat/lib/random_bytes_mcrypt.php delete mode 100644 vendor/paragonie__/random_compat/lib/random_int.php delete mode 100644 vendor/paragonie__/random_compat/other/build_phar.php diff --git a/vendor/paragonie__/random_compat/lib/byte_safe_strings.php b/vendor/paragonie__/random_compat/lib/byte_safe_strings.php deleted file mode 100644 index dec5d30..0000000 --- a/vendor/paragonie__/random_compat/lib/byte_safe_strings.php +++ /dev/null @@ -1,181 +0,0 @@ - RandomCompat_strlen($binary_string)) { - return false; - } - - return mb_substr($binary_string, $start, $length, '8bit'); - } - - } else { - - /** - * substr() implementation that isn't brittle to mbstring.func_overload - * - * This version just uses the default substr() - * - * @param string $binary_string - * @param int $start - * @param int $length (optional) - * - * @throws TypeError - * - * @return string - */ - function RandomCompat_substr($binary_string, $start, $length = null) - { - if (!is_string($binary_string)) { - throw new TypeError( - 'RandomCompat_substr(): First argument should be a string' - ); - } - - if (!is_int($start)) { - throw new TypeError( - 'RandomCompat_substr(): Second argument should be an integer' - ); - } - - if ($length !== null) { - if (!is_int($length)) { - throw new TypeError( - 'RandomCompat_substr(): Third argument should be an integer, or omitted' - ); - } - - return substr($binary_string, $start, $length); - } - - return substr($binary_string, $start); - } - } -} diff --git a/vendor/paragonie__/random_compat/lib/cast_to_int.php b/vendor/paragonie__/random_compat/lib/cast_to_int.php deleted file mode 100644 index f441c5d..0000000 --- a/vendor/paragonie__/random_compat/lib/cast_to_int.php +++ /dev/null @@ -1,71 +0,0 @@ - operators might accidentally let a float - * through. - * - * @param int|float $number The number we want to convert to an int - * @param boolean $fail_open Set to true to not throw an exception - * - * @return int (or float if $fail_open) - * - * @throws TypeError - */ - function RandomCompat_intval($number, $fail_open = false) - { - if (is_numeric($number)) { - $number += 0; - } - - if ( - is_float($number) - && - $number > ~PHP_INT_MAX - && - $number < PHP_INT_MAX - ) { - $number = (int) $number; - } - - if (is_int($number) || $fail_open) { - return $number; - } - - throw new TypeError( - 'Expected an integer.' - ); - } -} diff --git a/vendor/paragonie__/random_compat/lib/error_polyfill.php b/vendor/paragonie__/random_compat/lib/error_polyfill.php deleted file mode 100644 index 57cfefd..0000000 --- a/vendor/paragonie__/random_compat/lib/error_polyfill.php +++ /dev/null @@ -1,42 +0,0 @@ -GetRandom() - * 5. openssl_random_pseudo_bytes() (absolute last resort) - * - * See ERRATA.md for our reasoning behind this particular order - */ - if (extension_loaded('libsodium')) { - // See random_bytes_libsodium.php - if (PHP_VERSION_ID >= 50300 && function_exists('\\Sodium\\randombytes_buf')) { - require_once $RandomCompatDIR.'/random_bytes_libsodium.php'; - } elseif (method_exists('Sodium', 'randombytes_buf')) { - require_once $RandomCompatDIR.'/random_bytes_libsodium_legacy.php'; - } - } - - /** - * Reading directly from /dev/urandom: - */ - if (DIRECTORY_SEPARATOR === '/') { - // DIRECTORY_SEPARATOR === '/' on Unix-like OSes -- this is a fast - // way to exclude Windows. - $RandomCompatUrandom = true; - $RandomCompat_basedir = ini_get('open_basedir'); - - if (!empty($RandomCompat_basedir)) { - $RandomCompat_open_basedir = explode( - PATH_SEPARATOR, - strtolower($RandomCompat_basedir) - ); - $RandomCompatUrandom = (array() !== array_intersect( - array('/dev', '/dev/', '/dev/urandom'), - $RandomCompat_open_basedir - )); - $RandomCompat_open_basedir = null; - } - - if ( - !function_exists('random_bytes') - && - $RandomCompatUrandom - && - @is_readable('/dev/urandom') - ) { - // 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, that is not helpful to us here. - - // See random_bytes_dev_urandom.php - require_once $RandomCompatDIR.'/random_bytes_dev_urandom.php'; - } - // Unset variables after use - $RandomCompat_basedir = null; - } else { - $RandomCompatUrandom = false; - } - - /** - * mcrypt_create_iv() - */ - if ( - !function_exists('random_bytes') - && - PHP_VERSION_ID >= 50307 - && - extension_loaded('mcrypt') - && - (DIRECTORY_SEPARATOR !== '/' || $RandomCompatUrandom) - ) { - // Prevent this code from hanging indefinitely on non-Windows; - // see https://bugs.php.net/bug.php?id=69833 - if ( - DIRECTORY_SEPARATOR !== '/' || - (PHP_VERSION_ID <= 50609 || PHP_VERSION_ID >= 50613) - ) { - // See random_bytes_mcrypt.php - require_once $RandomCompatDIR.'/random_bytes_mcrypt.php'; - } - } - $RandomCompatUrandom = null; - - if ( - !function_exists('random_bytes') - && - extension_loaded('com_dotnet') - && - class_exists('COM') - ) { - $RandomCompat_disabled_classes = preg_split( - '#\s*,\s*#', - strtolower(ini_get('disable_classes')) - ); - - if (!in_array('com', $RandomCompat_disabled_classes)) { - try { - $RandomCompatCOMtest = new COM('CAPICOM.Utilities.1'); - if (method_exists($RandomCompatCOMtest, 'GetRandom')) { - // See random_bytes_com_dotnet.php - require_once $RandomCompatDIR.'/random_bytes_com_dotnet.php'; - } - } catch (com_exception $e) { - // Don't try to use it. - } - } - $RandomCompat_disabled_classes = null; - $RandomCompatCOMtest = null; - } - - /** - * throw new Exception - */ - if (!function_exists('random_bytes')) { - /** - * We don't have any more options, so let's throw an exception right now - * and hope the developer won't let it fail silently. - */ - function random_bytes($length) - { - throw new Exception( - 'There is no suitable CSPRNG installed on your system' - ); - } - } - } - - if (!function_exists('random_int')) { - require_once $RandomCompatDIR.'/random_int.php'; - } - - $RandomCompatDIR = null; -} diff --git a/vendor/paragonie__/random_compat/lib/random_bytes_com_dotnet.php b/vendor/paragonie__/random_compat/lib/random_bytes_com_dotnet.php deleted file mode 100644 index 3422825..0000000 --- a/vendor/paragonie__/random_compat/lib/random_bytes_com_dotnet.php +++ /dev/null @@ -1,81 +0,0 @@ -GetRandom($bytes, 0)); - if (RandomCompat_strlen($buf) >= $bytes) { - /** - * Return our random entropy buffer here: - */ - return RandomCompat_substr($buf, 0, $bytes); - } - ++$execCount; - } while ($execCount < $bytes); - - /** - * If we reach here, PHP has failed us. - */ - throw new Exception( - 'Could not gather sufficient random data' - ); -} diff --git a/vendor/paragonie__/random_compat/lib/random_bytes_dev_urandom.php b/vendor/paragonie__/random_compat/lib/random_bytes_dev_urandom.php deleted file mode 100644 index db93b07..0000000 --- a/vendor/paragonie__/random_compat/lib/random_bytes_dev_urandom.php +++ /dev/null @@ -1,148 +0,0 @@ - 0); - - /** - * Is our result valid? - */ - if ($buf !== false) { - if (RandomCompat_strlen($buf) === $bytes) { - /** - * Return our random entropy buffer here: - */ - return $buf; - } - } - } - - /** - * If we reach here, PHP has failed us. - */ - throw new Exception( - 'Error reading from source device' - ); -} diff --git a/vendor/paragonie__/random_compat/lib/random_bytes_libsodium.php b/vendor/paragonie__/random_compat/lib/random_bytes_libsodium.php deleted file mode 100644 index f802d4e..0000000 --- a/vendor/paragonie__/random_compat/lib/random_bytes_libsodium.php +++ /dev/null @@ -1,86 +0,0 @@ - 2147483647) { - $buf = ''; - for ($i = 0; $i < $bytes; $i += 1073741824) { - $n = ($bytes - $i) > 1073741824 - ? 1073741824 - : $bytes - $i; - $buf .= \Sodium\randombytes_buf($n); - } - } else { - $buf = \Sodium\randombytes_buf($bytes); - } - - if ($buf !== false) { - if (RandomCompat_strlen($buf) === $bytes) { - return $buf; - } - } - - /** - * If we reach here, PHP has failed us. - */ - throw new Exception( - 'Could not gather sufficient random data' - ); -} diff --git a/vendor/paragonie__/random_compat/lib/random_bytes_libsodium_legacy.php b/vendor/paragonie__/random_compat/lib/random_bytes_libsodium_legacy.php deleted file mode 100644 index 44fddbf..0000000 --- a/vendor/paragonie__/random_compat/lib/random_bytes_libsodium_legacy.php +++ /dev/null @@ -1,86 +0,0 @@ - 2147483647) { - $buf = ''; - for ($i = 0; $i < $bytes; $i += 1073741824) { - $n = ($bytes - $i) > 1073741824 - ? 1073741824 - : $bytes - $i; - $buf .= Sodium::randombytes_buf($n); - } - } else { - $buf = Sodium::randombytes_buf($bytes); - } - - if ($buf !== false) { - if (RandomCompat_strlen($buf) === $bytes) { - return $buf; - } - } - - /** - * If we reach here, PHP has failed us. - */ - throw new Exception( - 'Could not gather sufficient random data' - ); -} diff --git a/vendor/paragonie__/random_compat/lib/random_bytes_mcrypt.php b/vendor/paragonie__/random_compat/lib/random_bytes_mcrypt.php deleted file mode 100644 index 7ac9d91..0000000 --- a/vendor/paragonie__/random_compat/lib/random_bytes_mcrypt.php +++ /dev/null @@ -1,76 +0,0 @@ - operators might accidentally let a float - * through. - */ - - try { - $min = RandomCompat_intval($min); - } catch (TypeError $ex) { - throw new TypeError( - 'random_int(): $min must be an integer' - ); - } - - try { - $max = RandomCompat_intval($max); - } catch (TypeError $ex) { - throw new TypeError( - 'random_int(): $max must be an integer' - ); - } - - /** - * Now that we've verified our weak typing system has given us an integer, - * let's validate the logic then we can move forward with generating random - * integers along a given range. - */ - if ($min > $max) { - throw new Error( - 'Minimum value must be less than or equal to the maximum value' - ); - } - - if ($max === $min) { - return $min; - } - - /** - * Initialize variables to 0 - * - * We want to store: - * $bytes => the number of random bytes we need - * $mask => an integer bitmask (for use with the &) operator - * so we can minimize the number of discards - */ - $attempts = $bits = $bytes = $mask = $valueShift = 0; - - /** - * At this point, $range is a positive number greater than 0. It might - * overflow, however, if $max - $min > PHP_INT_MAX. PHP will cast it to - * a float and we will lose some precision. - */ - $range = $max - $min; - - /** - * Test for integer overflow: - */ - if (!is_int($range)) { - - /** - * Still safely calculate wider ranges. - * Provided by @CodesInChaos, @oittaa - * - * @ref https://gist.github.com/CodesInChaos/03f9ea0b58e8b2b8d435 - * - * We use ~0 as a mask in this case because it generates all 1s - * - * @ref https://eval.in/400356 (32-bit) - * @ref http://3v4l.org/XX9r5 (64-bit) - */ - $bytes = PHP_INT_SIZE; - $mask = ~0; - - } else { - - /** - * $bits is effectively ceil(log($range, 2)) without dealing with - * type juggling - */ - while ($range > 0) { - if ($bits % 8 === 0) { - ++$bytes; - } - ++$bits; - $range >>= 1; - $mask = $mask << 1 | 1; - } - $valueShift = $min; - } - - /** - * Now that we have our parameters set up, let's begin generating - * random integers until one falls between $min and $max - */ - do { - /** - * The rejection probability is at most 0.5, so this corresponds - * to a failure probability of 2^-128 for a working RNG - */ - if ($attempts > 128) { - throw new Exception( - 'random_int: RNG is broken - too many rejections' - ); - } - - /** - * Let's grab the necessary number of random bytes - */ - $randomByteString = random_bytes($bytes); - if ($randomByteString === false) { - throw new Exception( - 'Random number generator failure' - ); - } - - /** - * Let's turn $randomByteString into an integer - * - * This uses bitwise operators (<< and |) to build an integer - * out of the values extracted from ord() - * - * Example: [9F] | [6D] | [32] | [0C] => - * 159 + 27904 + 3276800 + 201326592 => - * 204631455 - */ - $val = 0; - for ($i = 0; $i < $bytes; ++$i) { - $val |= ord($randomByteString[$i]) << ($i * 8); - } - - /** - * Apply mask - */ - $val &= $mask; - $val += $valueShift; - - ++$attempts; - /** - * If $val overflows to a floating point number, - * ... or is larger than $max, - * ... or smaller than $min, - * then try again. - */ - } while (!is_int($val) || $val > $max || $val < $min); - - return (int) $val; -} diff --git a/vendor/paragonie__/random_compat/other/build_phar.php b/vendor/paragonie__/random_compat/other/build_phar.php deleted file mode 100644 index 70ef4b2..0000000 --- a/vendor/paragonie__/random_compat/other/build_phar.php +++ /dev/null @@ -1,57 +0,0 @@ -buildFromDirectory(dirname(__DIR__).'/lib'); -rename( - dirname(__DIR__).'/lib/index.php', - dirname(__DIR__).'/lib/random.php' -); - -/** - * If we pass an (optional) path to a private key as a second argument, we will - * sign the Phar with OpenSSL. - * - * If you leave this out, it will produce an unsigned .phar! - */ -if ($argc > 1) { - if (!@is_readable($argv[1])) { - echo 'Could not read the private key file:', $argv[1], "\n"; - exit(255); - } - $pkeyFile = file_get_contents($argv[1]); - - $private = openssl_get_privatekey($pkeyFile); - if ($private !== false) { - $pkey = ''; - openssl_pkey_export($private, $pkey); - $phar->setSignatureAlgorithm(Phar::OPENSSL, $pkey); - - /** - * Save the corresponding public key to the file - */ - if (!@is_readable($dist.'/random_compat.phar.pubkey')) { - $details = openssl_pkey_get_details($private); - file_put_contents( - $dist.'/random_compat.phar.pubkey', - $details['key'] - ); - } - } else { - echo 'An error occurred reading the private key from OpenSSL.', "\n"; - exit(255); - } -}