}
bool send_req_key(node_t *to) {
- return send_request(to->nexthop->connection, "%d %s %s 1", REQ_KEY, myself->name, to->name);
+ return send_request(to->nexthop->connection, "%d %s %s %d", REQ_KEY, myself->name, to->name, experimental ? 1 : 0);
}
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(kx_version > 0) {
+ if(experimental && kx_version >= 1) {
logger(LOG_DEBUG, "Got ECDH key request from %s", from->name);
from->status.ecdh = true;
}
ecdh_generate_public(&to->ecdh, key);
- bin2hex(key, key, ECDH_SIZE);
- key[ECDH_SIZE * 2] = '\0';
+ b64encode(key, key, ECDH_SIZE);
return send_request(to->nexthop->connection, "%d %s %s ECDH:%s %d %d %zu %d", ANS_KEY,
myself->name, to->name, key,
}
bool send_ans_key(node_t *to) {
- if(to->status.ecdh)
+ if(experimental && to->status.ecdh)
return send_ans_key_ecdh(to);
size_t keylen = cipher_keylength(&myself->incipher);
to->incompression = myself->incompression;
randomize(key, keylen);
- cipher_set_key(&to->incipher, key, true);
+ cipher_set_key(&to->incipher, key, false);
digest_set_key(&to->indigest, key, keylen);
bin2hex(key, key, keylen);
- key[keylen * 2] = '\0';
// Reset sequence number and late packet window
mykeyused = true;
int cipher, digest, maclength, compression, keylen;
node_t *from, *to;
- if(sscanf(request, "%*d "MAX_STRING" "MAX_STRING" "MAX_STRING" %d %d %d %d "MAX_STRING" "MAX_STRING" %d",
+ 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,
/* ECDH or old-style key exchange? */
- if(!strncmp(key, "ECDH:", 5)) {
- keylen = (strlen(key) - 5) / 2;
+ if(experimental && !strncmp(key, "ECDH:", 5)) {
+ int keylen = b64decode(key + 5, key + 5, sizeof key - 5);
if(keylen != ECDH_SIZE) {
logger(LOG_ERR, "Node %s (%s) uses wrong keylength!", from->name, from->hostname);
}
char shared[ECDH_SHARED_SIZE * 2 + 1];
- char hex[ECDH_SHARED_SIZE * 2 + 1];
- hex2bin(key + 5, key + 5, keylen);
if(!ecdh_compute_shared(&from->ecdh, key + 5, shared))
return false;
digest_open_by_nid(&from->indigest, digest_get_nid(&myself->indigest), digest_length(&myself->indigest));
from->incompression = myself->incompression;
- cipher_set_key(&from->incipher, mykey, true);
+ cipher_set_key(&from->incipher, mykey, false);
digest_set_key(&from->indigest, mykey + mykeylen, mykeylen);
- cipher_set_key(&from->outcipher, hiskey, false);
+ cipher_set_key(&from->outcipher, hiskey, true);
digest_set_key(&from->outdigest, hiskey + hiskeylen, hiskeylen);
// Reset sequence number and late packet window
if(strcmp(myself->name, from->name) < 0)
memmove(key, key + mykeylen * 2, hiskeylen * 2);
} else {
- keylen = strlen(key) / 2;
- hex2bin(key, key, keylen);
+ 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);
/* Update our copy of the origin's packet key */
- cipher_set_key(&from->outcipher, key, false);
+ cipher_set_key(&from->outcipher, key, true);
digest_set_key(&from->outdigest, key, keylen);
}