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

diff --git a/src/openssl/crypto.c b/src/openssl/crypto.c
index bf9fe08a..fe5a5997 100644
--- a/src/openssl/crypto.c
+++ b/src/openssl/crypto.c
@@ -24,7 +24,7 @@
 
 #include "../crypto.h"
 
-#ifndef HAVE_MINGW
+#ifndef HAVE_WINDOWS
 
 static int random_fd = -1;
 
@@ -46,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);
@@ -70,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);
 }
 
@@ -93,7 +93,9 @@ void randomize(void *out, size_t outlen) {
 void crypto_init(void) {
 	random_init();
 
+#if OPENSSL_VERSION_MAJOR < 3
 	ENGINE_load_builtin_engines();
+#endif
 
 	if(!RAND_status()) {
 		fprintf(stderr, "Not enough entropy for the PRNG!\n");