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

Fall back to gattering data from timer and secret files, this is

Browse Source 
really the last resort.


git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@21100 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2007-06-18 03:51:21 +00:00
parent a6fb942d8e
commit 58055ddfc9
1 changed files with 29 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
lib/hcrypto/rand-fortuna.c
View File

@@ -472,6 +472,35 @@ fortuna_reseed(void)
memset(buf, 0, sizeof(buf)); memset(buf, 0, sizeof(buf));
} }
} }
/*
* Fall back to gattering data from timer and secret files, this
* is really the last resort.
*/
if (!entropy_p) {
/* to save stackspace */
union {
unsigned char buf[INIT_BYTES];
unsigned char shad[1001];
} u;
int fd;
/* add timer info */
if ((*hc_rand_timer_method.bytes)(u.buf, sizeof(u.buf)) == 1)
add_entropy(&main_state, u.buf, sizeof(u.buf));
/* add /dev/shadow */
fd = open("/dev/shadow", O_RDONLY, 0);
if (fd >= 0) {
ssize_t n;
/* add_entropy will hash the buf */
while ((n = read(fd, (char *)u.shad, sizeof(u.shad))) > 0)
add_entropy(&main_state, u.shad, sizeof(u.shad));
close(fd);
}
memset(&u, 0, sizeof(u));
entropy_p = 1; /* sure about this ? */
}
{ {
pid_t pid = getpid(); pid_t pid = getpid();
add_entropy(&main_state, (void *)&pid, sizeof(pid)); add_entropy(&main_state, (void *)&pid, sizeof(pid));