Use random_bytes function if it is available for random number genera…

…tion
symfony · Sep 23, 2015 · 6a217dc · 6a217dc · acasademont · Feb 17, 2016
1 parent b2f7753
commit 6a217dc
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/src/Symfony/Component/Security/Core/Util/SecureRandom.php b/src/Symfony/Component/Security/Core/Util/SecureRandom.php
@@ -42,12 +42,12 @@ public function __construct($seedFile = null, LoggerInterface $logger = null)
         $this->seedFile = $seedFile;
         $this->logger = $logger;
 
+        $isUnsupportedPhp = '\\' === DIRECTORY_SEPARATOR && PHP_VERSION_ID < 50304;
+
         // determine whether to use OpenSSL
-        if ('\\' === DIRECTORY_SEPARATOR && PHP_VERSION_ID < 50304) {
-            $this->useOpenSsl = false;
-        } elseif (!function_exists('openssl_random_pseudo_bytes')) {
+        if (!function_exists('random_bytes') && ($isUnsupportedPhp || !function_exists('openssl_random_pseudo_bytes'))) {
             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;
         } else {
@@ -60,6 +60,10 @@ public function __construct($seedFile = null, LoggerInterface $logger = null)
      */
     public function nextBytes($nbBytes)
     {
+        if (function_exists('random_bytes')) {
+            return random_bytes($nbBytes);
+        }
+
         // try OpenSSL
         if ($this->useOpenSsl) {
             $bytes = openssl_random_pseudo_bytes($nbBytes, $strong);

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