Refactor crypto RNG; add getrandom() support

[tinc] / src / control.c

diff --git a/src/control.c b/src/control.c
index 175f2bd..4c0ab51 100644 (file)
--- a/src/control.c
+++ b/src/control.c
@@ -18,7 +18,6 @@
 */
 
 #include "system.h"
-#include "crypto.h"
 #include "conf.h"
 #include "control.h"
 #include "control_common.h"
@@ -30,6 +29,7 @@
 #include "route.h"
 #include "utils.h"
 #include "xalloc.h"
+#include "random.h"
 
 char controlcookie[65];
 
@@ -185,7 +185,7 @@ bool init_control(void) {
        free(localhost);
        fclose(f);
 
-#ifndef HAVE_MINGW
+#ifndef HAVE_WINDOWS
        int unix_fd = socket(AF_UNIX, SOCK_STREAM, 0);
 
        if(unix_fd < 0) {
@@ -232,7 +232,7 @@ bool init_control(void) {
 }
 
 void exit_control(void) {
-#ifndef HAVE_MINGW
+#ifndef HAVE_WINDOWS
        unlink(unixsocketname);
        io_del(&unix_socket);
        close(unix_socket.fd);