#include "system.h"
-#include "splay_tree.h"
#include "cipher.h"
#include "connection.h"
#include "crypto.h"
static bool mykeyused = false;
void send_key_changed(void) {
- splay_node_t *node;
- connection_t *c;
-
send_request(everyone, "%d %x %s", KEY_CHANGED, rand(), myself->name);
/* Immediately send new keys to directly connected nodes to keep UDP mappings alive */
- for(node = connection_tree->head; node; node = node->next) {
- c = node->data;
+ for(list_node_t *node = connection_list->head, *next; node; node = next) {
+ next = node->next;
+ connection_t *c = node->data;
if(c->status.active && c->node && c->node->status.reachable) {
- if(!experimental || OPTION_VERSION(c->node->options) < 2)
+ if(!c->node->status.sptps)
send_ans_key(c->node);
}
}
/* Force key exchange for connections using SPTPS */
if(experimental) {
- for(node = node_tree->head; node; node = node->next) {
+ for(splay_node_t *node = node_tree->head; node; node = node->next) {
node_t *n = node->data;
- if(n->status.reachable && n->status.validkey && OPTION_VERSION(n->options) >= 2)
+ if(n->status.reachable && n->status.validkey && n->status.sptps)
sptps_force_kex(&n->sptps);
}
}
return true;
}
- if(OPTION_VERSION(n->options) < 2) {
+ if(!n->status.sptps) {
n->status.validkey = false;
n->last_req_key = 0;
}
}
bool send_req_key(node_t *to) {
- if(experimental && OPTION_VERSION(to->options) >= 2) {
+ if(to->status.sptps) {
if(!node_read_ecdsa_public_key(to)) {
- logger(DEBUG_ALWAYS, LOG_DEBUG, "No ECDSA key known for %s (%s)", to->name, to->hostname);
+ logger(DEBUG_PROTOCOL, LOG_DEBUG, "No ECDSA key known for %s (%s)", to->name, to->hostname);
send_request(to->nexthop->connection, "%d %s %s %d", REQ_KEY, myself->name, to->name, REQ_PUBKEY);
return true;
}
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->status.waitingforkey = true;
+ to->last_req_key = time(NULL);
+ 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);
}
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);
+ logger(DEBUG_PROTOCOL, LOG_WARNING, "Got ANS_PUBKEY from %s (%s) even though we already have his pubkey", from->name, from->hostname);
return true;
}
return true;
}
- logger(DEBUG_ALWAYS, LOG_INFO, "Learned ECDSA public key from %s (%s)", from->name, from->hostname);
+ logger(DEBUG_PROTOCOL, LOG_INFO, "Learned ECDSA public key from %s (%s)", from->name, from->hostname);
append_config_file(from->name, "ECDSAPublicKey", pubkey);
return true;
}
case REQ_KEY: {
if(!node_read_ecdsa_public_key(from)) {
- logger(DEBUG_ALWAYS, LOG_DEBUG, "No ECDSA key known for %s (%s)", from->name, from->hostname);
+ logger(DEBUG_PROTOCOL, LOG_DEBUG, "No ECDSA key known for %s (%s)", from->name, from->hostname);
send_request(from->nexthop->connection, "%d %s %s %d", REQ_KEY, myself->name, from->name, REQ_PUBKEY);
return true;
}
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;
+ from->status.waitingforkey = true;
+ from->last_req_key = time(NULL);
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;
}
+ case REQ_PACKET: {
+ if(!from->status.validkey) {
+ logger(DEBUG_PROTOCOL, LOG_ERR, "Got REQ_PACKET from %s (%s) but we don't have a valid key yet", from->name, from->hostname);
+ return true;
+ }
+
+ char buf[MAX_STRING_SIZE];
+ if(sscanf(request, "%*d %*s %*s %*d " MAX_STRING, buf) != 1) {
+ logger(DEBUG_ALWAYS, LOG_ERR, "Got bad %s from %s (%s): %s", "REQ_KEY", from->name, from->hostname, "invalid SPTPS data");
+ return true;
+ }
+ int len = b64decode(buf, buf, strlen(buf));
+ sptps_receive_data(&from->sptps, buf, len);
+ return true;
+ }
+
default:
logger(DEBUG_ALWAYS, LOG_ERR, "Unknown extended REQ_KEY request from %s (%s): %s", from->name, from->hostname, request);
return true;
/* Check if this key request is for us */
- if(to == myself) { /* Yes, send our own key back */
+ if(to == myself) { /* Yes */
+ /* Is this an extended REQ_KEY message? */
if(experimental && reqno)
return req_key_ext_h(c, request, from, reqno);
+ /* No, just send our key back */
send_ans_key(from);
} else {
if(tunnelserver)
return true;
if(!to->status.reachable) {
- logger(DEBUG_ALWAYS, LOG_WARNING, "Got %s from %s (%s) destination %s which is not reachable",
+ logger(DEBUG_PROTOCOL, LOG_WARNING, "Got %s from %s (%s) destination %s which is not reachable",
"REQ_KEY", c->name, c->hostname, to_name);
return true;
}
}
bool send_ans_key(node_t *to) {
- if(experimental && OPTION_VERSION(to->options) >= 2)
+ if(to->status.sptps)
abort();
size_t keylen = cipher_keylength(&myself->incipher);
return send_request(to->nexthop->connection, "%s", request);
}
+ /* Don't use key material until every check has passed. */
+ from->status.validkey = 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;
+
/* SPTPS or old-style key exchange? */
- if(experimental && OPTION_VERSION(from->options) >= 2) {
+ if(from->status.sptps) {
char buf[strlen(key)];
int len = b64decode(key, buf, strlen(key));
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);
projects / tinc / blobdiff