archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

random: Simplify implementation of php_random_generate_fallback_seed() (#13761)

Browse source 
As all the input bits and pieces are mixed with SHA-1, cross-architecture
compatibility is not required and we can just mix in whatever they may look
like in memory, instead of going through the `write_*()` helpers that were
created for a previous in-development version that first filled a buffer that
was then hashed (allowing for easy inspection of the input data, but making it
harder to safely add values without checking for buffer overflows all the
time).

This change should also fix a build error on macOS ZTS: The thread ID is an
opaque type and not guaranteed to be arithmetic as per IEEE Std 1003.1-2017.
And indeed macOS defines it as a pointer to a structure, failing due to the
implicit pointer to integer conversion.
This commit is contained in:
Tim Düsterhus 2024-03-20 09:41:01 +01:00 • committed by GitHub
parent 2e7c6e1eb2
commit 6fb20cd9de
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 28 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

66
ext/random/random.c
View file

@ -614,30 +614,12 @@ PHP_FUNCTION(random_int)
} }
/* }}} */ /* }}} */
static void write_32(PHP_SHA1_CTX *c, uint32_t u) static inline void fallback_seed_add(PHP_SHA1_CTX *c, void *p, size_t l){
{ /* Wrapper around PHP_SHA1Update allowing to pass
unsigned char buf[4]; * arbitrary pointers without (unsigned char*) casts
unsigned char *p = buf; * everywhere.
*(p++) = (u >> 0) & 0xff; */
*(p++) = (u >> 8) & 0xff; PHP_SHA1Update(c, p, l);
*(p++) = (u >> 16) & 0xff;
*(p++) = (u >> 24) & 0xff;
PHP_SHA1Update(c, buf, sizeof(buf));
}
static void write_64(PHP_SHA1_CTX *c, uint64_t u)
{
write_32(c, u);
write_32(c, u >> 32);
}
static void write_p(PHP_SHA1_CTX *c, uintptr_t p)
{
if (sizeof(p) == 4) {
write_32(c, p);
} else {
write_64(c, p);
}
} }
uint64_t php_random_generate_fallback_seed(void) uint64_t php_random_generate_fallback_seed(void)
@ -650,47 +632,55 @@ uint64_t php_random_generate_fallback_seed(void)
*/ */
PHP_SHA1_CTX c; PHP_SHA1_CTX c;
struct timeval tv; struct timeval tv;
void *pointer;
pid_t pid;
#ifdef ZTS
THREAD_T tid;
#endif
char buf[64 + 1]; char buf[64 + 1];
PHP_SHA1Init(&c); PHP_SHA1Init(&c);
if (!RANDOM_G(fallback_seed_initialized)) { if (!RANDOM_G(fallback_seed_initialized)) {
/* Current time. */ /* Current time. */
gettimeofday(&tv, NULL); gettimeofday(&tv, NULL);
write_32(&c, tv.tv_sec); fallback_seed_add(&c, &tv, sizeof(tv));
write_32(&c, tv.tv_usec);
/* Various PIDs. */ /* Various PIDs. */
write_32(&c, getpid()); pid = getpid();
fallback_seed_add(&c, &pid, sizeof(pid));
#ifndef WIN32 #ifndef WIN32
write_32(&c, getppid()); pid = getppid();
fallback_seed_add(&c, &pid, sizeof(pid));
#endif #endif
#ifdef ZTS #ifdef ZTS
write_32(&c, tsrm_thread_id()); tid = tsrm_thread_id();
fallback_seed_add(&c, &tid, sizeof(tid));
#endif #endif
/* Pointer values to benefit from ASLR. */ /* Pointer values to benefit from ASLR. */
write_p(&c, (uintptr_t)&RANDOM_G(fallback_seed_initialized)); pointer = &RANDOM_G(fallback_seed_initialized);
write_p(&c, (uintptr_t)&c); fallback_seed_add(&c, &pointer, sizeof(pointer));
pointer = &c;
fallback_seed_add(&c, &pointer, sizeof(pointer));
/* Updated time. */ /* Updated time. */
gettimeofday(&tv, NULL); gettimeofday(&tv, NULL);
write_32(&c, tv.tv_usec); fallback_seed_add(&c, &tv, sizeof(tv));
/* Hostname. */ /* Hostname. */
memset(buf, 0, sizeof(buf)); memset(buf, 0, sizeof(buf));
if (gethostname(buf, sizeof(buf) - 1) == 0) { if (gethostname(buf, sizeof(buf) - 1) == 0) {
PHP_SHA1Update(&c, (unsigned char*)buf, strlen(buf)); fallback_seed_add(&c, buf, strlen(buf));
} }
/* CSPRNG. */ /* CSPRNG. */
if (php_random_bytes_silent(buf, 16) == SUCCESS) { if (php_random_bytes_silent(buf, 16) == SUCCESS) {
PHP_SHA1Update(&c, (unsigned char*)buf, 16); fallback_seed_add(&c, buf, 16);
} }
/* Updated time. */ /* Updated time. */
gettimeofday(&tv, NULL); gettimeofday(&tv, NULL);
write_32(&c, tv.tv_usec); fallback_seed_add(&c, &tv, sizeof(tv));
} else { } else {
/* Current time. */ /* Current time. */
gettimeofday(&tv, NULL); gettimeofday(&tv, NULL);
write_32(&c, tv.tv_sec); fallback_seed_add(&c, &tv, sizeof(tv));
write_32(&c, tv.tv_usec);
/* Previous state. */ /* Previous state. */
PHP_SHA1Update(&c, RANDOM_G(fallback_seed), 20); fallback_seed_add(&c, RANDOM_G(fallback_seed), 20);
} }
PHP_SHA1Final(RANDOM_G(fallback_seed), &c); PHP_SHA1Final(RANDOM_G(fallback_seed), &c);
RANDOM_G(fallback_seed_initialized) = true; RANDOM_G(fallback_seed_initialized) = true;