Replace MinGW with Windows to avoid ambiguities

[tinc] / src / openssl / crypto.c

diff --git a/src/openssl/crypto.c b/src/openssl/crypto.c
index 8fc7e77..fe5a599 100644 (file)
--- 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,8 +93,9 @@ void randomize(void *out, size_t outlen) {
 void crypto_init(void) {
        random_init();
 
-       uint64_t opts = OPENSSL_INIT_LOAD_CRYPTO_STRINGS | OPENSSL_INIT_ADD_ALL_CIPHERS | OPENSSL_INIT_ADD_ALL_DIGESTS | OPENSSL_INIT_ENGINE_ALL_BUILTIN;
-       OPENSSL_init_crypto(opts, NULL);
+#if OPENSSL_VERSION_MAJOR < 3
+       ENGINE_load_builtin_engines();
+#endif
 
        if(!RAND_status()) {
                fprintf(stderr, "Not enough entropy for the PRNG!\n");
@@ -104,6 +104,5 @@ void crypto_init(void) {
 }
 
 void crypto_exit(void) {
-       OPENSSL_cleanup();
        random_exit();
 }