X-Git-Url: http://git.meshlink.io/?p=meshlink;a=blobdiff_plain;f=src%2Fnet_setup.c;fp=src%2Fnet_setup.c;h=623eb1856692507628971263529110e5ff244cc4;hp=3c4bf48c71607795b8c5f4bedbc44436ef2e1991;hb=075e6828a7533e7daa790225f17aa6bb39703278;hpb=b5ccce296848aab72d574ca3de14af5fdf3efa4d

diff --git a/src/net_setup.c b/src/net_setup.c
index 3c4bf48c..623eb185 100644
--- a/src/net_setup.c
+++ b/src/net_setup.c
@@ -22,17 +22,13 @@
 
 #include "system.h"
 
-#include <openssl/pem.h>
-#include <openssl/rsa.h>
-#include <openssl/rand.h>
-#include <openssl/err.h>
-#include <openssl/evp.h>
-
-#include "avl_tree.h"
+#include "splay_tree.h"
+#include "cipher.h"
 #include "conf.h"
 #include "connection.h"
+#include "control.h"
 #include "device.h"
-#include "event.h"
+#include "digest.h"
 #include "graph.h"
 #include "logger.h"
 #include "net.h"
@@ -40,136 +36,77 @@
 #include "process.h"
 #include "protocol.h"
 #include "route.h"
+#include "rsa.h"
 #include "subnet.h"
 #include "utils.h"
 #include "xalloc.h"
 
 char *myport;
+static struct event device_ev;
 
