X-Git-Url: https://www.tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fopenssl%2Fcrypto.c;h=3960c3e8433c6830bdbf8788a9748254ff4a80ee;hb=0fe69908838248c28624beb540257892db6bdcbd;hp=072bf7ab763a0bd3eea19e54971c995e95a7bcab;hpb=3ee0d5dddb56a13b8f3c50637e3cd075c701c9aa;p=tinc

diff --git a/src/openssl/crypto.c b/src/openssl/crypto.c
index 072bf7ab..3960c3e8 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-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
@@ -20,95 +20,17 @@
 #include "../system.h"
 
 #include <openssl/rand.h>
-#include <openssl/evp.h>
 #include <openssl/engine.h>
 
 #include "../crypto.h"
 
-#ifndef HAVE_MINGW
-
-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) {
-	char *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;
-
-void random_init(void) {
-	if(!CryptAcquireContext(&prov, NULL, NULL, PROV_RSA_FULL, CRYPT_VERIFYCONTEXT)) {
-		fprintf(stderr, "CryptAcquireContext() failed!\n");
-		abort();
-	}
-}
-
-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) {
-	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");
 		abort();
 	}
 }
-
-void crypto_exit(void) {
-	EVP_cleanup();
-	ERR_free_strings();
-	ENGINE_cleanup();
-	random_exit();
-}