diff options
| author | Lutz Jänicke <jaenicke@openssl.org> | 2001-01-09 16:44:59 +0000 |
|---|---|---|
| committer | Lutz Jänicke <jaenicke@openssl.org> | 2001-01-09 16:44:59 +0000 |
| commit | 599c03530ae1b63df396d35b9227d239d451e8fd (patch) | |
| tree | 81518ae1c99cdf7de23dfd4eaf8d50ae0ea7a5b8 /crypto/rand/rand_unix.c | |
| parent | 56a67adb6486df1ab417217e9855a1acc07b40ba (diff) | |
Add automatic query of EGD sockets to RAND_poll(). The EGD sockets are
only queried when the /dev/[u]random devices did not return enough
entropy. Only the amount of entropy missing to reach the required minimum
is queried, as EGD may be drained.
Queried locations are: /etc/entropy, /var/run/egd-pool
Diffstat (limited to 'crypto/rand/rand_unix.c')
| -rw-r--r-- | crypto/rand/rand_unix.c | 28 |
1 files changed, 26 insertions, 2 deletions
diff --git a/crypto/rand/rand_unix.c b/crypto/rand/rand_unix.c index 658d35f81c..b68e2bab91 100644 --- a/crypto/rand/rand_unix.c +++ b/crypto/rand/rand_unix.c @@ -125,13 +125,19 @@ int RAND_poll(void) { unsigned long l; pid_t curr_pid = getpid(); -#ifdef DEVRANDOM +#if defined(DEVRANDOM) || defined(DEVRANDOM_EGD) unsigned char tmpbuf[ENTROPY_NEEDED]; int n = 0; +#endif +#ifdef DEVRANDOM static const char *randomfiles[] = { DEVRANDOM, NULL }; const char **randomfile = NULL; int fd; #endif +#ifdef DEVRANDOM_EGD + static const char *egdsockets[] = { DEVRANDOM_EGD, NULL }; + const char **egdsocket = NULL; +#endif #ifdef DEVRANDOM /* Use a random entropy pool device. Linux, FreeBSD and OpenBSD @@ -185,6 +191,24 @@ int RAND_poll(void) close(fd); } } +#endif + +#ifdef DEVRANDOM_EGD + /* Use an EGD socket to read entropy from an EGD or PRNGD entropy + * collecting daemon. */ + + for (egdsocket = egdsockets; *egdsocket && n < ENTROPY_NEEDED; egdsocket++) + { + int r; + + r = RAND_query_egd_bytes(*egdsocket, (unsigned char *)tmpbuf+n, + ENTROPY_NEEDED-n); + if (r > 0) + n += r; + } +#endif + +#if defined(DEVRANDOM) || defined(DEVRANDOM_EGD) if (n > 0) { RAND_add(tmpbuf,sizeof tmpbuf,n); @@ -201,7 +225,7 @@ int RAND_poll(void) l=time(NULL); RAND_add(&l,sizeof(l),0); -#ifdef DEVRANDOM +#if defined(DEVRANDOM) || defined(DEVRANDOM_EGD) return 1; #endif return 0; |