X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fprotocol_key.c;h=39643cc34a589eca738ba005e1b0aa7ffa45d568;hb=248d300f1be0d5f2aae39202041699ab2b46c56b;hp=c392a469846e3878a53a65b84a110f43698df02e;hpb=36623e15a1c8685e5d8730345c1a7f9c93710fef;p=tinc

diff --git a/src/protocol_key.c b/src/protocol_key.c
index c392a469..39643cc3 100644
--- a/src/protocol_key.c
+++ b/src/protocol_key.c
@@ -1,7 +1,7 @@
 /*
     protocol_key.c -- handle the meta-protocol, key exchange
     Copyright (C) 1999-2005 Ivo Timmermans,
-                  2000-2011 Guus Sliepen <guus@tinc-vpn.org>
+                  2000-2012 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
@@ -51,12 +51,12 @@ void send_key_changed(void) {
 	}
 }
 
-bool key_changed_h(connection_t *c, char *request) {
+bool key_changed_h(connection_t *c, const char *request) {
 	char name[MAX_STRING_SIZE];
 	node_t *n;
 
 	if(sscanf(request, "%*d %*x " MAX_STRING, name) != 1) {
-		logger(LOG_ERR, "Got bad %s from %s (%s)", "KEY_CHANGED",
+		logger(DEBUG_ALWAYS, LOG_ERR, "Got bad %s from %s (%s)", "KEY_CHANGED",
 			   c->name, c->hostname);
 		return false;
 	}
@@ -67,7 +67,7 @@ bool key_changed_h(connection_t *c, char *request) {
 	n = lookup_node(name);
 
 	if(!n) {
-		logger(LOG_ERR, "Got %s from %s (%s) origin %s which does not exist",
+		logger(DEBUG_ALWAYS, LOG_ERR, "Got %s from %s (%s) origin %s which does not exist",
 			   "KEY_CHANGED", c->name, c->hostname, name);
 		return true;
 	}
@@ -84,30 +84,68 @@ bool key_changed_h(connection_t *c, char *request) {
 }
 
 bool send_req_key(node_t *to) {
-	return send_request(to->nexthop->connection, "%d %s %s %d", REQ_KEY, myself->name, to->name, experimental ? 1 : 0);
+	if(experimental && OPTION_VERSION(to->options) >= 2) {
+		if(!node_read_ecdsa_public_key(to))
+			send_request(to->nexthop->connection, "%d %s %s %d", REQ_KEY, myself->name, to->name, REQ_PUBKEY);
+	}
+	return send_request(to->nexthop->connection, "%d %s %s", REQ_KEY, myself->name, to->name);
+}
+
+/* REQ_KEY is overloaded to allow arbitrary requests to be routed between two nodes. */
+
+static bool req_key_ext_h(connection_t *c, const char *request, node_t *from, int reqno) {
+	switch(reqno) {
+		case REQ_PUBKEY: {
+			char *pubkey = ecdsa_get_base64_public_key(&myself->connection->ecdsa);
+			send_request(from->nexthop->connection, "%d %s %s %d %s", REQ_KEY, myself->name, from->name, ANS_PUBKEY, pubkey);
+			free(pubkey);
+			return true;
+		}
+
+		case ANS_PUBKEY: {
+			if(node_read_ecdsa_public_key(from)) {
+				logger(DEBUG_ALWAYS, LOG_WARNING, "Got ANS_PUBKEY from %s (%s) even though we already have his pubkey", from->name, from->hostname);
+				return true;
+			}
+
+			char pubkey[4096];
+			if(sscanf(request, "%*d %*s %*s %*d " MAX_STRING, pubkey) != 1 || !ecdsa_set_base64_public_key(&from->ecdsa, pubkey)) {
+				logger(DEBUG_ALWAYS, LOG_ERR, "Got bad %s from %s (%s): %s", "ANS_PUBKEY", from->name, from->hostname, "invalid pubkey");
+				return true;
+			}
+
+			logger(DEBUG_ALWAYS, LOG_INFO, "Learned ECDSA public key from %s (%s)", from->name, from->hostname);
+			append_config_file(from->name, "ECDSAPublicKey", pubkey);
+			return true;
+		}
+
+		default:
+			logger(DEBUG_ALWAYS, LOG_ERR, "Unknown extended REQ_KEY request from %s (%s): %s", from->name, from->hostname, request);
+			return true;
+	}
 }
 
