#include "config.h"
#include <setjmp.h>
+#include <signal.h>
#include <stdio.h>
+#include <stdlib.h>
#include <string.h>
-#include <signal.h>
#include <sys/types.h>
#include <sys/time.h>
#endif
#include <mLib/bits.h>
+#include <mLib/mdup.h>
+#include <mLib/sel.h>
#include <mLib/tv.h>
#include "noise.h"
x = tv->tv_usec + MILLION * tv->tv_sec;
d = x ^ noise_last;
dd = d ^ noise_diff;
+ noise_last = x;
noise_diff = d;
de = bitcount(d);
dde = bitcount(dd);
* This interface is Unix-specific.
*/
+struct noisekid {
+ rand_pool *r;
+ int good;
+ char buf[4096];
+ int donep;
+ int ret;
+};
+
+static void kid_read(int fd, unsigned mode, void *p)
+{
+ struct noisekid *nk = p;
+ ssize_t sz;
+ int goodbits;
+
+ noise_timer(nk->r);
+ if ((sz = read(fd, nk->buf, sizeof(nk->buf))) <= 0)
+ nk->donep = 1;
+ else {
+ goodbits = (sz * nk->good) / 128;
+ rand_add(nk->r, nk->buf, sz, goodbits);
+ nk->ret = 1;
+ }
+}
+
+static void kid_dead(struct timeval *tv, void *p)
+ { struct noisekid *nk = p; nk->donep = 1; }
+
int noise_filter(rand_pool *r, int good, const char *c)
{
- char buf[4096];
pid_t kid;
int fd[2];
struct timeval dead;
int ret = 0;
+ struct noisekid nk = { 0 };
+ sel_state sel;
+ sel_file sf;
+ sel_timer st;
const char *env[] = {
"PATH=/bin:/usr/bin:/sbin:/usr/sbin:/etc",
0
/* --- Handle the child end of the deal --- */
if (kid == 0) {
- int f;
+ mdup_fd mfd[3];
+ int f, i = 0;
/* --- Set the pipe as standard output, close standard input --- */
- close(0); close(1); close(2);
-
- if (fd[1] != 1) {
- if (dup2(fd[1], 1) < 0) _exit(127);
- close(fd[1]);
- }
-
- if ((f = open("/dev/null", O_RDONLY)) != 0 ||
- (f = open("/dev/null", O_WRONLY)) != 2)
- _exit(127);
+ if ((f = open("/dev/null", O_RDONLY)) < 0) _exit(127);
+ mfd[i].cur = f; mfd[i].want = 0; i++;
+ mfd[i].cur = fd[1]; mfd[i].want = 1; i++;
+ mfd[i].cur = f; mfd[i].want = 2; i++;
+ if (mdup(mfd, i)) _exit(127);
/* --- Play games with uids --- */
/* --- Start the process up --- */
- execle("/bin/sh", "-c", c, (char *)0, env);
+ execle("/bin/sh", "sh", "-c", c, (char *)0, env);
_exit(127);
}
/* --- Sort out my end of the deal --- */
close(fd[1]);
-
- /* --- Decide on the deadline --- */
-
+ sel_init(&sel);
+ nk.r = r; nk.good = good;
TV_ADDL(&dead, &dead, 0, NOISE_KIDLIFE);
-
- /* --- Now read, and think --- */
-
- for (;;) {
- struct timeval now, diff;
- fd_set rd;
-
- gettimeofday(&now, 0);
- timer(r, &now);
- if (TV_CMP(&now, >, &dead))
- break;
- TV_SUB(&diff, &dead, &now);
-
- FD_ZERO(&rd);
- FD_SET(fd[0], &rd);
-
- if (select(fd[0] + 1, &rd, 0, 0, &diff) < 0)
- break;
- if (FD_ISSET(fd[0], &rd)) {
- ssize_t sz;
- int goodbits;
-
- if ((sz = read(fd[0], buf, sizeof(buf))) <= 0)
- break;
- goodbits = (sz * good) / 128;
- rand_add(r, buf, sz, goodbits);
- ret = 1;
- }
- }
+ sel_initfile(&sel, &sf, fd[0], SEL_READ, kid_read, &nk);
+ sel_addfile(&sf);
+ sel_addtimer(&sel, &st, &dead, kid_dead, &nk);
+ while (!nk.donep && !sel_select(&sel));
/* --- We've finished with it: kill the child process --- *
*
*/
close(fd[0]);
- BURN(buf);
+ BURN(nk.buf);
noise_timer(r);
kill(kid, SIGKILL);
waitpid(kid, 0, 0);
- return (ret);
+ return (nk.ret);
}
/* --- @noise_freewheel@ --- *
unsigned i;
for (i = 0; i < 8; i++)
noise_freewheel(r);
- if (!noise_devrandom(r)) {
+ if (!noise_devrandom(r) || getenv("CATACOMB_FORCE_ESOTERIC_SOURCES")) {
noise_enquire(r);
for (i = 0; i < 8; i++)
noise_freewheel(r);