X-Git-Url: https://www.tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fopenssl%2Fcrypto.c;h=fe5a599715c93c1c1317877bb45ab1d189af5087;hb=373b0c12d9d0e8a3b449fd18be704e28dd6403e1;hp=6c5cbc880fded4662911115a5db45877b0f4b5fd;hpb=ee34ac3d6125b7d1f41afa82c7e30f0a7205546c;p=tinc

diff --git a/src/openssl/crypto.c b/src/openssl/crypto.c
index 6c5cbc88..fe5a5997 100644
--- a/src/openssl/crypto.c
+++ b/src/openssl/crypto.c
@@ -1,6 +1,6 @@
 /*
     crypto.c -- Cryptographic miscellaneous functions and initialisation
-    Copyright (C) 2007-2013 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
@@ -20,19 +20,82 @@
 #include "../system.h"
 
 #include <openssl/rand.h>
-#include <openssl/evp.h>
 #include <openssl/engine.h>
 
 #include "../crypto.h"
 
+#ifndef HAVE_WINDOWS
+
+static int random_fd = -1;
+
+static void random_init(void) {
+	random_fd = open("/dev/urandom", O_RDONLY);
+
+	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();
+	}
+}
+
+static void random_exit(void) {
+	close(random_fd);
+}
+
+void randomize(void *vout, size_t outlen) {
+	uint8_t *out = vout;
+
+	while(outlen) {
+		ssize_t len = read(random_fd, out, outlen);
+
+		if(len <= 0) {
+			if(len == -1 && (errno == EAGAIN || errno == EINTR)) {
+				continue;
+			}
+
+			fprintf(stderr, "Could not read random numbers: %s\n", strerror(errno));
+			abort();
+		}
+
+		out += len;
+		outlen -= len;
+	}
+}
+
+#else
+
+#include <wincrypt.h>
+HCRYPTPROV prov;
+
+static void random_init(void) {
+	if(!CryptAcquireContext(&prov, NULL, NULL, PROV_RSA_FULL, CRYPT_VERIFYCONTEXT)) {
+		fprintf(stderr, "CryptAcquireContext() failed!\n");
+		abort();
+	}
+}
+
+static void random_exit(void) {
+	CryptReleaseContext(prov, 0);
+}
+
+void randomize(void *out, size_t outlen) {
+	if(!CryptGenRandom(prov, outlen, out)) {
+		fprintf(stderr, "CryptGenRandom() failed\n");
+		abort();
+	}
+}
+
+#endif
+
 void crypto_init(void) {
-	RAND_load_file("/dev/urandom", 1024);
+	random_init();
 
+#if OPENSSL_VERSION_MAJOR < 3
 	ENGINE_load_builtin_engines();
-	ENGINE_register_all_complete();
-
-	ERR_load_crypto_strings();
-	OpenSSL_add_all_algorithms();
+#endif
 
 	if(!RAND_status()) {
 		fprintf(stderr, "Not enough entropy for the PRNG!\n");
@@ -41,9 +104,5 @@ void crypto_init(void) {
 }
 
 void crypto_exit(void) {
-	EVP_cleanup();
-}
-
-void randomize(void *out, size_t outlen) {
-	RAND_pseudo_bytes(out, outlen);
+	random_exit();
 }