From 0f1f8ccf43e1296725cfbef482d19c90b15af98c Mon Sep 17 00:00:00 2001 From: Daniel Borkmann Date: Tue, 4 Jun 2013 09:58:23 +0200 Subject: rnd: break out prng from xutils We only need it in curvetun, this makes it easier to maintain. Signed-off-by: Daniel Borkmann --- xio.c | 45 --------------------------------------------- 1 file changed, 45 deletions(-) (limited to 'xio.c') diff --git a/xio.c b/xio.c index 991ff7f..da17206 100644 --- a/xio.c +++ b/xio.c @@ -158,51 +158,6 @@ ssize_t write_exact(int fd, void *buf, size_t len, int mayexit) return num; } -static int fd_rnd = -1; - -static void randombytes(unsigned char *x, unsigned long long xlen) -{ - int ret; - - if (fd_rnd == -1) { - for (;;) { - fd_rnd = open("/dev/urandom", O_RDONLY); - if (fd_rnd != -1) - break; - sleep(1); - } - } - - while (xlen > 0) { - if (xlen < 1048576) - ret = xlen; - else - ret = 1048576; - - ret = read(fd_rnd, x, ret); - if (ret < 1) { - sleep(1); - continue; - } - - x += ret; - xlen -= ret; - } -} - -/* Note: it's not really secure, but the name only suggests it's better to use - * than rand(3) when transferring bytes over the network in non-security - * critical structure members. secrand() is only used to fill up salts actually. - */ -int secrand(void) -{ - int ret; - - randombytes((void *) &ret, sizeof(ret)); - - return ret; -} - static char const *priov[] = { [LOG_EMERG] = "EMERG:", [LOG_ALERT] = "ALERT:", -- cgit v1.2.3-54-g00ecf