updating random_compat library to 2.0.15 (not upgrading identicon, would raise PHP requirements to 5.5)

pull/335/merge
El RIDO 6 years ago
parent 3745f9d96b
commit fd6c18e573
No known key found for this signature in database
GPG Key ID: 0F5C940A6BD81F92

@ -13,7 +13,7 @@
}, },
"require": { "require": {
"php": "^5.4.0 || ^7.0", "php": "^5.4.0 || ^7.0",
"paragonie/random_compat": "2.0.4", "paragonie/random_compat": "2.0.15",
"yzalis/identicon": "1.1.0" "yzalis/identicon": "1.1.0"
}, },
"require-dev": { "require-dev": {

@ -2,6 +2,6 @@
// autoload.php @generated by Composer // autoload.php @generated by Composer
require_once __DIR__ . '/composer' . '/autoload_real.php'; require_once __DIR__ . '/composer/autoload_real.php';
return ComposerAutoloaderInitDontChange::getLoader(); return ComposerAutoloaderInitDontChange::getLoader();

@ -53,8 +53,9 @@ class ClassLoader
private $useIncludePath = false; private $useIncludePath = false;
private $classMap = array(); private $classMap = array();
private $classMapAuthoritative = false; private $classMapAuthoritative = false;
private $missingClasses = array();
private $apcuPrefix;
public function getPrefixes() public function getPrefixes()
{ {
@ -271,6 +272,26 @@ class ClassLoader
return $this->classMapAuthoritative; return $this->classMapAuthoritative;
} }
/**
* APCu prefix to use to cache found/not-found classes, if the extension is enabled.
*
* @param string|null $apcuPrefix
*/
public function setApcuPrefix($apcuPrefix)
{
$this->apcuPrefix = function_exists('apcu_fetch') && ini_get('apc.enabled') ? $apcuPrefix : null;
}
/**
* The APCu prefix in use, or null if APCu caching is not enabled.
*
* @return string|null
*/
public function getApcuPrefix()
{
return $this->apcuPrefix;
}
/** /**
* Registers this instance as an autoloader. * Registers this instance as an autoloader.
* *
@ -313,29 +334,34 @@ class ClassLoader
*/ */
public function findFile($class) public function findFile($class)
{ {
// work around for PHP 5.3.0 - 5.3.2 https://bugs.php.net/50731
if ('\\' == $class[0]) {
$class = substr($class, 1);
}
// class map lookup // class map lookup
if (isset($this->classMap[$class])) { if (isset($this->classMap[$class])) {
return $this->classMap[$class]; return $this->classMap[$class];
} }
if ($this->classMapAuthoritative) { if ($this->classMapAuthoritative || isset($this->missingClasses[$class])) {
return false; return false;
} }
if (null !== $this->apcuPrefix) {
$file = apcu_fetch($this->apcuPrefix.$class, $hit);
if ($hit) {
return $file;
}
}
$file = $this->findFileWithExtension($class, '.php'); $file = $this->findFileWithExtension($class, '.php');
// Search for Hack files if we are running on HHVM // Search for Hack files if we are running on HHVM
if ($file === null && defined('HHVM_VERSION')) { if (false === $file && defined('HHVM_VERSION')) {
$file = $this->findFileWithExtension($class, '.hh'); $file = $this->findFileWithExtension($class, '.hh');
} }
if ($file === null) { if (null !== $this->apcuPrefix) {
apcu_add($this->apcuPrefix.$class, $file);
}
if (false === $file) {
// Remember that this class does not exist. // Remember that this class does not exist.
return $this->classMap[$class] = false; $this->missingClasses[$class] = true;
} }
return $file; return $file;
@ -348,10 +374,14 @@ class ClassLoader
$first = $class[0]; $first = $class[0];
if (isset($this->prefixLengthsPsr4[$first])) { if (isset($this->prefixLengthsPsr4[$first])) {
foreach ($this->prefixLengthsPsr4[$first] as $prefix => $length) { $subPath = $class;
if (0 === strpos($class, $prefix)) { while (false !== $lastPos = strrpos($subPath, '\\')) {
foreach ($this->prefixDirsPsr4[$prefix] as $dir) { $subPath = substr($subPath, 0, $lastPos);
if (file_exists($file = $dir . DIRECTORY_SEPARATOR . substr($logicalPathPsr4, $length))) { $search = $subPath.'\\';
if (isset($this->prefixDirsPsr4[$search])) {
$pathEnd = DIRECTORY_SEPARATOR . substr($logicalPathPsr4, $lastPos + 1);
foreach ($this->prefixDirsPsr4[$search] as $dir) {
if (file_exists($file = $dir . $pathEnd)) {
return $file; return $file;
} }
} }
@ -399,6 +429,8 @@ class ClassLoader
if ($this->useIncludePath && $file = stream_resolve_include_path($logicalPathPsr0)) { if ($this->useIncludePath && $file = stream_resolve_include_path($logicalPathPsr0)) {
return $file; return $file;
} }
return false;
} }
} }

@ -23,7 +23,7 @@ class ComposerAutoloaderInitDontChange
self::$loader = $loader = new \Composer\Autoload\ClassLoader(); self::$loader = $loader = new \Composer\Autoload\ClassLoader();
spl_autoload_unregister(array('ComposerAutoloaderInitDontChange', 'loadClassLoader')); spl_autoload_unregister(array('ComposerAutoloaderInitDontChange', 'loadClassLoader'));
$useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION'); $useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded());
if ($useStaticLoader) { if ($useStaticLoader) {
require_once __DIR__ . '/autoload_static.php'; require_once __DIR__ . '/autoload_static.php';

@ -5,7 +5,7 @@
* *
* The MIT License (MIT) * The MIT License (MIT)
* *
* Copyright (c) 2015 - 2016 Paragon Initiative Enterprises * Copyright (c) 2015 - 2018 Paragon Initiative Enterprises
* *
* Permission is hereby granted, free of charge, to any person obtaining a copy * Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal * of this software and associated documentation files (the "Software"), to deal
@ -51,7 +51,7 @@ if (!is_callable('RandomCompat_strlen')) {
); );
} }
return mb_strlen($binary_string, '8bit'); return (int) mb_strlen($binary_string, '8bit');
} }
} else { } else {
@ -73,7 +73,7 @@ if (!is_callable('RandomCompat_strlen')) {
'RandomCompat_strlen() expects a string' 'RandomCompat_strlen() expects a string'
); );
} }
return strlen($binary_string); return (int) strlen($binary_string);
} }
} }
} }
@ -118,7 +118,7 @@ if (!is_callable('RandomCompat_substr')) {
* mb_substr($str, 0, NULL, '8bit') returns an empty string on * mb_substr($str, 0, NULL, '8bit') returns an empty string on
* PHP 5.3, so we have to find the length ourselves. * PHP 5.3, so we have to find the length ourselves.
*/ */
$length = RandomCompat_strlen($length) - $start; $length = RandomCompat_strlen($binary_string) - $start;
} elseif (!is_int($length)) { } elseif (!is_int($length)) {
throw new TypeError( throw new TypeError(
'RandomCompat_substr(): Third argument should be an integer, or omitted' 'RandomCompat_substr(): Third argument should be an integer, or omitted'
@ -130,10 +130,10 @@ if (!is_callable('RandomCompat_substr')) {
return ''; return '';
} }
if ($start > RandomCompat_strlen($binary_string)) { if ($start > RandomCompat_strlen($binary_string)) {
return false; return '';
} }
return mb_substr($binary_string, $start, $length, '8bit'); return (string) mb_substr($binary_string, $start, $length, '8bit');
} }
} else { } else {
@ -172,10 +172,10 @@ if (!is_callable('RandomCompat_substr')) {
); );
} }
return substr($binary_string, $start, $length); return (string) substr($binary_string, $start, $length);
} }
return substr($binary_string, $start); return (string) substr($binary_string, $start);
} }
} }
} }

