Call ENGINE_load_builtin_engines().

[tinc] / src / openssl / crypto.c

diff --git a/src/openssl/crypto.c b/src/openssl/crypto.c
index ed8c8e2..7e020e6 100644 (file)
--- 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
@@ -31,8 +31,11 @@ static int random_fd = -1;
 
 static void random_init(void) {
        random_fd = open("/dev/urandom", O_RDONLY);
-       if(random_fd < 0)
+
+       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();
@@ -43,15 +46,21 @@ static void random_exit(void) {
        close(random_fd);
 }
 
-void randomize(void *out, size_t outlen) {
+void randomize(void *vout, size_t outlen) {
+       char *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;
+                       }
+
                        fprintf(stderr, "Could not read random numbers: %s\n", strerror(errno));
                        abort();
                }
+
                out += len;
                outlen -= len;
        }
@@ -86,10 +95,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");
@@ -98,6 +103,6 @@ void crypto_init(void) {
 }
 
 void crypto_exit(void) {
-       EVP_cleanup();
+       OPENSSL_cleanup();
        random_exit();
 }