X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Ftincd.c;h=c0be975ee8635e6c80763e5ed86d368c7e791c6b;hb=d82fcc88f355e3c8144478a860dfae0b299004a9;hp=d5942ce0c2f396ba7c5b20566d31452487390090;hpb=1b8f8918360b40a2749d40355266ed7dedbe41b5;p=tinc

diff --git a/src/tincd.c b/src/tincd.c
index d5942ce0..c0be975e 100644
--- a/src/tincd.c
+++ b/src/tincd.c
@@ -31,13 +31,18 @@
 #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"
@@ -97,13 +102,14 @@ static void usage(bool status)
 				program_name);
 	else {
 		printf(_("Usage: %s [option]...\n\n"), program_name);
-		printf(_("  -c, --config=DIR                     Read configuration options from DIR.\n"
+		printf(_(	"  -c, --config=DIR              Read configuration options from DIR.\n"
 				"  -D, --no-detach               Don't fork and detach.\n"
 				"  -d, --debug[=LEVEL]           Increase debug level or set it to LEVEL.\n"
 				"  -n, --net=NETNAME             Connect to net NETNAME.\n"
 				"  -L, --mlock                   Lock tinc into main memory.\n"
 				"      --logfile[=FILENAME]      Write log entries to a logfile.\n"
 				"      --controlsocket=FILENAME  Open control socket at FILENAME.\n"
+				"      --bypass-security         Disables meta protocol security, for debugging.\n"
 				"      --help                    Display this help and exit.\n"
 				"      --version                 Output version information and exit.\n\n"));
 		printf(_("Report bugs to tinc@tinc-vpn.org.\n"));
@@ -289,7 +295,12 @@ int main(int argc, char **argv)
 	/* Slllluuuuuuurrrrp! */
 
 	srand(time(NULL));
-	crypto_init();
+	RAND_load_file("/dev/urandom", 1024);
+
+	ENGINE_load_builtin_engines();
+	ENGINE_register_all_complete();
+
+	OpenSSL_add_all_algorithms();
 
 	if(!read_server_config())
 		return 1;
@@ -342,7 +353,7 @@ end:
 	exit_control();
 #endif
 
-	crypto_exit();
-
+	EVP_cleanup();
+	
 	return status;
 }