X-Git-Url: http://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Ftincd.c;h=3e3b7b0dfd9586b435912958d2c275c2f9a70fca;hb=636200d1a2024982fe5b3062153daa72a8253015;hp=20443101a369c690ecd82f1cc1586b0b36cdd74c;hpb=fe2f1fceb546ca4326435cac26bcf3f513e82b43;p=tinc

diff --git a/src/tincd.c b/src/tincd.c
index 20443101..3e3b7b0d 100644
--- 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"
@@ -191,7 +186,7 @@ static void make_names(void)
 #ifdef HAVE_MINGW
 	HKEY key;
 	char installdir[1024] = "";
-	long len = sizeof(installdir);
+	long len = sizeof installdir;
 #endif
 
 	if(netname)
@@ -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;
 }