X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fprotocol_key.c;h=f9afb4fe42e856b40702d967813398c828db624a;hb=d18519ae21345fea68dd7f0f5525adba3a7639a9;hp=bbe0239df781379dcb028db0fac6b06869648591;hpb=7a71d48009e03ff1143a6e1084803f456a27c849;p=tinc

diff --git a/src/protocol_key.c b/src/protocol_key.c
index bbe0239d..f9afb4fe 100644
--- a/src/protocol_key.c
+++ b/src/protocol_key.c
@@ -114,6 +114,9 @@ bool send_req_key(node_t *to) {
 		}
                 char label[25 + strlen(myself->name) + strlen(to->name)];
 		snprintf(label, sizeof label, "tinc UDP key expansion %s %s", myself->name, to->name);
+		sptps_stop(&to->sptps);
+		to->status.validkey = false;
+		to->incompression = myself->incompression;
 		return sptps_start(&to->sptps, to, true, true, myself->connection->ecdsa, to->ecdsa, label, sizeof label, send_initial_sptps_data, receive_sptps_record); 
 	}
 
@@ -167,6 +170,8 @@ static bool req_key_ext_h(connection_t *c, const char *request, node_t *from, in
 
 			char label[25 + strlen(from->name) + strlen(myself->name)];
 			snprintf(label, sizeof label, "tinc UDP key expansion %s %s", from->name, myself->name);
+			sptps_stop(&from->sptps);
+			from->status.validkey = false;
 			sptps_start(&from->sptps, from, false, true, myself->connection->ecdsa, from->ecdsa, label, sizeof label, send_sptps_data, receive_sptps_record); 
 			sptps_receive_data(&from->sptps, buf, len);
 			return true;
@@ -329,6 +334,13 @@ bool ans_key_h(connection_t *c, const char *request) {
 		return send_request(to->nexthop->connection, "%s", request);
 	}
 
+	if(compression < 0 || compression > 11) {
+		logger(DEBUG_ALWAYS, LOG_ERR, "Node %s (%s) uses bogus compression level!", from->name, from->hostname);
+		return true;
+	}
+
+	from->outcompression = compression;
+
 	/* SPTPS or old-style key exchange? */
 
 	if(from->status.sptps) {
@@ -369,13 +381,6 @@ bool ans_key_h(connection_t *c, const char *request) {
 		return false;
 	}
 
-	if(compression < 0 || compression > 11) {
-		logger(DEBUG_ALWAYS, LOG_ERR, "Node %s (%s) uses bogus compression level!", from->name, from->hostname);
-		return true;
-	}
-
-	from->outcompression = compression;
-
 	/* Process key */
 
 	keylen = hex2bin(key, key, sizeof key);