Fix segfault when failing to read random numbers.

[tinc] / src / nolegacy / crypto.c

diff --git a/src/nolegacy/crypto.c b/src/nolegacy/crypto.c
index 96e4dda..d6e2ce1 100644 (file)
--- a/src/nolegacy/crypto.c
+++ b/src/nolegacy/crypto.c
@@ -19,10 +19,6 @@
 
 #include "../system.h"
 
-#include <openssl/rand.h>
-#include <openssl/evp.h>
-#include <openssl/engine.h>
-
 #include "../crypto.h"
 
 #ifndef HAVE_MINGW
@@ -31,8 +27,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 +42,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;
        }