Merge branch 'PHP-8.2'

TimWolla · TimWolla · commit 56dc2eb3c7f6 · 2023-01-23T18:21:57.000+01:00
* PHP-8.2: random: Do not trust arc4random_buf() on glibc (#10390)
diff --git a/ext/random/random.c b/ext/random/random.c
@@ -502,7 +502,7 @@ PHPAPI int php_random_bytes(void *bytes, size_t size, bool should_throw)
 		}
 		return FAILURE;
 	}
-#elif HAVE_DECL_ARC4RANDOM_BUF && ((defined(__OpenBSD__) && OpenBSD >= 201405) || (defined(__NetBSD__) && __NetBSD_Version__ >= 700000001) || defined(__APPLE__) || defined(__GLIBC__))
+#elif HAVE_DECL_ARC4RANDOM_BUF && ((defined(__OpenBSD__) && OpenBSD >= 201405) || (defined(__NetBSD__) && __NetBSD_Version__ >= 700000001) || defined(__APPLE__))
 	arc4random_buf(bytes, size);
 #else
 	size_t read_bytes = 0;

Original file line number	Diff line number	Diff line change
`@@ -502,7 +502,7 @@ PHPAPI int php_random_bytes(void *bytes, size_t size, bool should_throw)`
`502`	`502`	`}`
`503`	`503`	`return FAILURE;`
`504`	`504`	`}`
`505`		`-#elif HAVE_DECL_ARC4RANDOM_BUF && ((defined(__OpenBSD__) && OpenBSD >= 201405) \|\| (defined(__NetBSD__) && __NetBSD_Version__ >= 700000001) \|\| defined(__APPLE__) \|\| defined(__GLIBC__))`
	`505`	`+#elif HAVE_DECL_ARC4RANDOM_BUF && ((defined(__OpenBSD__) && OpenBSD >= 201405) \|\| (defined(__NetBSD__) && __NetBSD_Version__ >= 700000001) \|\| defined(__APPLE__))`
`506`	`506`	`arc4random_buf(bytes, size);`
`507`	`507`	`#else`
`508`	`508`	`size_t read_bytes = 0;`