X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fprotocol_key.c;h=06ce733df77c21129c473d100db354bf5a7c450a;hb=5a132550deb58473285e5f91705d286aef47be71;hp=06c6d3364702bee9f5a21a5edce5aae64618e82e;hpb=78fc59e994c764d072bf0045177f690a378d1308;p=tinc

diff --git a/src/protocol_key.c b/src/protocol_key.c
index 06c6d336..06ce733d 100644
--- a/src/protocol_key.c
+++ b/src/protocol_key.c
@@ -22,11 +22,10 @@
 
 #include "system.h"
 
-#include <openssl/evp.h>
-#include <openssl/err.h>
-
-#include "avl_tree.h"
+#include "splay_tree.h"
+#include "cipher.h"
 #include "connection.h"
+#include "crypto.h"
 #include "logger.h"
 #include "net.h"
 #include "netutl.h"
@@ -35,36 +34,34 @@
 #include "utils.h"
 #include "xalloc.h"
 
-bool mykeyused = false;
+static bool mykeyused = false;
 
-bool send_key_changed(connection_t *c, const node_t *n)
-{
+bool send_key_changed() {
 	cp();
 
 	/* Only send this message if some other daemon requested our key previously.
 	   This reduces unnecessary key_changed broadcasts.
 	 */
 
-	if(n == myself && !mykeyused)
+	if(!mykeyused)
 		return true;
 
-	return send_request(c, "%d %lx %s", KEY_CHANGED, random(), n->name);
+	return send_request(broadcast, "%d %lx %s", KEY_CHANGED, random(), myself->name);
 }
 
-bool key_changed_h(connection_t *c)
-{
+bool key_changed_h(connection_t *c, char *request) {
 	char name[MAX_STRING_SIZE];
 	node_t *n;
 
 	cp();
 
-	if(sscanf(c->buffer, "%*d %*x " MAX_STRING, name) != 1) {
+	if(sscanf(request, "%*d %*x " MAX_STRING, name) != 1) {
 		logger(LOG_ERR, _("Got bad %s from %s (%s)"), "KEY_CHANGED",
 			   c->name, c->hostname);
 		return false;
 	}
 
-	if(seen_request(c->buffer))
+	if(seen_request(request))
 		return true;
 
 	n = lookup_node(name);
@@ -81,27 +78,25 @@ bool key_changed_h(connection_t *c)
 	/* Tell the others */
 
 	if(!tunnelserver)
-		forward_request(c);
+		forward_request(c, request);
 
 	return true;
 }
 
-bool send_req_key(connection_t *c, const node_t *from, const node_t *to)
-{
+bool send_req_key(node_t *to) {
 	cp();
 
-	return send_request(c, "%d %s %s", REQ_KEY, from->name, to->name);
+	return send_request(to->nexthop->connection, "%d %s %s", REQ_KEY, myself->name, to->name);
 }
 
-bool req_key_h(connection_t *c)
-{
+bool req_key_h(connection_t *c, char *request) {
 	char from_name[MAX_STRING_SIZE];
 	char to_name[MAX_STRING_SIZE];
 	node_t *from, *to;
 
 	cp();
 
-	if(sscanf(c->buffer, "%*d " MAX_STRING " " MAX_STRING, from_name, to_name) != 2) {
+	if(sscanf(request, "%*d " MAX_STRING " " MAX_STRING, from_name, to_name) != 2) {
 		logger(LOG_ERR, _("Got bad %s from %s (%s)"), "REQ_KEY", c->name,
 			   c->hostname);
 		return false;
@@ -126,10 +121,8 @@ bool req_key_h(connection_t *c)
 	/* Check if this key request is for us */
 
 	if(to == myself) {			/* Yes, send our own key back */
-		mykeyused = true;
-		from->received_seqno = 0;
-		memset(from->late, 0, sizeof(from->late));
-		send_ans_key(c, myself, from);
+
+		send_ans_key(from);
 	} else {
 		if(tunnelserver)
 			return false;
@@ -140,31 +133,42 @@ bool req_key_h(connection_t *c)
 			return true;
 		}
 
-		send_req_key(to->nexthop->connection, from, to);
+		send_request(to->nexthop->connection, "%s", request);
 	}
 
 	return true;
 }
 
-bool send_ans_key(connection_t *c, const node_t *from, const node_t *to)
-{
-	char *key;
+bool send_ans_key(node_t *to) {
+	size_t keylen = cipher_keylength(&myself->incipher);
+	char key[keylen * 2 + 1];
 
 	cp();
 
-	key = alloca(2 * from->keylength + 1);
-	bin2hex(from->key, key, from->keylength);
-	key[from->keylength * 2] = '\0';
+	cipher_open_by_nid(&to->incipher, cipher_get_nid(&myself->incipher));
+	digest_open_by_nid(&to->indigest, digest_get_nid(&myself->indigest));
+	to->inmaclength = myself->inmaclength;
+	to->incompression = myself->incompression;
+
+	randomize(key, keylen);
+	cipher_set_key(&to->incipher, key, true);
+
+	bin2hex(key, key, keylen);
+	key[keylen * 2] = '\0';
+
+	// Reset sequence number and late packet window
+	mykeyused = true;
+	to->received_seqno = 0;
+	memset(to->late, 0, sizeof(to->late));
 
-	return send_request(c, "%d %s %s %s %d %d %d %d", ANS_KEY,
-						from->name, to->name, key,
-						from->cipher ? from->cipher->nid : 0,
-						from->digest ? from->digest->type : 0, from->maclength,
-						from->compression);
+	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), to->inmaclength,
+						to->incompression);
 }
 
-bool ans_key_h(connection_t *c)
-{
+bool ans_key_h(connection_t *c, char *request) {
 	char from_name[MAX_STRING_SIZE];
 	char to_name[MAX_STRING_SIZE];
 	char key[MAX_STRING_SIZE];
@@ -173,7 +177,7 @@ bool ans_key_h(connection_t *c)
 
 	cp();
 
-	if(sscanf(c->buffer, "%*d "MAX_STRING" "MAX_STRING" "MAX_STRING" %d %d %d %d",
+	if(sscanf(request, "%*d "MAX_STRING" "MAX_STRING" "MAX_STRING" %d %d %d %d",
 		from_name, to_name, key, &cipher, &digest, &maclength,
 		&compression) != 7) {
 		logger(LOG_ERR, _("Got bad %s from %s (%s)"), "ANS_KEY", c->name,
@@ -205,65 +209,35 @@ bool ans_key_h(connection_t *c)
 
 		if(!to->status.reachable) {
 			logger(LOG_WARNING, _("Got %s from %s (%s) destination %s which is not reachable"),
-				"ANS_KEY", c->name, c->hostname, to_name);
+				   "ANS_KEY", c->name, c->hostname, to_name);
 			return true;
 		}
 
-		return send_request(to->nexthop->connection, "%s", c->buffer);
+		return send_request(to->nexthop->connection, "%s", request);
 	}
 
-	/* Update our copy of the origin's packet key */
-
-	if(from->key)
-		free(from->key);
-
-	from->key = xstrdup(key);
-	from->keylength = strlen(key) / 2;
-	hex2bin(from->key, from->key, from->keylength);
-	from->key[from->keylength] = '\0';
-
-	from->status.validkey = true;
-	from->status.waitingforkey = false;
-	from->sent_seqno = 0;
-
 	/* Check and lookup cipher and digest algorithms */
 
-	if(cipher) {
-		from->cipher = EVP_get_cipherbynid(cipher);
-
-		if(!from->cipher) {
-			logger(LOG_ERR, _("Node %s (%s) uses unknown cipher!"), from->name,
-				   from->hostname);
-			return false;
-		}
-
-		if(from->keylength != from->cipher->key_len + from->cipher->iv_len) {
-			logger(LOG_ERR, _("Node %s (%s) uses wrong keylength!"), from->name,
-				   from->hostname);
-			return false;
-		}
-	} else {
-		from->cipher = NULL;
+	if(!cipher_open_by_nid(&from->outcipher, cipher)) {
+		logger(LOG_ERR, _("Node %s (%s) uses unknown cipher!"), from->name, from->hostname);
+		return false;
 	}
 
-	from->maclength = maclength;
+	if(strlen(key) / 2 != cipher_keylength(&from->outcipher)) {
+		logger(LOG_ERR, _("Node %s (%s) uses wrong keylength!"), from->name, from->hostname);
+		return false;
+	}
 
-	if(digest) {
-		from->digest = EVP_get_digestbynid(digest);
+	from->outmaclength = maclength;
 
-		if(!from->digest) {
-			logger(LOG_ERR, _("Node %s (%s) uses unknown digest!"), from->name,
-				   from->hostname);
-			return false;
-		}
+	if(!digest_open_by_nid(&from->outdigest, digest)) {
+		logger(LOG_ERR, _("Node %s (%s) uses unknown digest!"), from->name, from->hostname);
+		return false;
+	}
 
-		if(from->maclength > from->digest->md_size || from->maclength < 0) {
-			logger(LOG_ERR, _("Node %s (%s) uses bogus MAC length!"),
-				   from->name, from->hostname);
-			return false;
-		}
-	} else {
-		from->digest = NULL;
+	if(from->outmaclength > digest_length(&from->outdigest) || from->outmaclength < 0) {
+		logger(LOG_ERR, _("Node %s (%s) uses bogus MAC length!"), from->name, from->hostname);
+		return false;
 	}
 
 	if(compression < 0 || compression > 11) {
@@ -271,14 +245,16 @@ bool ans_key_h(connection_t *c)
 		return false;
 	}
 	
-	from->compression = compression;
+	from->outcompression = compression;
 
-	if(from->cipher)
-		if(!EVP_EncryptInit_ex(&from->packet_ctx, from->cipher, NULL, (unsigned char *)from->key, (unsigned char *)from->key + from->cipher->key_len)) {
-			logger(LOG_ERR, _("Error during initialisation of key from %s (%s): %s"),
-					from->name, from->hostname, ERR_error_string(ERR_get_error(), NULL));
-			return false;
-		}
+	/* Update our copy of the origin's packet key */
+
+	hex2bin(key, key, cipher_keylength(&from->outcipher));
+	cipher_set_key(&from->outcipher, key, false);
+
+	from->status.validkey = true;
+	from->status.waitingforkey = false;
+	from->sent_seqno = 0;
 
 	if(from->options & OPTION_PMTU_DISCOVERY && !from->mtuprobes)
 		send_mtu_probe(from);