X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fopenssl%2Fcrypto.c;h=34009d69ebfe8254cec9a7dabfdbf28bd785b939;hb=28b7a53b6;hp=6894d876d97c9c88ae7a34ebbcd6f225b642e6dd;hpb=f6e87ab476a0faf8b124ecaaa27f967d825e6457;p=tinc

diff --git a/src/openssl/crypto.c b/src/openssl/crypto.c
index 6894d876..34009d69 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,7 +20,6 @@
 #include "../system.h"
 
 #include <openssl/rand.h>
-#include <openssl/evp.h>
 #include <openssl/engine.h>
 
 #include "../crypto.h"
@@ -46,12 +45,14 @@ 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;
 			}
 
@@ -69,14 +70,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);
 }
 
@@ -93,10 +94,6 @@ void crypto_init(void) {
 	random_init();
 
 	ENGINE_load_builtin_engines();
-	ENGINE_register_all_complete();
-
-	ERR_load_crypto_strings();
-	OpenSSL_add_all_algorithms();
 
 	if(!RAND_status()) {
 		fprintf(stderr, "Not enough entropy for the PRNG!\n");
@@ -105,8 +102,5 @@ void crypto_init(void) {
 }
 
 void crypto_exit(void) {
-	EVP_cleanup();
-	ERR_free_strings();
-	ENGINE_cleanup();
 	random_exit();
 }