X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Ftincctl.c;h=9687ba4b7db81259be782678b64cebae16ae5103;hp=04fbdd5238b0166e7b36998972568efe9b85bed3;hb=c2dc3784f127ef6db6e9960a4abecc1aab6f4e31;hpb=268e3ffca7b45cfc736e1bc9bec7a113c6c45701

diff --git a/src/tincctl.c b/src/tincctl.c
index 04fbdd52..9687ba4b 100644
--- a/src/tincctl.c
+++ b/src/tincctl.c
@@ -1,6 +1,6 @@
 /*
     tincctl.c -- Controlling a running tincd
-    Copyright (C) 2007-2014 Guus Sliepen <guus@tinc-vpn.org>
+    Copyright (C) 2007-2015 Guus Sliepen <guus@tinc-vpn.org>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -88,8 +88,8 @@ static struct option const long_options[] = {
 
 static void version(void) {
 	printf("%s version %s (built %s %s, protocol %d.%d)\n", PACKAGE,
-		   VERSION, BUILD_DATE, BUILD_TIME, PROT_MAJOR, PROT_MINOR);
-	printf("Copyright (C) 1998-2014 Ivo Timmermans, Guus Sliepen and others.\n"
+		   BUILD_VERSION, BUILD_DATE, BUILD_TIME, PROT_MAJOR, PROT_MINOR);
+	printf("Copyright (C) 1998-2015 Ivo Timmermans, Guus Sliepen and others.\n"
 			"See the AUTHORS file for a complete list.\n\n"
 			"tinc comes with ABSOLUTELY NO WARRANTY.  This is free software,\n"
 			"and you are welcome to redistribute it under certain conditions;\n"
@@ -106,6 +106,7 @@ static void usage(bool status) {
 				"  -c, --config=DIR        Read configuration options from DIR.\n"
 				"  -n, --net=NETNAME       Connect to net NETNAME.\n"
 				"      --pidfile=FILENAME  Read control cookie from FILENAME.\n"
+				"      --force             Force some commands to work despite warnings.\n"
 				"      --help              Display this help and exit.\n"
 				"      --version           Output version information and exit.\n"
 				"\n"
@@ -133,6 +134,7 @@ static void usage(bool status) {
 				"    subnets                  - all known subnets in the VPN\n"
 				"    connections              - all meta connections with ourself\n"
 				"    [di]graph                - graph of the VPN in dotty format\n"
+				"    invitations              - outstanding invitations\n"
 				"  info NODE|SUBNET|ADDRESS   Give information about a particular NODE, SUBNET or ADDRESS.\n"
 				"  purge                      Purge unreachable nodes\n"
 				"  debug N                    Set debug level\n"
@@ -145,13 +147,15 @@ static void usage(bool status) {
 				"  log [level]                Dump log output [up to the specified level]\n"
 				"  export                     Export host configuration of local node to standard output\n"
 				"  export-all                 Export all host configuration files to standard output\n"
-				"  import [--force]           Import host configuration file(s) from standard input\n"
-				"  exchange [--force]         Same as export followed by import\n"
-				"  exchange-all [--force]     Same as export-all followed by import\n"
+				"  import                     Import host configuration file(s) from standard input\n"
+				"  exchange                   Same as export followed by import\n"
+				"  exchange-all               Same as export-all followed by import\n"
 				"  invite NODE [...]          Generate an invitation for NODE\n"
-				"  join INVITATION            Join a VPN using an INVITIATION\n"
+				"  join INVITATION            Join a VPN using an INVITATION\n"
 				"  network [NETNAME]          List all known networks, or switch to the one named NETNAME.\n"
 				"  fsck                       Check the configuration files for problems.\n"
+				"  sign [FILE]                Generate a signed version of a file.\n"
+				"  verify NODE [FILE]         Verify that a file was signed by the given NODE.\n"
 				"\n");
 		printf("Report bugs to tinc@tinc-vpn.org.\n");
 	}
@@ -231,6 +235,12 @@ FILE *fopenmask(const char *filename, const char *mode, mode_t perms) {
 	perms &= ~mask;
 	umask(~perms);
 	FILE *f = fopen(filename, mode);
+
+	if(!f) {
+		fprintf(stderr, "Could not open %s: %s\n", filename, strerror(errno));
+		return NULL;
+	}
+
 #ifdef HAVE_FCHMOD
 	if((perms & 0444) && f)
 		fchmod(fileno(f), perms);
@@ -320,7 +330,7 @@ static void disable_old_keys(const char *filename, const char *what) {
 
 static FILE *ask_and_open(const char *filename, const char *what, const char *mode, bool ask, mode_t perms) {
 	FILE *r;
-	char *directory;
+	char directory[PATH_MAX] = ".";
 	char buf[PATH_MAX];
 	char buf2[PATH_MAX];
 
@@ -348,7 +358,7 @@ static FILE *ask_and_open(const char *filename, const char *what, const char *mo
 	if(filename[0] != '/') {
 #endif
 		/* The directory is a relative path or a filename. */
