Merge pull request #1036 from glensc/randomlib-deprecation

eventum · Apr 1, 2021 · f8b3013 · f8b3013
2 parents 3fded52 + 0917cc5
commit f8b3013
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -16,6 +16,7 @@ See [Upgrading] for details on how to upgrade.
 - Use logger via Symfony container, #1029
 - Fix twig deprecation, #1038
 - Fix markdown `heading_permalink` deprecation, #1037
+- Use `random_bytes()` rather RandomLib library, #1036
 
 [3.10.2]: https://github.com/eventum/eventum/compare/v3.10.1...master
 

diff --git a/lib/eventum/class.auth.php b/lib/eventum/class.auth.php
@@ -51,7 +51,7 @@ public static function privateKey(): string
     public static function generatePrivateKey(): void
     {
         $path = Setup::getPrivateKeyPath();
-        $private_key = md5(Misc::generateRandom(32));
+        $private_key = md5(random_bytes(32));
 
         $contents = '<' . "?php\n\$private_key = " . var_export($private_key, 1) . ";\n";
 

diff --git a/lib/eventum/class.misc.php b/lib/eventum/class.misc.php
@@ -541,10 +541,7 @@ public static function htmlentities($var): string
      */
     public static function generateRandom($size = 32)
     {
-        $factory = new RandomLib\Factory();
-        $generator = @$factory->getMediumStrengthGenerator();
-
-        return $generator->generate($size);
+        return random_bytes($size);
     }
 
     /**

diff --git a/src/Mail/MessageIdGenerator.php b/src/Mail/MessageIdGenerator.php
@@ -13,8 +13,6 @@
 
 namespace Eventum\Mail;
 
-use Misc;
-
 class MessageIdGenerator
 {
     /** @var string */
@@ -36,7 +34,7 @@ public function generate(): string
         $first = microtime(true);
 
         // second part is random string
-        $second = bin2hex(Misc::generateRandom(16));
+        $second = bin2hex(random_bytes(16));
 
         return $this->format($first, $second);
     }