nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

detect DEV_RANDOM fopen failure and fall back, noting it in paniclog

Browse Source
This commit is contained in:
nhmall
2019-01-26 11:26:02 -05:00
committed by Patric Mueller
parent 0aa4d62a2c
commit c1327142b5
1 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
sys/unix/unixmain.c
View File

@@ -770,24 +770,30 @@ sys_random_seed()
{
unsigned long seed;
unsigned long pid = (unsigned long) getpid();
boolean no_seed = TRUE;
#ifdef DEV_RANDOM
FILE *fptr = NULL;
fptr = fopen(DEV_RANDOM, "r");
if (fptr) {
fread(&seed, sizeof(long), 1, fptr);
has_strong_rngseed = TRUE;
}
fclose(fptr);
#else
seed = (unsigned long) getnow(); /* time((TIME_type) 0) */
/* Quick dirty band-aid to prevent PRNG prediction */
if (pid) {
if (!(pid & 3L))
pid -= 1L;
seed *= pid;
has_strong_rngseed = TRUE; /* decl.c */
no_seed = FALSE;
fclose(fptr);
} else {
/* leaves clue, doesn't exit */
paniclog("sys_random_seed", "falling back to weak seed");
}
#endif
if (no_seed) {
seed = (unsigned long) getnow(); /* time((TIME_type) 0) */
/* Quick dirty band-aid to prevent PRNG prediction */
if (pid) {
if (!(pid & 3L))
pid -= 1L;
seed *= pid;
}
}
return seed;
}