oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

add EGD/PRNGD support

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@19997 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2007-01-20 20:15:28 +00:00
parent c0b88c68eb
commit d71e77f64b
6 changed files with 283 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
lib/des/rand-fortuna.c
View File

@@ -436,6 +436,8 @@ static int have_entropy;
static int
fortuna_reseed(void)
{
int entropy_p = 0;
if (!init_done)
abort();
@@ -443,6 +445,7 @@ fortuna_reseed(void)
unsigned char buf[INIT_BYTES];
if (_hc_rand_unix_bytes(buf, sizeof(buf)) == 1) {
add_entropy(&main_state, buf, sizeof(buf));
entropy_p = 1;
memset(buf, 0, sizeof(buf));
}
}
@@ -454,9 +457,21 @@ fortuna_reseed(void)
for (i = 0; i < sizeof(buf)/sizeof(buf[0]); i++)
buf[i] = arc4random();
add_entropy(&main_state, (void *)buf, sizeof(buf));
entropy_p = 1;
}
#endif
/* Add EGD thingy here */
/*
* Only to get egd entropy if /dev/random or arc4rand failed since
* it can be horribly slow to generate new bits.
*/
if (!entropy_p) {
unsigned char buf[INIT_BYTES];
if (_hc_rand_egd_bytes(NULL, buf, sizeof(buf)) == 1) {
add_entropy(&main_state, buf, sizeof(buf));
entropy_p = 1;
memset(buf, 0, sizeof(buf));
}
}
{
pid_t pid = getpid();
add_entropy(&main_state, (void *)&pid, sizeof(pid));
@@ -470,7 +485,7 @@ fortuna_reseed(void)
uid_t u = getuid();
add_entropy(&main_state, (void *)&u, sizeof(u));
}
return 1;
return entropy_p;
}
static int
@@ -493,6 +508,8 @@ fortuna_seed(const void *indata, int size)
{
fortuna_init();
add_entropy(&main_state, indata, size);
if (size >= INIT_BYTES)
have_entropy = 1;
}
static int