X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;ds=sidebyside;f=src%2Fopenssl%2Fcrypto.c;h=fe5a599715c93c1c1317877bb45ab1d189af5087;hb=373b0c12d9d0e8a3b449fd18be704e28dd6403e1;hp=5c7573602651ccbead9d63ed3c2a4765c686f407;hpb=0345a1468613e1ba4a4aa6dbbef44a26f1eb42d9;p=tinc

diff --git a/src/openssl/crypto.c b/src/openssl/crypto.c
index 5c757360..fe5a5997 100644
--- a/src/openssl/crypto.c
+++ b/src/openssl/crypto.c
@@ -20,12 +20,11 @@
 #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;
 
@@ -47,7 +46,7 @@ static void random_exit(void) {
 }
 
 void randomize(void *vout, size_t outlen) {
-	char *out = vout;
+	uint8_t *out = vout;
 
 	while(outlen) {
 		ssize_t len = read(random_fd, out, outlen);
@@ -71,14 +70,14 @@ void randomize(void *vout, 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);
 }
 
@@ -94,11 +93,8 @@ void randomize(void *out, size_t outlen) {
 void crypto_init(void) {
 	random_init();
 
+#if OPENSSL_VERSION_MAJOR < 3
 	ENGINE_load_builtin_engines();
-	ENGINE_register_all_complete();
-#if OPENSSL_API_COMPAT < 0x10100000L
-	ERR_load_crypto_strings();
-	OpenSSL_add_all_algorithms();
 #endif
 
 	if(!RAND_status()) {
@@ -108,10 +104,5 @@ void crypto_init(void) {
 }
 
 void crypto_exit(void) {
-#if OPENSSL_API_COMPAT < 0x10100000L
-	EVP_cleanup();
-	ERR_free_strings();
-	ENGINE_cleanup();
-#endif
 	random_exit();
 }