Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-26 06:11:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bugzilla bug 100447: on BSD/OS 4.2 and 4.3, we have problem calling

Browse Source 
safe_popen in a threaded program.  So we don't call safe_popen when
we obtained some entropy from /dev/urandom.  Thanks to lidl@pix.net
for the bug report and the fix.
This commit is contained in:
wtc%netscape.com 2002-01-27 00:14:59 +00:00
parent 525478968d
commit d2e3ab55fb
1 changed files with 32 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
security/nss/lib/freebl/unix_rand.c
View File

@ -744,28 +744,17 @@ for the small amount of entropy it provides.
static char ps_cmd[] = "ps -el";
#endif
#endif /* DO_PS */
#if defined(BSDI)
static char netstat_ni_cmd[] = "netstat -nis";
#else
static char netstat_ni_cmd[] = "netstat -ni";
#endif
GiveSystemInfo();
bytes = RNG_GetNoise(buf, sizeof(buf));
RNG_RandomUpdate(buf, bytes);
#ifdef DO_PS
fp = safe_popen(ps_cmd);
if (fp != NULL) {
while ((bytes = fread(buf, 1, sizeof(buf), fp)) > 0)
RNG_RandomUpdate(buf, bytes);
safe_pclose(fp);
}
#endif
fp = safe_popen(netstat_ni_cmd);
if (fp != NULL) {
while ((bytes = fread(buf, 1, sizeof(buf), fp)) > 0)
RNG_RandomUpdate(buf, bytes);
safe_pclose(fp);
}
/*
* Pass the C environment and the addresses of the pointers to the
* hash function. This makes the random number function depend on the
@ -786,7 +775,7 @@ for the small amount of entropy it provides.
GiveSystemInfo();
/* grab some data from system's PRNG before any other files. */
RNG_FileUpdate("/dev/urandom", 1024);
bytes = RNG_FileUpdate("/dev/urandom", 1024);
/* If the user points us to a random file, pass it through the rng */
randfile = getenv("NSRANDFILE");
@ -798,6 +787,33 @@ for the small amount of entropy it provides.
for (cp = files; *cp; cp++)
RNG_FileForRNG(*cp);
/*
* Bug 100447: On BSD/OS 4.2 and 4.3, we have problem calling safe_popen
* in a pthreads environment. Therefore, we call safe_popen last and on
* BSD/OS we do not call safe_popen when we succeeded in getting data
* from /dev/urandom.
*/
#ifdef BSDI
if (bytes)
return;
#endif
#ifdef DO_PS
fp = safe_popen(ps_cmd);
if (fp != NULL) {
while ((bytes = fread(buf, 1, sizeof(buf), fp)) > 0)
RNG_RandomUpdate(buf, bytes);
safe_pclose(fp);
}
#endif
fp = safe_popen(netstat_ni_cmd);
if (fp != NULL) {
while ((bytes = fread(buf, 1, sizeof(buf), fp)) > 0)
RNG_RandomUpdate(buf, bytes);
safe_pclose(fp);
}
}
#else
void RNG_SystemInfoForRNG(void)