-bool req_key_h(connection_t *c, char *request) {
+bool req_key_h(connection_t *c, const char *request) {
 	char from_name[MAX_STRING_SIZE];
 	char to_name[MAX_STRING_SIZE];
 	node_t *from, *to;
-	int kx_version = 0;
+	int reqno = 0;
 
-	if(sscanf(request, "%*d " MAX_STRING " " MAX_STRING " %d", from_name, to_name, &kx_version) < 2) {
-		logger(LOG_ERR, "Got bad %s from %s (%s)", "REQ_KEY", c->name,
+	if(sscanf(request, "%*d " MAX_STRING " " MAX_STRING " %d", from_name, to_name, &reqno) < 2) {
+		logger(DEBUG_ALWAYS, LOG_ERR, "Got bad %s from %s (%s)", "REQ_KEY", c->name,
 			   c->hostname);
 		return false;
 	}
 
 	if(!check_id(from_name) || !check_id(to_name)) {
-		logger(LOG_ERR, "Got bad %s from %s (%s): %s", "REQ_KEY", c->name, c->hostname, "invalid name");
+		logger(DEBUG_ALWAYS, LOG_ERR, "Got bad %s from %s (%s): %s", "REQ_KEY", c->name, c->hostname, "invalid name");
 		return false;
 	}
 
 	from = lookup_node(from_name);
 
 	if(!from) {
-		logger(LOG_ERR, "Got %s from %s (%s) origin %s which does not exist in our connection list",
+		logger(DEBUG_ALWAYS, LOG_ERR, "Got %s from %s (%s) origin %s which does not exist in our connection list",
 			   "REQ_KEY", c->name, c->hostname, from_name);
 		return true;
 	}
@@ -115,7 +153,7 @@ bool req_key_h(connection_t *c, char *request) {
 	to = lookup_node(to_name);
 
 	if(!to) {
-		logger(LOG_ERR, "Got %s from %s (%s) destination %s which does not exist in our connection list",
+		logger(DEBUG_ALWAYS, LOG_ERR, "Got %s from %s (%s) destination %s which does not exist in our connection list",
 			   "REQ_KEY", c->name, c->hostname, to_name);
 		return true;
 	}
@@ -123,17 +161,16 @@ bool req_key_h(connection_t *c, char *request) {
 	/* Check if this key request is for us */
 
 	if(to == myself) {			/* Yes, send our own key back */
-		if(experimental && kx_version >= 1) {
-			logger(LOG_DEBUG, "Got ECDH key request from %s", from->name);
-			from->status.ecdh = true;
-		}
+		if(experimental && reqno)
+			return req_key_ext_h(c, request, from, reqno);
+
 		send_ans_key(from);
 	} else {
 		if(tunnelserver)
 			return true;
 
 		if(!to->status.reachable) {
-			logger(LOG_WARNING, "Got %s from %s (%s) destination %s which is not reachable",
+			logger(DEBUG_ALWAYS, LOG_WARNING, "Got %s from %s (%s) destination %s which is not reachable",
 				"REQ_KEY", c->name, c->hostname, to_name);
 			return true;
 		}
@@ -156,24 +193,18 @@ bool send_ans_key_ecdh(node_t *to) {
 
 	b64encode(key, key, ECDH_SIZE + siglen);
 
-	char *pubkey = ecdsa_get_base64_public_key(&myself->connection->ecdsa);
-
-	if(!pubkey)
-		return false;
-
-	int result = send_request(to->nexthop->connection, "%d %s %s ECDH:%s:%s %d %d %zu %d", ANS_KEY,
-						myself->name, to->name, key, pubkey,
+	int result = send_request(to->nexthop->connection, "%d %s %s %s %d %d %d %d", ANS_KEY,
+						myself->name, to->name, key,
 						cipher_get_nid(&myself->incipher),
 						digest_get_nid(&myself->indigest),
-						digest_length(&myself->indigest),
+						(int)digest_length(&myself->indigest),
 						myself->incompression);
 
-	free(pubkey);
 	return result;
 }
 
 bool send_ans_key(node_t *to) {
-	if(experimental && to->status.ecdh)
+	if(experimental && OPTION_VERSION(to->options) >= 2)
 		return send_ans_key_ecdh(to);
 
 	size_t keylen = cipher_keylength(&myself->incipher);
@@ -194,15 +225,15 @@ bool send_ans_key(node_t *to) {
 	to->received_seqno = 0;
 	if(replaywin) memset(to->late, 0, replaywin);
 
-	return send_request(to->nexthop->connection, "%d %s %s %s %d %d %zu %d", ANS_KEY,
+	return send_request(to->nexthop->connection, "%d %s %s %s %d %d %d %d", ANS_KEY,
 						myself->name, to->name, key,
 						cipher_get_nid(&to->incipher),
 						digest_get_nid(&to->indigest),
-						digest_length(&to->indigest),
+						(int)digest_length(&to->indigest),
 						to->incompression);
 }
 
-bool ans_key_h(connection_t *c, char *request) {
+bool ans_key_h(connection_t *c, const char *request) {
 	char from_name[MAX_STRING_SIZE];
 	char to_name[MAX_STRING_SIZE];
 	char key[MAX_STRING_SIZE];
@@ -214,20 +245,20 @@ bool ans_key_h(connection_t *c, char *request) {
 	if(sscanf(request, "%*d "MAX_STRING" "MAX_STRING" "MAX_STRING" %d %d %d %d "MAX_STRING" "MAX_STRING,
 		from_name, to_name, key, &cipher, &digest, &maclength,
 		&compression, address, port) < 7) {
-		logger(LOG_ERR, "Got bad %s from %s (%s)", "ANS_KEY", c->name,
+		logger(DEBUG_ALWAYS, LOG_ERR, "Got bad %s from %s (%s)", "ANS_KEY", c->name,
 			   c->hostname);
 		return false;
 	}
 
 	if(!check_id(from_name) || !check_id(to_name)) {
-		logger(LOG_ERR, "Got bad %s from %s (%s): %s", "ANS_KEY", c->name, c->hostname, "invalid name");
+		logger(DEBUG_ALWAYS, LOG_ERR, "Got bad %s from %s (%s): %s", "ANS_KEY", c->name, c->hostname, "invalid name");
 		return false;
 	}
 
 	from = lookup_node(from_name);
 
 	if(!from) {
-		logger(LOG_ERR, "Got %s from %s (%s) origin %s which does not exist in our connection list",
+		logger(DEBUG_ALWAYS, LOG_ERR, "Got %s from %s (%s) origin %s which does not exist in our connection list",
 			   "ANS_KEY", c->name, c->hostname, from_name);
 		return true;
 	}
@@ -235,7 +266,7 @@ bool ans_key_h(connection_t *c, char *request) {
 	to = lookup_node(to_name);
 
 	if(!to) {
-		logger(LOG_ERR, "Got %s from %s (%s) destination %s which does not exist in our connection list",
+		logger(DEBUG_ALWAYS, LOG_ERR, "Got %s from %s (%s) destination %s which does not exist in our connection list",
 			   "ANS_KEY", c->name, c->hostname, to_name);
 		return true;
 	}
@@ -247,14 +278,14 @@ bool ans_key_h(connection_t *c, char *request) {
 			return true;
 
 		if(!to->status.reachable) {
-			logger(LOG_WARNING, "Got %s from %s (%s) destination %s which is not reachable",
+			logger(DEBUG_ALWAYS, LOG_WARNING, "Got %s from %s (%s) destination %s which is not reachable",
 				   "ANS_KEY", c->name, c->hostname, to_name);
 			return true;
 		}
 
 		if(!*address && from->address.sa.sa_family != AF_UNSPEC) {
 			char *address, *port;
-			ifdebug(PROTOCOL) logger(LOG_DEBUG, "Appending reflexive UDP address to ANS_KEY from %s to %s", from->name, to->name);
+			logger(DEBUG_PROTOCOL, LOG_DEBUG, "Appending reflexive UDP address to ANS_KEY from %s to %s", from->name, to->name);
 			sockaddr2str(&from->address, &address, &port);
 			send_request(to->nexthop->connection, "%s %s %s", request, address, port);
 			free(address);
@@ -268,22 +299,22 @@ bool ans_key_h(connection_t *c, char *request) {
 	/* Check and lookup cipher and digest algorithms */
 
 	if(!cipher_open_by_nid(&from->outcipher, cipher)) {
-		logger(LOG_ERR, "Node %s (%s) uses unknown cipher!", from->name, from->hostname);
+		logger(DEBUG_ALWAYS, LOG_ERR, "Node %s (%s) uses unknown cipher!", from->name, from->hostname);
 		return false;
 	}
 
 	if(!digest_open_by_nid(&from->outdigest, digest, maclength)) {
-		logger(LOG_ERR, "Node %s (%s) uses unknown digest!", from->name, from->hostname);
+		logger(DEBUG_ALWAYS, LOG_ERR, "Node %s (%s) uses unknown digest!", from->name, from->hostname);
 		return false;
 	}
 
 	if(maclength != digest_length(&from->outdigest)) {
-		logger(LOG_ERR, "Node %s (%s) uses bogus MAC length!", from->name, from->hostname);
+		logger(DEBUG_ALWAYS, LOG_ERR, "Node %s (%s) uses bogus MAC length!", from->name, from->hostname);
 		return false;
 	}
 
 	if(compression < 0 || compression > 11) {
-		logger(LOG_ERR, "Node %s (%s) uses bogus compression level!", from->name, from->hostname);
+		logger(DEBUG_ALWAYS, LOG_ERR, "Node %s (%s) uses bogus compression level!", from->name, from->hostname);
 		return true;
 	}
 
@@ -291,53 +322,40 @@ bool ans_key_h(connection_t *c, char *request) {
 
 	/* ECDH or old-style key exchange? */
 	
-	if(experimental && !strncmp(key, "ECDH:", 5)) {
-		char *pubkey = strchr(key + 5, ':');
-		if(pubkey)
-			*pubkey++ = 0;
-			
-		/* Check if we already have an ECDSA public key for this node.
-		 * If not, use the one from the key exchange, and store it. */
+	if(experimental && OPTION_VERSION(from->options) >= 2) {
+		/* Check if we already have an ECDSA public key for this node. */
 
 		if(!node_read_ecdsa_public_key(from)) {
-			if(!pubkey) {
-				logger(LOG_ERR, "No ECDSA public key known for %s (%s), cannot verify ECDH key exchange!", from->name, from->hostname);
-				return true;
-			}
-
-			if(!ecdsa_set_base64_public_key(&from->ecdsa, pubkey))
-				return true;
-
-			append_config_file(from->name, "ECDSAPublicKey", pubkey);
+			logger(DEBUG_ALWAYS, LOG_ERR, "No ECDSA public key known for %s (%s), cannot verify ECDH key exchange!", from->name, from->hostname);
+			return true;
 		}
 
 		int siglen = ecdsa_size(&from->ecdsa);
-		int keylen = b64decode(key + 5, key + 5, sizeof key - 5);
+		int keylen = b64decode(key, key, sizeof key);
 
 		if(keylen != ECDH_SIZE + siglen) {
-			logger(LOG_ERR, "Node %s (%s) uses wrong keylength! %d != %d", from->name, from->hostname, keylen, ECDH_SIZE + siglen);
+			logger(DEBUG_ALWAYS, LOG_ERR, "Node %s (%s) uses wrong keylength! %d != %d", from->name, from->hostname, keylen, ECDH_SIZE + siglen);
 			return true;
 		}
 
 		if(ECDH_SHARED_SIZE < cipher_keylength(&from->outcipher)) {
-			logger(LOG_ERR, "ECDH key too short for cipher of %s!", from->name);
+			logger(DEBUG_ALWAYS, LOG_ERR, "ECDH key too short for cipher of %s!", from->name);
 			return true;
 		}
 
-		if(!ecdsa_verify(&from->ecdsa, key + 5, ECDH_SIZE, key + 5 + ECDH_SIZE)) {
-			logger(LOG_ERR, "Possible intruder %s (%s): %s", from->name, from->hostname, "invalid ECDSA signature");
+		if(!ecdsa_verify(&from->ecdsa, key, ECDH_SIZE, key + ECDH_SIZE)) {
+			logger(DEBUG_ALWAYS, LOG_ERR, "Possible intruder %s (%s): %s", from->name, from->hostname, "invalid ECDSA signature");
 			return true;
 		}
 
 		if(!from->ecdh) {
-			from->status.ecdh = true;
-			if(!send_ans_key(from))
+			if(!send_ans_key_ecdh(from))
 				return true;
 		}
 
 		char shared[ECDH_SHARED_SIZE * 2 + 1];
 
-		if(!ecdh_compute_shared(&from->ecdh, key + 5, shared))
+		if(!ecdh_compute_shared(&from->ecdh, key, shared))
 			return true;
 
 		/* Update our crypto end */
@@ -386,7 +404,7 @@ bool ans_key_h(connection_t *c, char *request) {
 		keylen = hex2bin(key, key, sizeof key);
 
 		if(keylen != cipher_keylength(&from->outcipher)) {
-			logger(LOG_ERR, "Node %s (%s) uses wrong keylength!", from->name, from->hostname);
+			logger(DEBUG_ALWAYS, LOG_ERR, "Node %s (%s) uses wrong keylength!", from->name, from->hostname);
 			return true;
 		}
 
@@ -400,7 +418,7 @@ bool ans_key_h(connection_t *c, char *request) {
 	from->sent_seqno = 0;
 
 	if(*address && *port) {
-		ifdebug(PROTOCOL) logger(LOG_DEBUG, "Using reflexive UDP address from %s: %s port %s", from->name, address, port);
+		logger(DEBUG_PROTOCOL, LOG_DEBUG, "Using reflexive UDP address from %s: %s port %s", from->name, address, port);
 		sockaddr_t sa = str2sockaddr(address, port);
 		update_node_udp(from, &sa);
 	}