X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fnolegacy%2Fcrypto.c;h=44692fdf28906e6b2bb0f5ecd4af6d0cd8107946;hb=7c359313aca273319f94fe18121831ab4b62a4b4;hp=96e4dda2f6da06ebf93145e0fc10db870fed0459;hpb=04fc19112da5e7fcefefcf6e490987cdcfb6f620;p=tinc diff --git a/src/nolegacy/crypto.c b/src/nolegacy/crypto.c index 96e4dda2..44692fdf 100644 --- a/src/nolegacy/crypto.c +++ b/src/nolegacy/crypto.c @@ -19,10 +19,6 @@ #include "../system.h" -#include -#include -#include - #include "../crypto.h" #ifndef HAVE_MINGW @@ -31,8 +27,11 @@ static int random_fd = -1; static void random_init(void) { random_fd = open("/dev/urandom", O_RDONLY); - if(random_fd < 0) + + if(random_fd < 0) { random_fd = open("/dev/random", O_RDONLY); + } + if(random_fd < 0) { fprintf(stderr, "Could not open source of random numbers: %s\n", strerror(errno)); abort(); @@ -46,12 +45,16 @@ static void random_exit(void) { void randomize(void *out, size_t outlen) { while(outlen) { size_t len = read(random_fd, out, outlen); + if(len <= 0) { - if(errno == EAGAIN || errno == EINTR) + if(errno == EAGAIN || errno == EINTR) { continue; + } + fprintf(stderr, "Could not read random numbers: %s\n", strerror(errno)); abort(); } + out += len; outlen -= len; }