-bool read_rsa_public_key(connection_t *c)
-{
+bool read_rsa_public_key(connection_t *c) {
 	FILE *fp;
 	char *fname;
-	char *key;
+	char *n;
+	bool result;
 
 	cp();
 
-	if(!c->rsa_key) {
-		c->rsa_key = RSA_new();
-//		RSA_blinding_on(c->rsa_key, NULL);
-	}
-
 	/* First, check for simple PublicKey statement */
 
-	if(get_config_string(lookup_config(c->config_tree, "PublicKey"), &key)) {
-		BN_hex2bn(&c->rsa_key->n, key);
-		BN_hex2bn(&c->rsa_key->e, "FFFF");
-		free(key);
-		return true;
+	if(get_config_string(lookup_config(c->config_tree, "PublicKey"), &n)) {
+		result = rsa_set_hex_public_key(&c->rsa, n, "FFFF");
+		free(n);
+		return result;
 	}
 
 	/* Else, check for PublicKeyFile statement and read it */
 
-	if(get_config_string(lookup_config(c->config_tree, "PublicKeyFile"), &fname)) {
-		fp = fopen(fname, "r");
-
-		if(!fp) {
-			logger(LOG_ERR, _("Error reading RSA public key file `%s': %s"),
-				   fname, strerror(errno));
-			free(fname);
-			return false;
-		}
-
-		free(fname);
-		c->rsa_key = PEM_read_RSAPublicKey(fp, &c->rsa_key, NULL, NULL);
-		fclose(fp);
-
-		if(c->rsa_key)
-			return true;		/* Woohoo. */
+	if(!get_config_string(lookup_config(c->config_tree, "PublicKeyFile"), &fname))
+		asprintf(&fname, "%s/hosts/%s", confbase, c->name);
 
-		/* If it fails, try PEM_read_RSA_PUBKEY. */
-		fp = fopen(fname, "r");
-
-		if(!fp) {
-			logger(LOG_ERR, _("Error reading RSA public key file `%s': %s"),
-				   fname, strerror(errno));
-			free(fname);
-			return false;
-		}
-
-		free(fname);
-		c->rsa_key = PEM_read_RSA_PUBKEY(fp, &c->rsa_key, NULL, NULL);
-		fclose(fp);
-
-		if(c->rsa_key) {
-//				RSA_blinding_on(c->rsa_key, NULL);
-			return true;
-		}
+	fp = fopen(fname, "r");
 
-		logger(LOG_ERR, _("Reading RSA public key file `%s' failed: %s"),
+	if(!fp) {
+		logger(LOG_ERR, _("Error reading RSA public key file `%s': %s"),
 			   fname, strerror(errno));
+		free(fname);
 		return false;
 	}
 
-	/* Else, check if a harnessed public key is in the config file */
-
-	xasprintf(&fname, "%s/hosts/%s", confbase, c->name);
-	fp = fopen(fname, "r");
-
-	if(fp) {
-		c->rsa_key = PEM_read_RSAPublicKey(fp, &c->rsa_key, NULL, NULL);
-		fclose(fp);
-	}
-
-	free(fname);
-
-	if(c->rsa_key)
-		return true;
-
-	/* Try again with PEM_read_RSA_PUBKEY. */
-
-	xasprintf(&fname, "%s/hosts/%s", confbase, c->name);
-	fp = fopen(fname, "r");
-
-	if(fp) {
-		c->rsa_key = PEM_read_RSA_PUBKEY(fp, &c->rsa_key, NULL, NULL);
-//		RSA_blinding_on(c->rsa_key, NULL);
-		fclose(fp);
-	}
+	result = rsa_read_pem_public_key(&c->rsa, fp);
+	fclose(fp);
 
+	if(!result) 
+		logger(LOG_ERR, _("Reading RSA public key file `%s' failed: %s"), fname, strerror(errno));
 	free(fname);
-
-	if(c->rsa_key)
-		return true;
-
-	logger(LOG_ERR, _("No public key for %s specified!"), c->name);
-
-	return false;
+	return result;
 }
 
-bool read_rsa_private_key(void)
-{
+bool read_rsa_private_key() {
 	FILE *fp;
-	char *fname, *key, *pubkey;
-	struct stat s;
+	char *fname;
+	char *n, *d;
+	bool result;
 
 	cp();
 
-	if(get_config_string(lookup_config(config_tree, "PrivateKey"), &key)) {
-		if(!get_config_string(lookup_config(myself->connection->config_tree, "PublicKey"), &pubkey)) {
+	/* First, check for simple PrivateKey statement */
+
+	if(get_config_string(lookup_config(config_tree, "PrivateKey"), &d)) {
+		if(!get_config_string(lookup_config(myself->connection->config_tree, "PublicKey"), &n)) {
 			logger(LOG_ERR, _("PrivateKey used but no PublicKey found!"));
+			free(d);
 			return false;
 		}
-		myself->connection->rsa_key = RSA_new();
-//		RSA_blinding_on(myself->connection->rsa_key, NULL);
-		BN_hex2bn(&myself->connection->rsa_key->d, key);
-		BN_hex2bn(&myself->connection->rsa_key->n, pubkey);
-		BN_hex2bn(&myself->connection->rsa_key->e, "FFFF");
-		free(key);
-		free(pubkey);
+		result = rsa_set_hex_private_key(&myself->connection->rsa, n, "FFFF", d);
+		free(n);
+		free(d);
 		return true;
 	}
 
+	/* Else, check for PrivateKeyFile statement and read it */
+
 	if(!get_config_string(lookup_config(config_tree, "PrivateKeyFile"), &fname))
 		xasprintf(&fname, "%s/rsa_key.priv", confbase);
 
@@ -183,9 +120,10 @@ bool read_rsa_private_key(void)
 	}
 
 #if !defined(HAVE_MINGW) && !defined(HAVE_CYGWIN)
+	struct stat s;
+
 	if(fstat(fileno(fp), &s)) {
-		logger(LOG_ERR, _("Could not stat RSA private key file `%s': %s'"),
-				fname, strerror(errno));
+		logger(LOG_ERR, _("Could not stat RSA private key file `%s': %s'"), fname, strerror(errno));
 		free(fname);
 		return false;
 	}
@@ -194,25 +132,37 @@ bool read_rsa_private_key(void)
 		logger(LOG_WARNING, _("Warning: insecure file permissions for RSA private key file `%s'!"), fname);
 #endif
 
-	myself->connection->rsa_key = PEM_read_RSAPrivateKey(fp, NULL, NULL, NULL);
+	result = rsa_read_pem_private_key(&myself->connection->rsa, fp);
 	fclose(fp);
 
-	if(!myself->connection->rsa_key) {
-		logger(LOG_ERR, _("Reading RSA private key file `%s' failed: %s"),
-			   fname, strerror(errno));
-		free(fname);
-		return false;
+	if(!result) 
+		logger(LOG_ERR, _("Reading RSA private key file `%s' failed: %s"), fname, strerror(errno));
+	free(fname);
+	return result;
+}
+
+static struct event keyexpire_event;
+
+static void keyexpire_handler(int fd, short events, void *data) {
+	regenerate_key();
+}
+
+void regenerate_key() {
+	if(timeout_initialized(&keyexpire_event)) {
+		ifdebug(STATUS) logger(LOG_INFO, _("Expiring symmetric keys"));
+		event_del(&keyexpire_event);
+		send_key_changed(broadcast, myself);
+	} else {
+		timeout_set(&keyexpire_event, keyexpire_handler, NULL);
 	}
 
-	free(fname);
-	return true;
+	event_add(&keyexpire_event, &(struct timeval){keylifetime, 0});
 }
 
 /*
   Configure node_t myself and set up the local sockets (listen only)
 */
-bool setup_myself(void)
-{
+bool setup_myself(void) {
 	config_t *cfg;
 	subnet_t *subnet;
 	char *name, *hostname, *mode, *afname, *cipher, *digest;
@@ -349,65 +299,36 @@ bool setup_myself(void)
 
 	/* Generate packet encryption key */
 
-	if(get_config_string
-	   (lookup_config(myself->connection->config_tree, "Cipher"), &cipher)) {
-		if(!strcasecmp(cipher, "none")) {
-			myself->incipher = NULL;
-		} else {
-			myself->incipher = EVP_get_cipherbyname(cipher);
-
-			if(!myself->incipher) {
-				logger(LOG_ERR, _("Unrecognized cipher type!"));
-				return false;
-			}
-		}
-	} else
-		myself->incipher = EVP_aes_256_cbc();
+	if(!get_config_string(lookup_config(myself->connection->config_tree, "Cipher"), &cipher))
+		cipher = xstrdup("aes256");
 
-	if(myself->incipher)
-		myself->inkeylength = myself->incipher->key_len + myself->incipher->iv_len;
-	else
-		myself->inkeylength = 1;
-
-	myself->connection->outcipher = EVP_aes_256_ofb();
+	if(!cipher_open_by_name(&myself->incipher, cipher)) {
+		logger(LOG_ERR, _("Unrecognized cipher type!"));
+		return false;
+	}
 
 	if(!get_config_int(lookup_config(config_tree, "KeyExpire"), &keylifetime))
 		keylifetime = 3600;
 
-	keyexpires = now + keylifetime;
-	
+	regenerate_key();
+
 	/* Check if we want to use message authentication codes... */
 
-	if(get_config_string(lookup_config(myself->connection->config_tree, "Digest"), &digest)) {
-		if(!strcasecmp(digest, "none")) {
-			myself->indigest = NULL;
-		} else {
-			myself->indigest = EVP_get_digestbyname(digest);
+	if(!get_config_string(lookup_config(myself->connection->config_tree, "Digest"), &digest))
+		digest = xstrdup("sha256");
 
-			if(!myself->indigest) {
-				logger(LOG_ERR, _("Unrecognized digest type!"));
-				return false;
-			}
-		}
-	} else
-		myself->indigest = EVP_sha256();
-
-	myself->connection->outdigest = EVP_sha256();
-
-	if(get_config_int(lookup_config(myself->connection->config_tree, "MACLength"), &myself->inmaclength)) {
-		if(myself->indigest) {
-			if(myself->inmaclength > myself->indigest->md_size) {
-				logger(LOG_ERR, _("MAC length exceeds size of digest!"));
-				return false;
-			} else if(myself->inmaclength < 0) {
-				logger(LOG_ERR, _("Bogus MAC length!"));
-				return false;
-			}
-		}
-	} else
-		myself->inmaclength = 4;
+	int maclength = 4;
+	get_config_int(lookup_config(myself->connection->config_tree, "MACLength"), &maclength);
 
-	myself->connection->outmaclength = 0;
+	if(maclength < 0) {
+		logger(LOG_ERR, _("Bogus MAC length!"));
+		return false;
+	}
+
+	if(!digest_open_by_name(&myself->indigest, digest, maclength)) {
+		logger(LOG_ERR, _("Unrecognized digest type!"));
+		return false;
+	}
 
 	/* Compression */
 
@@ -435,6 +356,14 @@ bool setup_myself(void)
 	if(!setup_device())
 		return false;
 
+	event_set(&device_ev, device_fd, EV_READ|EV_PERSIST, handle_device_data, NULL);
+
+	if (event_add(&device_ev, NULL) < 0) {
+		logger(LOG_ERR, _("event_add failed: %s"), strerror(errno));
+		close_device();
+		return false;
+	}
+
 	/* Run tinc-up script to further initialize the tap interface */
 	xasprintf(&envp[0], "NETNAME=%s", netname ? : "");
 	xasprintf(&envp[1], "DEVICE=%s", device ? : "");
@@ -480,8 +409,28 @@ bool setup_myself(void)
 		listen_socket[listen_sockets].udp =
 			setup_vpn_in_socket((sockaddr_t *) aip->ai_addr);
 
-		if(listen_socket[listen_sockets].udp < 0)
+		if(listen_socket[listen_sockets].udp < 0) {
+			close(listen_socket[listen_sockets].tcp);
 			continue;
+		}
+
+		event_set(&listen_socket[listen_sockets].ev_tcp,
+				  listen_socket[listen_sockets].tcp,
+				  EV_READ|EV_PERSIST,
+				  handle_new_meta_connection, NULL);
+		if(event_add(&listen_socket[listen_sockets].ev_tcp, NULL) < 0) {
+			logger(LOG_EMERG, _("event_add failed: %s"), strerror(errno));
+			abort();
+		}
+
+		event_set(&listen_socket[listen_sockets].ev_udp,
+				  listen_socket[listen_sockets].udp,
+				  EV_READ|EV_PERSIST,
+				  handle_incoming_vpn_data, NULL);
+		if(event_add(&listen_socket[listen_sockets].ev_udp, NULL) < 0) {
+			logger(LOG_EMERG, _("event_add failed: %s"), strerror(errno));
+			abort();
+		}
 
 		ifdebug(CONNECTIONS) {
 			hostname = sockaddr2hostname((sockaddr_t *) aip->ai_addr);
@@ -491,6 +440,11 @@ bool setup_myself(void)
 
 		memcpy(&listen_socket[listen_sockets].sa, aip->ai_addr, aip->ai_addrlen);
 		listen_sockets++;
+
+		if(listen_sockets >= MAXSOCKETS) {
+			logger(LOG_WARNING, _("Maximum of %d listening sockets reached"), MAXSOCKETS);
+			break;
+		}
 	}
 
 	freeaddrinfo(ai);
@@ -512,9 +466,6 @@ bool setup_network(void)
 {
 	cp();
 
-	now = time(NULL);
-
-	init_events();
 	init_connections();
 	init_subnets();
 	init_nodes();
@@ -545,9 +496,8 @@ bool setup_network(void)
 /*
   close all open network connections
 */
-void close_network_connections(void)
-{
-	avl_node_t *node, *next;
+void close_network_connections(void) {
+	splay_node_t *node, *next;
 	connection_t *c;
 	char *envp[5];
 	int i;
@@ -570,6 +520,8 @@ void close_network_connections(void)
 	}
 
 	for(i = 0; i < listen_sockets; i++) {
+		event_del(&listen_socket[i].ev_tcp);
+		event_del(&listen_socket[i].ev_udp);
 		close(listen_socket[i].tcp);
 		close(listen_socket[i].udp);
 	}
@@ -585,7 +537,6 @@ void close_network_connections(void)
 	exit_subnets();
 	exit_nodes();
 	exit_connections();
-	exit_events();
 
 	execute_script("tinc-down", envp);