X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fopenssl%2Fcrypto.c;h=e594e73a070ff7f694e9cb6c7f85493e5559b7c1;hb=1af8ca58b86f5956d6acd9f63083a84666647ef0;hp=5b866b0b0293c34c8198872f51fa4bbb59b80977;hpb=04fc19112da5e7fcefefcf6e490987cdcfb6f620;p=tinc diff --git a/src/openssl/crypto.c b/src/openssl/crypto.c index 5b866b0b..e594e73a 100644 --- a/src/openssl/crypto.c +++ b/src/openssl/crypto.c @@ -31,8 +31,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(); @@ -43,15 +46,21 @@ static void random_exit(void) { close(random_fd); } -void randomize(void *out, size_t outlen) { +void randomize(void *vout, size_t outlen) { + char *out = vout; + 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; }