Merge pull request #9032 from laravel/5.0-rand-fix

Graham Campbell · Graham Campbell · commit a321dc914015 · 2015-06-03T17:09:04.000+01:00
[5.0] Make sure our random string is random
diff --git a/src/Illuminate/Support/Str.php b/src/Illuminate/Support/Str.php
@@ -218,9 +218,9 @@ public static function random($length = 16)
 			throw new RuntimeException('OpenSSL extension is required.');
 		}
 
-		$bytes = openssl_random_pseudo_bytes($length * 2);
+		$bytes = openssl_random_pseudo_bytes($length * 2, $strong);
 
-		if ($bytes === false)
+		if ($bytes === false || $strong === false)
 		{
 			throw new RuntimeException('Unable to generate random string.');
 		}

Original file line number	Diff line number	Diff line change
`@@ -218,9 +218,9 @@ public static function random($length = 16)`
`218`	`218`	`throw new RuntimeException('OpenSSL extension is required.');`
`219`	`219`	`}`
`220`	`220`
`221`		`- $bytes = openssl_random_pseudo_bytes($length * 2);`
	`221`	`+ $bytes = openssl_random_pseudo_bytes($length * 2, $strong);`
`222`	`222`
`223`		`- if ($bytes === false)`
	`223`	`+ if ($bytes === false \|\| $strong === false)`
`224`	`224`	`{`
`225`	`225`	`throw new RuntimeException('Unable to generate random string.');`
`226`	`226`	`}`