@ -5,7 +5,7 @@
* *
* The MIT License (MIT) * The MIT License (MIT)
* *
* Copyright (c) 2015 - 2016 Paragon Initiative Enterprises * Copyright (c) 2015 - 2018 Paragon Initiative Enterprises
* *
* Permission is hereby granted, free of charge, to any person obtaining a copy * Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal * of this software and associated documentation files (the "Software"), to deal
@ -38,15 +38,18 @@ if (!is_callable('RandomCompat_intval')) {
* through. * through.
* *
* @param int|float $number The number we want to convert to an int * @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 * @param bool $fail_open Set to true to not throw an exception
* *
* @return int (or float if $fail_open) * @return float|int
* @psalm-suppress InvalidReturnType
* *
* @throws TypeError * @throws TypeError
*/ */
function RandomCompat_intval($number, $fail_open = false) function RandomCompat_intval($number, $fail_open = false)
{ {
if (is_numeric($number)) { if (is_int($number) || is_float($number)) {
$number += 0;
} elseif (is_numeric($number)) {
$number += 0; $number += 0;
} }
@ -60,12 +63,13 @@ if (!is_callable('RandomCompat_intval')) {
$number = (int) $number; $number = (int) $number;
} }
if (is_int($number) || $fail_open) { if (is_int($number)) {
return $number; return (int) $number;
} elseif (!$fail_open) {
throw new TypeError(
'Expected an integer.'
);
} }
return $number;
throw new TypeError(
'Expected an integer.'
);
} }
} }