-		directory = get_current_dir_name();
+		getcwd(directory, sizeof directory);
 		snprintf(buf2, sizeof buf2, "%s" SLASH "%s", directory, filename);
 		filename = buf2;
 	}
@@ -374,7 +384,7 @@ static FILE *ask_and_open(const char *filename, const char *what, const char *mo
 static bool ed25519_keygen(bool ask) {
 	ecdsa_t *key;
 	FILE *f;
-	char *pubname, *privname;
+	char fname[PATH_MAX];
 
 	fprintf(stderr, "Generating Ed25519 keypair:\n");
 
@@ -384,29 +394,25 @@ static bool ed25519_keygen(bool ask) {
 	} else
 		fprintf(stderr, "Done.\n");
 
-	xasprintf(&privname, "%s" SLASH "ed25519_key.priv", confbase);
-	f = ask_and_open(privname, "private Ed25519 key", "a", ask, 0600);
-	free(privname);
+	snprintf(fname, sizeof fname, "%s" SLASH "ed25519_key.priv", confbase);
+	f = ask_and_open(fname, "private Ed25519 key", "a", ask, 0600);
 
 	if(!f)
-		return false;
+		goto error;
 
 	if(!ecdsa_write_pem_private_key(key, f)) {
 		fprintf(stderr, "Error writing private key!\n");
-		ecdsa_free(key);
-		fclose(f);
-		return false;
+		goto error;
 	}
 
 	fclose(f);
 
 	if(name)
-		xasprintf(&pubname, "%s" SLASH "hosts" SLASH "%s", confbase, name);
+		snprintf(fname, sizeof fname, "%s" SLASH "hosts" SLASH "%s", confbase, name);
 	else
-		xasprintf(&pubname, "%s" SLASH "ed25519_key.pub", confbase);
+		snprintf(fname, sizeof fname, "%s" SLASH "ed25519_key.pub", confbase);
 
-	f = ask_and_open(pubname, "public Ed25519 key", "a", ask, 0666);
-	free(pubname);
+	f = ask_and_open(fname, "public Ed25519 key", "a", ask, 0666);
 
 	if(!f)
 		return false;
@@ -419,6 +425,12 @@ static bool ed25519_keygen(bool ask) {
 	ecdsa_free(key);
 
 	return true;
+
+error:
+	if(f)
+		fclose(f);
+	ecdsa_free(key);
+	return false;
 }
 
 #ifndef DISABLE_LEGACY
@@ -429,7 +441,7 @@ static bool ed25519_keygen(bool ask) {
 static bool rsa_keygen(int bits, bool ask) {
 	rsa_t *key;
 	FILE *f;
-	char *pubname, *privname;
+	char fname[PATH_MAX];
 
 	// Make sure the key size is a multiple of 8 bits.
 	bits &= ~0x7;
@@ -448,44 +460,44 @@ static bool rsa_keygen(int bits, bool ask) {
 	} else
 		fprintf(stderr, "Done.\n");
 
-	xasprintf(&privname, "%s" SLASH "rsa_key.priv", confbase);
-	f = ask_and_open(privname, "private RSA key", "a", ask, 0600);
-	free(privname);
+	snprintf(fname, sizeof fname, "%s" SLASH "rsa_key.priv", confbase);
+	f = ask_and_open(fname, "private RSA key", "a", ask, 0600);
 
 	if(!f)
-		return false;
+		goto error;
 
 	if(!rsa_write_pem_private_key(key, f)) {
 		fprintf(stderr, "Error writing private key!\n");
-		fclose(f);
-		rsa_free(key);
-		return false;
+		goto error;
 	}
 
 	fclose(f);
 
 	if(name)
-		xasprintf(&pubname, "%s" SLASH "hosts" SLASH "%s", confbase, name);
+		snprintf(fname, sizeof fname, "%s" SLASH "hosts" SLASH "%s", confbase, name);
 	else
-		xasprintf(&pubname, "%s" SLASH "rsa_key.pub", confbase);
+		snprintf(fname, sizeof fname, "%s" SLASH "rsa_key.pub", confbase);
 
-	f = ask_and_open(pubname, "public RSA key", "a", ask, 0666);
-	free(pubname);
+	f = ask_and_open(fname, "public RSA key", "a", ask, 0666);
 
 	if(!f)
-		return false;
+		goto error;
 
 	if(!rsa_write_pem_public_key(key, f)) {
 		fprintf(stderr, "Error writing public key!\n");
-		fclose(f);
-		rsa_free(key);
-		return false;
+		goto error;
 	}
 
 	fclose(f);
 	rsa_free(key);
 
 	return true;
+
+error:
+	if(f)
+		fclose(f);
+	rsa_free(key);
+	return false;
 }
 #endif
 
@@ -850,6 +862,13 @@ static int cmd_start(int argc, char *argv[]) {
 	}
 	return status;
 #else
+	int pfd[2] = {-1, -1};
+	if(socketpair(AF_UNIX, SOCK_STREAM, 0, pfd)) {
+		fprintf(stderr, "Could not create umbilical socket: %s\n", strerror(errno));
+		free(nargv);
+		return 1;
+	}
+
 	pid_t pid = fork();
 	if(pid == -1) {
 		fprintf(stderr, "Could not fork: %s\n", strerror(errno));
@@ -857,8 +876,15 @@ static int cmd_start(int argc, char *argv[]) {
 		return 1;
 	}
 
-	if(!pid)
+	if(!pid) {
+		close(pfd[0]);
+		char buf[100] = "";
+		snprintf(buf, sizeof buf, "%d", pfd[1]);
+		setenv("TINC_UMBILICAL", buf, true);
 		exit(execvp(c, nargv));
+	} else {
+		close(pfd[1]);
+	}
 
 	free(nargv);
 
@@ -866,12 +892,33 @@ static int cmd_start(int argc, char *argv[]) {
 #ifdef SIGINT
 	signal(SIGINT, SIG_IGN);
 #endif
+
+	// Pass all log messages from the umbilical to stderr.
+	// A nul-byte right before closure means tincd started succesfully.
+	bool failure = true;
+	char buf[1024];
+	ssize_t len;
+
+	while((len = read(pfd[0], buf, sizeof buf)) > 0) {
+		failure = buf[len - 1];
+		if(!failure)
+			len--;
+		write(2, buf, len);
+	}
+
+	if(len)
+		failure = true;
+
+	close(pfd[0]);
+
+	// Make sure the child process is really gone.
 	result = waitpid(pid, &status, 0);
+
 #ifdef SIGINT
 	signal(SIGINT, SIG_DFL);
 #endif
 
-	if(result != pid || !WIFEXITED(status) || WEXITSTATUS(status)) {
+	if(failure || result != pid || !WIFEXITED(status) || WEXITSTATUS(status)) {
 		fprintf(stderr, "Error starting %s\n", c);
 		return 1;
 	}
@@ -942,6 +989,65 @@ static int cmd_reload(int argc, char *argv[]) {
 
 }
 
+static int dump_invitations(void) {
+	char dname[PATH_MAX];
+	snprintf(dname, sizeof dname, "%s" SLASH "invitations", confbase);
+	DIR *dir = opendir(dname);
+	if(!dir) {
+		if(errno == ENOENT) {
+			fprintf(stderr, "No outstanding invitations.\n");
+			return 0;
+		}
+
+		fprintf(stderr, "Cannot not read directory %s: %s\n", dname, strerror(errno));
+		return 1;
+	}
+
+	struct dirent *ent;
+	bool found = false;
+
+	while((ent = readdir(dir))) {
+		char buf[MAX_STRING_SIZE];
+		if(b64decode(ent->d_name, buf, 24) != 18)
+			continue;
+
+		char fname[PATH_MAX];
+		snprintf(fname, sizeof fname, "%s" SLASH "%s", dname, ent->d_name);
+		FILE *f = fopen(fname, "r");
+		if(!f) {
+			fprintf(stderr, "Cannot open %s: %s\n", fname, strerror(errno));
+			fclose(f);
+			continue;
+		}
+
+		buf[0] = 0;
+		if(!fgets(buf, sizeof buf, f)) {
+			fprintf(stderr, "Invalid invitation file %s", fname);
+			fclose(f);
+			continue;
+		}
+		fclose(f);
+
+		char *eol = buf + strlen(buf);
+		while(strchr("\t \r\n", *--eol))
+			*eol = 0;
+		if(strncmp(buf, "Name = ", 7) || !check_id(buf + 7)) {
+			fprintf(stderr, "Invalid invitation file %s", fname);
+			continue;
+		}
+
+		found = true;
+		printf("%s %s\n", ent->d_name, buf + 7);
+	}
+
+	closedir(dir);
+
+	if(!found)
+		fprintf(stderr, "No outstanding invitations.\n");
+
+	return 0;
+}
+
 static int cmd_dump(int argc, char *argv[]) {
 	bool only_reachable = false;
 
@@ -962,6 +1068,9 @@ static int cmd_dump(int argc, char *argv[]) {
 		return 1;
 	}
 
+	if(!strcasecmp(argv[1], "invitations"))
+		return dump_invitations();
+
 	if(!connect_tincd(true))
 		return 1;
 
@@ -1324,6 +1433,29 @@ char *get_my_name(bool verbose) {
 	return NULL;
 }
 
+static ecdsa_t *get_pubkey(FILE *f) {
+	char buf[4096];
+	char *value;
+	while(fgets(buf, sizeof buf, f)) {
+		int len = strcspn(buf, "\t =");
+		value = buf + len;
+		value += strspn(value, "\t ");
+		if(*value == '=') {
+			value++;
+			value += strspn(value, "\t ");
+		}
+		if(!rstrip(value))
+			continue;
+		buf[len] = 0;
+		if(strcasecmp(buf, "Ed25519PublicKey"))
+			continue;
+		if(*value)
+			return ecdsa_set_base64_public_key(value);
+	}
+
+	return NULL;
+}
+
 const var_t variables[] = {
 	/* Server configuration */
 	{"AddressFamily", VAR_SERVER},
@@ -1370,8 +1502,13 @@ const var_t variables[] = {
 	{"UDPDiscoveryKeepaliveInterval", VAR_SERVER},
 	{"UDPDiscoveryInterval", VAR_SERVER},
 	{"UDPDiscoveryTimeout", VAR_SERVER},
+	{"MTUInfoInterval", VAR_SERVER},
+	{"UDPInfoInterval", VAR_SERVER},
 	{"UDPRcvBuf", VAR_SERVER},
 	{"UDPSndBuf", VAR_SERVER},
+	{"UPnP", VAR_SERVER},
+	{"UPnPDiscoverWait", VAR_SERVER},
+	{"UPnPRefreshPeriod", VAR_SERVER},
 	{"VDEGroup", VAR_SERVER},
 	{"VDEPort", VAR_SERVER},
 	/* Host configuration */
@@ -1531,11 +1668,11 @@ static int cmd_config(int argc, char *argv[]) {
 	}
 
 	// Open the right configuration file.
-	char *filename;
+	char filename[PATH_MAX];
 	if(node)
-		xasprintf(&filename, "%s" SLASH "%s", hosts_dir, node);
+		snprintf(filename, sizeof filename, "%s" SLASH "%s", hosts_dir, node);
 	else
-		filename = tinc_conf;
+		snprintf(filename, sizeof filename, "%s", tinc_conf);
 
 	FILE *f = fopen(filename, "r");
 	if(!f) {
@@ -1543,11 +1680,11 @@ static int cmd_config(int argc, char *argv[]) {
 		return 1;
 	}
 
-	char *tmpfile = NULL;
+	char tmpfile[PATH_MAX];
 	FILE *tf = NULL;
 
 	if(action >= -1) {
-		xasprintf(&tmpfile, "%s.config.tmp", filename);
+		snprintf(tmpfile, sizeof tmpfile, "%s.config.tmp", filename);
 		tf = fopen(tmpfile, "w");
 		if(!tf) {
 			fprintf(stderr, "Could not open temporary file %s: %s\n", tmpfile, strerror(errno));
@@ -1610,6 +1747,11 @@ static int cmd_config(int argc, char *argv[]) {
 				}
 				set = true;
 				continue;
+			// Add
+			} else if(action > 0) {
+				// Check if we've already seen this variable with the same value
+				if(!strcasecmp(bvalue, value))
+					found = true;
 			}
 		}
 
@@ -1642,7 +1784,7 @@ static int cmd_config(int argc, char *argv[]) {
 	}
 
 	// Add new variable if necessary.
-	if(action > 0 || (action == 0 && !set)) {
+	if((action > 0 && !found)|| (action == 0 && !set)) {
 		if(fprintf(tf, "%s = %s\n", variable, value) < 0) {
 			fprintf(stderr, "Error writing to temporary file %s: %s\n", tmpfile, strerror(errno));
 			return 1;
@@ -1691,7 +1833,7 @@ static int cmd_config(int argc, char *argv[]) {
 }
 
 static bool try_bind(int port) {
-	struct addrinfo *ai = NULL;
+	struct addrinfo *ai = NULL, *aip;
 	struct addrinfo hint = {
 		.ai_flags = AI_PASSIVE,
 		.ai_family = AF_UNSPEC,
@@ -1699,24 +1841,30 @@ static bool try_bind(int port) {
 		.ai_protocol = IPPROTO_TCP,
 	};
 
+	bool success = true;
 	char portstr[16];
 	snprintf(portstr, sizeof portstr, "%d", port);
 
 	if(getaddrinfo(NULL, portstr, &hint, &ai) || !ai)
 		return false;
 
-	while(ai) {
+	for(aip = ai; aip; aip = aip->ai_next) {
 		int fd = socket(ai->ai_family, SOCK_STREAM, IPPROTO_TCP);
-		if(!fd)
-			return false;
+		if(!fd) {
+			success = false;
+			break;
+		}
+
 		int result = bind(fd, ai->ai_addr, ai->ai_addrlen);
 		closesocket(fd);
-		if(result)
-			return false;
-		ai = ai->ai_next;
+		if(result) {
+			success = false;
+			break;
+		}
 	}
 
-	return true;
+	freeaddrinfo(ai);
+	return success;
 }
 
 int check_port(char *name) {
@@ -1728,11 +1876,11 @@ int check_port(char *name) {
 	for(int i = 0; i < 100; i++) {
 		int port = 0x1000 + (rand() & 0x7fff);
 		if(try_bind(port)) {
-			char *filename;
-			xasprintf(&filename, "%s" SLASH "hosts" SLASH "%s", confbase, name);
+			char filename[PATH_MAX];
+			snprintf(filename, sizeof filename, "%s" SLASH "hosts" SLASH "%s", confbase, name);
 			FILE *f = fopen(filename, "a");
-			free(filename);
 			if(!f) {
+				fprintf(stderr, "Could not open %s: %s\n", filename, strerror(errno));
 				fprintf(stderr, "Please change tinc's Port manually.\n");
 				return 0;
 			}
@@ -1823,8 +1971,8 @@ static int cmd_init(int argc, char *argv[]) {
 	check_port(name);
 
 #ifndef HAVE_MINGW
-	char *filename;
-	xasprintf(&filename, "%s" SLASH "tinc-up", confbase);
+	char filename[PATH_MAX];
+	snprintf(filename, sizeof filename, "%s" SLASH "tinc-up", confbase);
 	if(access(filename, F_OK)) {
 		FILE *f = fopenmask(filename, "w", 0777);
 		if(!f) {
@@ -1934,12 +2082,12 @@ static int cmd_edit(int argc, char *argv[]) {
 		return 1;
 	}
 
-	char *filename = NULL;
+	char filename[PATH_MAX] = "";
 
 	if(strncmp(argv[1], "hosts" SLASH, 6)) {
 		for(int i = 0; conffiles[i]; i++) {
 			if(!strcmp(argv[1], conffiles[i])) {
-				xasprintf(&filename, "%s" SLASH "%s", confbase, argv[1]);
+				snprintf(filename, sizeof filename, "%s" SLASH "%s", confbase, argv[1]);
 				break;
 			}
 		}
@@ -1947,8 +2095,8 @@ static int cmd_edit(int argc, char *argv[]) {
 		argv[1] += 6;
 	}
 
-	if(!filename) {
-		xasprintf(&filename, "%s" SLASH "%s", hosts_dir, argv[1]);
+	if(!*filename) {
+		snprintf(filename, sizeof filename, "%s" SLASH "%s", hosts_dir, argv[1]);
 		char *dash = strchr(argv[1], '-');
 		if(dash) {
 			*dash++ = 0;
@@ -1966,6 +2114,7 @@ static int cmd_edit(int argc, char *argv[]) {
 	xasprintf(&command, "edit \"%s\"", filename);
 #endif
 	int result = system(command);
+	free(command);
 	if(result)
 		return result;
 
@@ -1977,8 +2126,8 @@ static int cmd_edit(int argc, char *argv[]) {
 }
 
 static int export(const char *name, FILE *out) {
-	char *filename;
-	xasprintf(&filename, "%s" SLASH "%s", hosts_dir, name);
+	char filename[PATH_MAX];
+	snprintf(filename, sizeof filename, "%s" SLASH "%s", hosts_dir, name);
 	FILE *in = fopen(filename, "r");
 	if(!in) {
 		fprintf(stderr, "Could not open configuration file %s: %s\n", filename, strerror(errno));
@@ -2065,7 +2214,7 @@ static int cmd_import(int argc, char *argv[]) {
 
 	char buf[4096];
 	char name[4096];
-	char *filename = NULL;
+	char filename[PATH_MAX] = "";
 	int count = 0;
 	bool firstline = true;
 
@@ -2081,8 +2230,7 @@ static int cmd_import(int argc, char *argv[]) {
 			if(out)
 				fclose(out);
 
-			free(filename);
-			xasprintf(&filename, "%s" SLASH "%s", hosts_dir, name);
+			snprintf(filename, sizeof filename, "%s" SLASH "%s", hosts_dir, name);
 
 			if(!force && !access(filename, F_OK)) {
 				fprintf(stderr, "Host configuration file %s already exists, skipping.\n", filename);
@@ -2188,11 +2336,10 @@ static int cmd_network(int argc, char *argv[]) {
 			continue;
 		}
 
-		char *fname;
-		xasprintf(&fname, "%s/%s/tinc.conf", confdir, ent->d_name);
+		char fname[PATH_MAX];
+		snprintf(fname, sizeof fname, "%s/%s/tinc.conf", confdir, ent->d_name);
 		if(!access(fname, R_OK))
 			printf("%s\n", ent->d_name);
-		free(fname);
 	}
 
 	closedir(dir);
@@ -2209,6 +2356,228 @@ static int cmd_fsck(int argc, char *argv[]) {
 	return fsck(orig_argv[0]);
 }
 
+static void *readfile(FILE *in, size_t *len) {
+	size_t count = 0;
+	size_t alloced = 4096;
+	char *buf = xmalloc(alloced);
+
+	while(!feof(in)) {
+		size_t read = fread(buf + count, 1, alloced - count, in);
+		if(!read)
+			break;
+		count += read;
+		if(count >= alloced) {
+			alloced *= 2;
+			buf = xrealloc(buf, alloced);
+		}
+	}
+
+	if(len)
+		*len = count;
+
+	return buf;
+}
+
+static int cmd_sign(int argc, char *argv[]) {
+	if(argc > 2) {
+		fprintf(stderr, "Too many arguments!\n");
+		return 1;
+	}
+
+	if(!name) {
+		name = get_my_name(true);
+		if(!name)
+			return 1;
+	}
+
+	char fname[PATH_MAX];
+	snprintf(fname, sizeof fname, "%s" SLASH "ed25519_key.priv", confbase);
+	FILE *fp = fopen(fname, "r");
+	if(!fp) {
+		fprintf(stderr, "Could not open %s: %s\n", fname, strerror(errno));
+		return 1;
+	}
+
+	ecdsa_t *key = ecdsa_read_pem_private_key(fp);
+
+	if(!key) {
+		fprintf(stderr, "Could not read private key from %s\n", fname);
+		fclose(fp);
+		return 1;
+	}
+
+	fclose(fp);
+
+	FILE *in;
+
+	if(argc == 2) {
+		in = fopen(argv[1], "rb");
+		if(!in) {
+			fprintf(stderr, "Could not open %s: %s\n", argv[1], strerror(errno));
+			ecdsa_free(key);
+			return 1;
+		}
+	} else {
+		in = stdin;
+	}
+
+	size_t len;
+	char *data = readfile(in, &len);
+	if(in != stdin)
+		fclose(in);
+	if(!data) {
+		fprintf(stderr, "Error reading %s: %s\n", argv[1], strerror(errno));
+		ecdsa_free(key);
+		return 1;
+	}
+
+	// Ensure we sign our name and current time as well
+	long t = time(NULL);
+	char *trailer;
+	xasprintf(&trailer, " %s %ld", name, t);
+	int trailer_len = strlen(trailer);
+
+	data = xrealloc(data, len + trailer_len);
+	memcpy(data + len, trailer, trailer_len);
+	free(trailer);
+
+	char sig[87];
+	if(!ecdsa_sign(key, data, len + trailer_len, sig)) {
+		fprintf(stderr, "Error generating signature\n");
+		free(data);
+		ecdsa_free(key);
+		return 1;
+	}
+	b64encode(sig, sig, 64);
+	ecdsa_free(key);
+
+	fprintf(stdout, "Signature = %s %ld %s\n", name, t, sig);
+	fwrite(data, len, 1, stdout);
+
+	free(data);
+	return 0;
+}
+
+static int cmd_verify(int argc, char *argv[]) {
+	if(argc < 2) {
+		fprintf(stderr, "Not enough arguments!\n");
+		return 1;
+	}
+
+	if(argc > 3) {
+		fprintf(stderr, "Too many arguments!\n");
+		return 1;
+	}
+
+	char *node = argv[1];
+	if(!strcmp(node, ".")) {
+		if(!name) {
+			name = get_my_name(true);
+			if(!name)
+				return 1;
+		}
+		node = name;
+	} else if(!strcmp(node, "*")) {
+		node = NULL;
+	} else {
+		if(!check_id(node)) {
+			fprintf(stderr, "Invalid node name\n");
+			return 1;
+		}
+	}
+
+	FILE *in;
+
+	if(argc == 3) {
+		in = fopen(argv[2], "rb");
+		if(!in) {
+			fprintf(stderr, "Could not open %s: %s\n", argv[2], strerror(errno));
+			return 1;
+		}
+	} else {
+		in = stdin;
+	}
+
+	size_t len;
+	char *data = readfile(in, &len);
+	if(in != stdin)
+		fclose(in);
+	if(!data) {
+		fprintf(stderr, "Error reading %s: %s\n", argv[1], strerror(errno));
+		return 1;
+	}
+
+	char *newline = memchr(data, '\n', len);
+	if(!newline || (newline - data > MAX_STRING_SIZE - 1)) {
+		fprintf(stderr, "Invalid input\n");
+		return 1;
+	}
+
+	*newline++ = '\0';
+
+	char signer[MAX_STRING_SIZE] = "";
+	char sig[MAX_STRING_SIZE] = "";
+	long t = 0;
+
+	if(sscanf(data, "Signature = %s %ld %s", signer, &t, sig) != 3 || strlen(sig) != 86 || !t || !check_id(signer)) {
+		fprintf(stderr, "Invalid input\n");
+		return 1;
+	}
+
+	if(node && strcmp(node, signer)) {
+		fprintf(stderr, "Signature is not made by %s\n", node);
+		return 1;
+	}
+
+	if(!node)
+		node = signer;
+
+	char *trailer;
+	xasprintf(&trailer, " %s %ld", signer, t);
+	int trailer_len = strlen(trailer);
+
+	data = xrealloc(data, len + trailer_len);
+	memcpy(data + len, trailer, trailer_len);
+	free(trailer);
+
+	char fname[PATH_MAX];
+	snprintf(fname, sizeof fname, "%s" SLASH "hosts" SLASH "%s", confbase, node);
+	FILE *fp = fopen(fname, "r");
+	if(!fp) {
+		fprintf(stderr, "Could not open %s: %s\n", fname, strerror(errno));
+		free(data);
+		return 1;
+	}
+
+	ecdsa_t *key = get_pubkey(fp);
+	if(!key) {
+		rewind(fp);
+		key = ecdsa_read_pem_public_key(fp);
+	}
+	if(!key) {
+		fprintf(stderr, "Could not read public key from %s\n", fname);
+		fclose(fp);
+		free(data);
+		return 1;
+	}
+
+	fclose(fp);
+
+	if(b64decode(sig, sig, 86) != 64 || !ecdsa_verify(key, newline, len + trailer_len - (newline - data), sig)) {
+		fprintf(stderr, "Invalid signature\n");
+		free(data);
+		ecdsa_free(key);
+		return 1;
+	}
+
+	ecdsa_free(key);
+
+	fwrite(newline, len - (newline - data), 1, stdout);
+
+	free(data);
+	return 0;
+}
+
 static const struct {
 	const char *command;
 	int (*function)(int argc, char *argv[]);
@@ -2219,6 +2588,7 @@ static const struct {
 	{"restart", cmd_restart},
 	{"reload", cmd_reload},
 	{"dump", cmd_dump},
+	{"list", cmd_dump},
 	{"purge", cmd_purge},
 	{"debug", cmd_debug},
 	{"retry", cmd_retry},
@@ -2252,6 +2622,8 @@ static const struct {
 	{"join", cmd_join},
 	{"network", cmd_network},
 	{"fsck", cmd_fsck},
+	{"sign", cmd_sign},
+	{"verify", cmd_verify},
 	{NULL, NULL},
 };
 
@@ -2486,7 +2858,7 @@ int main(int argc, char *argv[]) {
 	if(!parse_options(argc, argv))
 		return 1;
 
-	make_names();
+	make_names(false);
 	xasprintf(&tinc_conf, "%s" SLASH "tinc.conf", confbase);
 	xasprintf(&hosts_dir, "%s" SLASH "hosts", confbase);