diogo
/
symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use random_bytes function if it is available for random number generation

This commit is contained in:
Pierre du Plessis 2015-09-23 11:48:44 +02:00
parent b2f7753daf
commit 6a217dcecc
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/Symfony/Component/Security/Core/Util/SecureRandom.php
View File

@ -42,12 +42,12 @@ final class SecureRandom implements SecureRandomInterface
$this->seedFile = $seedFile; $this->seedFile = $seedFile;
$this->logger = $logger; $this->logger = $logger;
$isUnsupportedPhp = '\\' === DIRECTORY_SEPARATOR && PHP_VERSION_ID < 50304;
// determine whether to use OpenSSL // determine whether to use OpenSSL
if ('\\' === DIRECTORY_SEPARATOR && PHP_VERSION_ID < 50304) { if (!function_exists('random_bytes') && ($isUnsupportedPhp || !function_exists('openssl_random_pseudo_bytes'))) {
$this->useOpenSsl = false;
} elseif (!function_exists('openssl_random_pseudo_bytes')) {
if (null !== $this->logger) { if (null !== $this->logger) {
$this->logger->notice('It is recommended that you enable the "openssl" extension for random number generation.'); $this->logger->notice('It is recommended that you install the "paragonie/random_compat" library or enable the "openssl" extension for random number generation.');
} }
$this->useOpenSsl = false; $this->useOpenSsl = false;
} else { } else {
@ -60,6 +60,10 @@ final class SecureRandom implements SecureRandomInterface
*/ */
public function nextBytes($nbBytes) public function nextBytes($nbBytes)
{ {
if (function_exists('random_bytes')) {
return random_bytes($nbBytes);
}
// try OpenSSL // try OpenSSL
if ($this->useOpenSsl) { if ($this->useOpenSsl) {
$bytes = openssl_random_pseudo_bytes($nbBytes, $strong); $bytes = openssl_random_pseudo_bytes($nbBytes, $strong);

3
src/Symfony/Component/Security/composer.json
View File

@ -39,7 +39,8 @@
"symfony/validator": "", "symfony/validator": "",
"symfony/routing": "", "symfony/routing": "",
"doctrine/dbal": "to use the built-in ACL implementation", "doctrine/dbal": "to use the built-in ACL implementation",
"ircmaxell/password-compat": "" "ircmaxell/password-compat": "",
"paragonie/random_compat": ""
}, },
"autoload": { "autoload": {
"psr-0": { "Symfony\\Component\\Security\\": "" } "psr-0": { "Symfony\\Component\\Security\\": "" }