@ -5,7 +5,7 @@
* *
* The MIT License (MIT) * The MIT License (MIT)
* *
* Copyright (c) 2015 - 2016 Paragon Initiative Enterprises * Copyright (c) 2015 - 2018 Paragon Initiative Enterprises
* *
* Permission is hereby granted, free of charge, to any person obtaining a copy * Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal * of this software and associated documentation files (the "Software"), to deal

@ -3,12 +3,12 @@
* Random_* Compatibility Library * Random_* Compatibility Library
* for using the new PHP 7 random_* API in PHP 5 projects * for using the new PHP 7 random_* API in PHP 5 projects
* *
* @version 2.0.4 * @version 2.0.15
* @released 2016-11-07 * @released 2018-06-08
* *
* The MIT License (MIT) * The MIT License (MIT)
* *
* Copyright (c) 2015 - 2016 Paragon Initiative Enterprises * Copyright (c) 2015 - 2018 Paragon Initiative Enterprises
* *
* Permission is hereby granted, free of charge, to any person obtaining a copy * Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal * of this software and associated documentation files (the "Software"), to deal
@ -44,172 +44,183 @@ if (!defined('PHP_VERSION_ID')) {
/** /**
* PHP 7.0.0 and newer have these functions natively. * PHP 7.0.0 and newer have these functions natively.
*/ */
if (PHP_VERSION_ID < 70000) { if (PHP_VERSION_ID >= 70000) {
if (!defined('RANDOM_COMPAT_READ_BUFFER')) { return;
define('RANDOM_COMPAT_READ_BUFFER', 8); }
}
$RandomCompatDIR = dirname(__FILE__); if (!defined('RANDOM_COMPAT_READ_BUFFER')) {
define('RANDOM_COMPAT_READ_BUFFER', 8);
}
require_once $RandomCompatDIR.'/byte_safe_strings.php'; $RandomCompatDIR = dirname(__FILE__);
require_once $RandomCompatDIR.'/cast_to_int.php';
require_once $RandomCompatDIR.'/error_polyfill.php';
if (!is_callable('random_bytes')) { require_once $RandomCompatDIR . DIRECTORY_SEPARATOR . 'byte_safe_strings.php';
/** require_once $RandomCompatDIR . DIRECTORY_SEPARATOR . 'cast_to_int.php';
* PHP 5.2.0 - 5.6.x way to implement random_bytes() require_once $RandomCompatDIR . DIRECTORY_SEPARATOR . 'error_polyfill.php';
*
* We use conditional statements here to define the function in accordance if (!is_callable('random_bytes')) {
* to the operating environment. It's a micro-optimization. /**
* * PHP 5.2.0 - 5.6.x way to implement random_bytes()
* In order of preference: *
* 1. Use libsodium if available. * We use conditional statements here to define the function in accordance
* 2. fread() /dev/urandom if available (never on Windows) * to the operating environment. It's a micro-optimization.
* 3. mcrypt_create_iv($bytes, MCRYPT_DEV_URANDOM) *
* 4. COM('CAPICOM.Utilities.1')->GetRandom() * In order of preference:
* 5. openssl_random_pseudo_bytes() (absolute last resort) * 1. Use libsodium if available.
* * 2. fread() /dev/urandom if available (never on Windows)
* See RATIONALE.md for our reasoning behind this particular order * 3. mcrypt_create_iv($bytes, MCRYPT_DEV_URANDOM)
*/ * 4. COM('CAPICOM.Utilities.1')->GetRandom()
if (extension_loaded('libsodium')) { *
// See random_bytes_libsodium.php * See RATIONALE.md for our reasoning behind this particular order
if (PHP_VERSION_ID >= 50300 && is_callable('\\Sodium\\randombytes_buf')) { */
require_once $RandomCompatDIR.'/random_bytes_libsodium.php'; if (extension_loaded('libsodium')) {
} elseif (method_exists('Sodium', 'randombytes_buf')) { // See random_bytes_libsodium.php
require_once $RandomCompatDIR.'/random_bytes_libsodium_legacy.php'; if (PHP_VERSION_ID >= 50300 && is_callable('\\Sodium\\randombytes_buf')) {
} require_once $RandomCompatDIR . DIRECTORY_SEPARATOR . 'random_bytes_libsodium.php';
} elseif (method_exists('Sodium', 'randombytes_buf')) {
require_once $RandomCompatDIR . DIRECTORY_SEPARATOR . 'random_bytes_libsodium_legacy.php';
} }
}
/** /**
* Reading directly from /dev/urandom: * Reading directly from /dev/urandom:
*/ */
if (DIRECTORY_SEPARATOR === '/') { if (DIRECTORY_SEPARATOR === '/') {
// DIRECTORY_SEPARATOR === '/' on Unix-like OSes -- this is a fast // DIRECTORY_SEPARATOR === '/' on Unix-like OSes -- this is a fast
// way to exclude Windows. // way to exclude Windows.
$RandomCompatUrandom = true; $RandomCompatUrandom = true;
$RandomCompat_basedir = ini_get('open_basedir'); $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 ( if (!empty($RandomCompat_basedir)) {
!is_callable('random_bytes') $RandomCompat_open_basedir = explode(
&& PATH_SEPARATOR,
$RandomCompatUrandom strtolower($RandomCompat_basedir)
&& );
@is_readable('/dev/urandom') $RandomCompatUrandom = (array() !== array_intersect(
) { array('/dev', '/dev/', '/dev/urandom'),
// Error suppression on is_readable() in case of an open_basedir $RandomCompat_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 $RandomCompat_open_basedir = null;
// 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()
*
* We only want to use mcypt_create_iv() if:
*
* - random_bytes() hasn't already been defined
* - PHP >= 5.3.7
* - the mcrypt extensions is loaded
* - One of these two conditions is true:
* - We're on Windows (DIRECTORY_SEPARATOR !== '/')
* - We're not on Windows and /dev/urandom is readabale
* (i.e. we're not in a chroot jail)
* - Special case:
* - If we're not on Windows, but the PHP version is between
* 5.6.10 and 5.6.12, we don't want to use mcrypt. It will
* hang indefinitely. This is bad.
*/
if ( if (
!is_callable('random_bytes') !is_callable('random_bytes')
&& &&
PHP_VERSION_ID >= 50307 $RandomCompatUrandom
&& &&
extension_loaded('mcrypt') @is_readable('/dev/urandom')
) { ) {
// Prevent this code from hanging indefinitely on non-Windows; // Error suppression on is_readable() in case of an open_basedir
// see https://bugs.php.net/bug.php?id=69833 // or safe_mode failure. All we care about is whether or not we
if ( // can read it at this point. If the PHP environment is going to
DIRECTORY_SEPARATOR !== '/' || // panic over trying to see if the file can be read in the first
(PHP_VERSION_ID <= 50609 || PHP_VERSION_ID >= 50613) // place, that is not helpful to us here.
) {
// See random_bytes_mcrypt.php // See random_bytes_dev_urandom.php
require_once $RandomCompatDIR.'/random_bytes_mcrypt.php'; require_once $RandomCompatDIR . DIRECTORY_SEPARATOR . 'random_bytes_dev_urandom.php';
}
} }
$RandomCompatUrandom = null; // Unset variables after use
$RandomCompat_basedir = null;
} else {
$RandomCompatUrandom = false;
}
/** /**
* This is a Windows-specific fallback, for when the mcrypt extension * mcrypt_create_iv()
* isn't loaded. *
*/ * We only want to use mcypt_create_iv() if:
if ( *
!is_callable('random_bytes') * - random_bytes() hasn't already been defined
&& * - the mcrypt extensions is loaded
extension_loaded('com_dotnet') * - One of these two conditions is true:
&& * - We're on Windows (DIRECTORY_SEPARATOR !== '/')
class_exists('COM') * - We're not on Windows and /dev/urandom is readabale
) { * (i.e. we're not in a chroot jail)
$RandomCompat_disabled_classes = preg_split( * - Special case:
'#\s*,\s*#', * - If we're not on Windows, but the PHP version is between
strtolower(ini_get('disable_classes')) * 5.6.10 and 5.6.12, we don't want to use mcrypt. It will
); * hang indefinitely. This is bad.
* - If we're on Windows, we want to use PHP >= 5.3.7 or else
* we get insufficient entropy errors.
*/
if (
!is_callable('random_bytes')
&&
// Windows on PHP < 5.3.7 is broken, but non-Windows is not known to be.
(DIRECTORY_SEPARATOR === '/' || PHP_VERSION_ID >= 50307)
&&
// Prevent this code from hanging indefinitely on non-Windows;
// see https://bugs.php.net/bug.php?id=69833
(
DIRECTORY_SEPARATOR !== '/' ||
(PHP_VERSION_ID <= 50609 || PHP_VERSION_ID >= 50613)
)
&&
extension_loaded('mcrypt')
) {
// See random_bytes_mcrypt.php
require_once $RandomCompatDIR . DIRECTORY_SEPARATOR . 'random_bytes_mcrypt.php';
}
$RandomCompatUrandom = null;
if (!in_array('com', $RandomCompat_disabled_classes)) { /**
try { * This is a Windows-specific fallback, for when the mcrypt extension
$RandomCompatCOMtest = new COM('CAPICOM.Utilities.1'); * isn't loaded.
if (method_exists($RandomCompatCOMtest, 'GetRandom')) { */
// See random_bytes_com_dotnet.php if (
require_once $RandomCompatDIR.'/random_bytes_com_dotnet.php'; !is_callable('random_bytes')
} &&
} catch (com_exception $e) { extension_loaded('com_dotnet')
// Don't try to use it. &&
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 . DIRECTORY_SEPARATOR . 'random_bytes_com_dotnet.php';
} }
} catch (com_exception $e) {
// Don't try to use it.
} }
$RandomCompat_disabled_classes = null;
$RandomCompatCOMtest = null;
} }
$RandomCompat_disabled_classes = null;
$RandomCompatCOMtest = null;
}
/**
* throw new Exception
*/
if (!is_callable('random_bytes')) {
/** /**
* throw new Exception * 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.
*
* @param mixed $length
* @psalm-suppress MissingReturnType
* @psalm-suppress InvalidReturnType
* @throws Exception
* @return string
*/ */
if (!is_callable('random_bytes')) { function random_bytes($length)
/** {
* We don't have any more options, so let's throw an exception right now unset($length); // Suppress "variable not used" warnings.
* and hope the developer won't let it fail silently. throw new Exception(
*/ 'There is no suitable CSPRNG installed on your system'
function random_bytes($length) );
{ return '';
throw new Exception(
'There is no suitable CSPRNG installed on your system'
);
}
} }
} }
}
if (!is_callable('random_int')) { if (!is_callable('random_int')) {
require_once $RandomCompatDIR.'/random_int.php'; require_once $RandomCompatDIR . DIRECTORY_SEPARATOR . 'random_int.php';
}
$RandomCompatDIR = null;
} }
$RandomCompatDIR = null;

