X-Git-Url: https://www.tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fnolegacy%2Fcrypto.c;h=6965218b16023274c639a6abe244757736de6638;hb=56621be326497d56db0c4c372ae3cc497018cfcf;hp=96e4dda2f6da06ebf93145e0fc10db870fed0459;hpb=4d50f9f3485503099f5cb6e8486e9b98b72cb9be;p=tinc

diff --git a/src/nolegacy/crypto.c b/src/nolegacy/crypto.c
index 96e4dda2..6965218b 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 <guus@tinc-vpn.org>
+    Copyright (C) 2007-2021 Guus Sliepen <guus@tinc-vpn.org>
 
     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,20 +19,19 @@
 
 #include "../system.h"
 
-#include <openssl/rand.h>
-#include <openssl/evp.h>
-#include <openssl/engine.h>
-
 #include "../crypto.h"
 
-#ifndef HAVE_MINGW
+#ifndef HAVE_WINDOWS
 
 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 <wincrypt.h>
 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);
 }