Use the crypto wrappers again instead of calling OpenSSL directly.

[meshlink] / src / tincd.c

diff --git a/src/tincd.c b/src/tincd.c
index c0be975ee8635e6c80763e5ed86d368c7e791c6b..0f78e45a6239e3a02625d7309d04eb44e6be9cdd 100644 (file)
--- a/src/tincd.c
+++ b/src/tincd.c
@@ -31,18 +31,13 @@
 #include <sys/mman.h>
 #endif
 
-#include <openssl/rand.h>
-#include <openssl/rsa.h>
-#include <openssl/pem.h>
-#include <openssl/evp.h>
-#include <openssl/engine.h>
-
 #include LZO1X_H
 
 #include <getopt.h>
 
 #include "conf.h"
 #include "control.h"
+#include "crypto.h"
 #include "device.h"
 #include "logger.h"
 #include "net.h"
@@ -218,7 +213,7 @@ static void make_names(void)
 #endif
 
        if(!controlsocketname)
-               asprintf(&controlsocketname, LOCALSTATEDIR "/run/%s.control", identname);
+               asprintf(&controlsocketname, "%s/run/%s.control/socket", LOCALSTATEDIR, identname);
 
        if(!logfilename)
                asprintf(&logfilename, LOCALSTATEDIR "/log/%s.log", identname);
@@ -295,12 +290,7 @@ int main(int argc, char **argv)
        /* Slllluuuuuuurrrrp! */
 
        srand(time(NULL));
-       RAND_load_file("/dev/urandom", 1024);
-
-       ENGINE_load_builtin_engines();
-       ENGINE_register_all_complete();
-
-       OpenSSL_add_all_algorithms();
+       crypto_init();
 
        if(!read_server_config())
                return 1;
@@ -353,7 +343,7 @@ end:
        exit_control();
 #endif
 
-       EVP_cleanup();
-       
+       crypto_exit();
+
        return status;
 }