X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fnolegacy%2Fcrypto.c;h=d9df82881c3fb8e8291e10276a7a03b83f2d5caa;hb=28b7a53b6;hp=96e4dda2f6da06ebf93145e0fc10db870fed0459;hpb=04fc19112da5e7fcefefcf6e490987cdcfb6f620;p=tinc diff --git a/src/nolegacy/crypto.c b/src/nolegacy/crypto.c index 96e4dda2..d9df8288 100644 --- a/src/nolegacy/crypto.c +++ b/src/nolegacy/crypto.c @@ -1,6 +1,6 @@ /* crypto.c -- Cryptographic miscellaneous functions and initialisation - Copyright (C) 2007-2014 Guus Sliepen + Copyright (C) 2007-2021 Guus Sliepen This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -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(); @@ -43,15 +42,21 @@ static void random_exit(void) { close(random_fd); } -void randomize(void *out, size_t outlen) { +void randomize(void *vout, size_t outlen) { + uint8_t *out = vout; + while(outlen) { - size_t len = read(random_fd, out, outlen); + ssize_t len = read(random_fd, out, outlen); + if(len <= 0) { - if(errno == EAGAIN || errno == EINTR) + if(len == -1 && (errno == EAGAIN || errno == EINTR)) { continue; + } + fprintf(stderr, "Could not read random numbers: %s\n", strerror(errno)); abort(); } + out += len; outlen -= len; } @@ -62,14 +67,14 @@ void randomize(void *out, size_t outlen) { #include HCRYPTPROV prov; -void random_init(void) { +static void random_init(void) { if(!CryptAcquireContext(&prov, NULL, NULL, PROV_RSA_FULL, CRYPT_VERIFYCONTEXT)) { fprintf(stderr, "CryptAcquireContext() failed!\n"); abort(); } } -void random_exit(void) { +static void random_exit(void) { CryptReleaseContext(prov, 0); }