@ -5,7 +5,7 @@
* *
* The MIT License (MIT) * The MIT License (MIT)
* *
* Copyright (c) 2015 - 2016 Paragon Initiative Enterprises * Copyright (c) 2015 - 2018 Paragon Initiative Enterprises
* *
* Permission is hereby granted, free of charge, to any person obtaining a copy * Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal * of this software and associated documentation files (the "Software"), to deal
@ -55,6 +55,11 @@ if (!is_callable('random_bytes')) {
} }
$buf = ''; $buf = '';
if (!class_exists('COM')) {
throw new Error(
'COM does not exist'
);
}
$util = new COM('CAPICOM.Utilities.1'); $util = new COM('CAPICOM.Utilities.1');
$execCount = 0; $execCount = 0;

@ -5,7 +5,7 @@
* *
* The MIT License (MIT) * The MIT License (MIT)
* *
* Copyright (c) 2015 - 2016 Paragon Initiative Enterprises * Copyright (c) 2015 - 2018 Paragon Initiative Enterprises
* *
* Permission is hereby granted, free of charge, to any person obtaining a copy * Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal * of this software and associated documentation files (the "Software"), to deal
@ -104,33 +104,50 @@ if (!is_callable('random_bytes')) {
* page load. * page load.
*/ */
if (!empty($fp)) { if (!empty($fp)) {
/**
* @var int
*/
$remaining = $bytes; $remaining = $bytes;
/**
* @var string|bool
*/
$buf = ''; $buf = '';
/** /**
* We use fread() in a loop to protect against partial reads * We use fread() in a loop to protect against partial reads
*/ */
do { do {
/**
* @var string|bool
*/
$read = fread($fp, $remaining); $read = fread($fp, $remaining);
if ($read === false) { if (!is_string($read)) {
/** if ($read === false) {
* We cannot safely read from the file. Exit the /**
* do-while loop and trigger the exception condition * We cannot safely read from the file. Exit the
*/ * do-while loop and trigger the exception condition
$buf = false; *
break; * @var string|bool
*/
$buf = false;
break;
}
} }
/** /**
* Decrease the number of bytes returned from remaining * Decrease the number of bytes returned from remaining
*/ */
$remaining -= RandomCompat_strlen($read); $remaining -= RandomCompat_strlen($read);
$buf .= $read; /**
* @var string|bool
*/
$buf = $buf . $read;
} while ($remaining > 0); } while ($remaining > 0);
/** /**
* Is our result valid? * Is our result valid?
*/ */
if ($buf !== false) { if (is_string($buf)) {
if (RandomCompat_strlen($buf) === $bytes) { if (RandomCompat_strlen($buf) === $bytes) {
/** /**
* Return our random entropy buffer here: * Return our random entropy buffer here:

@ -5,7 +5,7 @@
* *
* The MIT License (MIT) * The MIT License (MIT)
* *
* Copyright (c) 2015 - 2016 Paragon Initiative Enterprises * Copyright (c) 2015 - 2018 Paragon Initiative Enterprises
* *
* Permission is hereby granted, free of charge, to any person obtaining a copy * Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal * of this software and associated documentation files (the "Software"), to deal

@ -5,7 +5,7 @@
* *
* The MIT License (MIT) * The MIT License (MIT)
* *
* Copyright (c) 2015 - 2016 Paragon Initiative Enterprises * Copyright (c) 2015 - 2018 Paragon Initiative Enterprises
* *
* Permission is hereby granted, free of charge, to any person obtaining a copy * Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal * of this software and associated documentation files (the "Software"), to deal
@ -56,23 +56,27 @@ if (!is_callable('random_bytes')) {
); );
} }
/**
* @var string
*/
$buf = '';
/** /**
* \Sodium\randombytes_buf() doesn't allow more than 2147483647 bytes to be * \Sodium\randombytes_buf() doesn't allow more than 2147483647 bytes to be
* generated in one invocation. * generated in one invocation.
*/ */
if ($bytes > 2147483647) { if ($bytes > 2147483647) {
$buf = '';
for ($i = 0; $i < $bytes; $i += 1073741824) { for ($i = 0; $i < $bytes; $i += 1073741824) {
$n = ($bytes - $i) > 1073741824 $n = ($bytes - $i) > 1073741824
? 1073741824 ? 1073741824
: $bytes - $i; : $bytes - $i;
$buf .= Sodium::randombytes_buf($n); $buf .= Sodium::randombytes_buf((int) $n);
} }
} else { } else {
$buf = Sodium::randombytes_buf($bytes); $buf .= Sodium::randombytes_buf((int) $bytes);
} }
if ($buf !== false) { if (is_string($buf)) {
if (RandomCompat_strlen($buf) === $bytes) { if (RandomCompat_strlen($buf) === $bytes) {
return $buf; return $buf;
} }

@ -5,7 +5,7 @@
* *
* The MIT License (MIT) * The MIT License (MIT)
* *
* Copyright (c) 2015 - 2016 Paragon Initiative Enterprises * Copyright (c) 2015 - 2018 Paragon Initiative Enterprises
* *
* Permission is hereby granted, free of charge, to any person obtaining a copy * Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal * of this software and associated documentation files (the "Software"), to deal

@ -1,191 +1,190 @@
<?php <?php
/**
* Random_* Compatibility Library
* for using the new PHP 7 random_* API in PHP 5 projects
*
* The MIT License (MIT)
*
* Copyright (c) 2015 - 2016 Paragon Initiative Enterprises
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
/**
* Fetch a random integer between $min and $max inclusive
*
* @param int $min
* @param int $max
*
* @throws Exception
*
* @return int
*/
function random_int($min, $max)
{
/**
* Type and input logic checks
*
* If you pass it a float in the range (~PHP_INT_MAX, PHP_INT_MAX)
* (non-inclusive), it will sanely cast it to an int. If you it's equal to
* ~PHP_INT_MAX or PHP_INT_MAX, we let it fail as not an integer. Floats
* lose precision, so the <= and => 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 { if (!is_callable('random_int')) {
$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, * Random_* Compatibility Library
* let's validate the logic then we can move forward with generating random * for using the new PHP 7 random_* API in PHP 5 projects
* integers along a given range. *
* The MIT License (MIT)
*
* Copyright (c) 2015 - 2018 Paragon Initiative Enterprises
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/ */
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 * Fetch a random integer between $min and $max inclusive
* *
* We want to store: * @param int $min
* $bytes => the number of random bytes we need * @param int $max
* $mask => an integer bitmask (for use with the &) operator *
* so we can minimize the number of discards * @throws Exception
*
* @return int
*/ */
$attempts = $bits = $bytes = $mask = $valueShift = 0; function random_int($min, $max)
{
/**
* 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. * Type and input logic checks
* Provided by @CodesInChaos, @oittaa *
* * If you pass it a float in the range (~PHP_INT_MAX, PHP_INT_MAX)
* @ref https://gist.github.com/CodesInChaos/03f9ea0b58e8b2b8d435 * (non-inclusive), it will sanely cast it to an int. If you it's equal to
* * ~PHP_INT_MAX or PHP_INT_MAX, we let it fail as not an integer. Floats
* We use ~0 as a mask in this case because it generates all 1s * lose precision, so the <= and => operators might accidentally let a float
* * through.
* @ref https://eval.in/400356 (32-bit)
* @ref http://3v4l.org/XX9r5 (64-bit)
*/ */
$bytes = PHP_INT_SIZE;
$mask = ~0;
} else { try {
$min = RandomCompat_intval($min);
} catch (TypeError $ex) {
throw new TypeError(
'random_int(): $min must be an integer'
);
}
/** try {
* $bits is effectively ceil(log($range, 2)) without dealing with $max = RandomCompat_intval($max);
* type juggling } catch (TypeError $ex) {
*/ throw new TypeError(
while ($range > 0) { 'random_int(): $max must be an integer'
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 * Now that we've verified our weak typing system has given us an integer,
* to a failure probability of 2^-128 for a working RNG * let's validate the logic then we can move forward with generating random
* integers along a given range.
*/ */
if ($attempts > 128) { if ($min > $max) {
throw new Exception( throw new Error(
'random_int: RNG is broken - too many rejections' 'Minimum value must be less than or equal to the maximum value'
); );
} }
if ($max === $min) {
return (int) $min;
}
/** /**
* Let's grab the necessary number of random bytes * 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
*/ */
$randomByteString = random_bytes($bytes); $attempts = $bits = $bytes = $mask = $valueShift = 0;
if ($randomByteString === false) {
throw new Exception(
'Random number generator failure'
);
}
/** /**
* Let's turn $randomByteString into an integer * 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
* This uses bitwise operators (<< and |) to build an integer * a float and we will lose some precision.
* out of the values extracted from ord()
*
* Example: [9F] | [6D] | [32] | [0C] =>
* 159 + 27904 + 3276800 + 201326592 =>
* 204631455
*/ */
$val = 0; $range = $max - $min;
for ($i = 0; $i < $bytes; ++$i) {
$val |= ord($randomByteString[$i]) << ($i * 8);
}
/** /**
* Apply mask * Test for integer overflow:
*/ */
$val &= $mask; if (!is_int($range)) {
$val += $valueShift;
/**
* 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;
++$attempts; } 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;
}
$val = 0;
/** /**
* If $val overflows to a floating point number, * Now that we have our parameters set up, let's begin generating
* ... or is larger than $max, * random integers until one falls between $min and $max
* ... or smaller than $min,
* then try again.
*/ */
} while (!is_int($val) || $val > $max || $val < $min); 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);
return (int) $val; /**
* 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;
}
} }

@ -0,0 +1,9 @@
<?php
require_once 'lib/byte_safe_strings.php';
require_once 'lib/cast_to_int.php';
require_once 'lib/error_polyfill.php';
require_once 'other/ide_stubs/libsodium.php';
require_once 'lib/random.php';
$int = random_int(0, 65536);
Loading…
Cancel
Save