#include "net.h"
#include "netutl.h"
#include "node.h"
-#include "prf.h"
#include "protocol.h"
#include "route.h"
#include "sptps.h"
#include "utils.h"
-#include "xalloc.h"
-
-#ifndef DISABLE_LEGACY
-static bool mykeyused = false;
-#endif
+#include "compression.h"
void send_key_changed(void) {
#ifndef DISABLE_LEGACY
- send_request(everyone, "%d %x %s", KEY_CHANGED, rand(), myself->name);
+ send_request(everyone, "%d %x %s", KEY_CHANGED, prng(UINT32_MAX), myself->name);
/* Immediately send new keys to directly connected nodes to keep UDP mappings alive */
- for list_each(connection_t, c, connection_list) {
+ for list_each(connection_t, c, &connection_list) {
if(c->edge && c->node && c->node->status.reachable && !c->node->status.sptps) {
send_ans_key(c->node);
}
/* Force key exchange for connections using SPTPS */
if(experimental) {
- for splay_each(node_t, n, node_tree) {
+ for splay_each(node_t, n, &node_tree) {
if(n->status.reachable && n->status.validkey && n->status.sptps) {
sptps_force_kex(&n->sptps);
}
(void)type;
node_t *to = handle;
to->sptps.send_data = send_sptps_data_myself;
- char buf[len * 4 / 3 + 5];
- b64encode(data, buf, len);
+ char buf[B64_SIZE(len)];
+ b64encode_tinc(data, buf, len);
return send_request(to->nexthop->connection, "%d %s %s %d %s", REQ_KEY, myself->name, to->name, REQ_KEY, buf);
}
/* This is a SPTPS data packet. */
char buf[MAX_STRING_SIZE];
- int len;
+ size_t len;
- if(sscanf(request, "%*d %*s %*s %*d " MAX_STRING, buf) != 1 || !(len = b64decode(buf, buf, strlen(buf)))) {
+ if(sscanf(request, "%*d %*s %*s %*d " MAX_STRING, buf) != 1 || !(len = b64decode_tinc(buf, buf, strlen(buf)))) {
logger(DEBUG_ALWAYS, LOG_ERR, "Got bad %s from %s (%s) to %s (%s): %s", "SPTPS_PACKET", from->name, from->hostname, to->name, to->hostname, "invalid SPTPS data");
return true;
}
char buf[MAX_STRING_SIZE];
size_t len;
- if(sscanf(request, "%*d %*s %*s %*d " MAX_STRING, buf) != 1 || !(len = b64decode(buf, buf, strlen(buf)))) {
+ if(sscanf(request, "%*d %*s %*s %*d " MAX_STRING, buf) != 1 || !(len = b64decode_tinc(buf, buf, strlen(buf)))) {
logger(DEBUG_ALWAYS, LOG_ERR, "Got bad %s from %s (%s): %s", "REQ_SPTPS_START", from->name, from->hostname, "invalid SPTPS data");
return true;
}
if(!from->status.reachable) {
logger(DEBUG_ALWAYS, LOG_ERR, "Got %s from %s (%s) origin %s which is not reachable",
"REQ_KEY", c->name, c->hostname, from_name);
+ return true;
}
/* Is this an extended REQ_KEY message? */
randomize(key, keylen);
- cipher_close(to->incipher);
- digest_close(to->indigest);
+ cipher_free(&to->incipher);
+ digest_free(&to->indigest);
if(myself->incipher) {
- to->incipher = cipher_open_by_nid(cipher_get_nid(myself->incipher));
+ to->incipher = cipher_alloc();
- if(!to->incipher) {
+ if(!cipher_open_by_nid(to->incipher, cipher_get_nid(myself->incipher))) {
abort();
}
}
if(myself->indigest) {
- to->indigest = digest_open_by_nid(digest_get_nid(myself->indigest), digest_length(myself->indigest));
+ to->indigest = digest_alloc();
- if(!to->indigest) {
+ if(!digest_open_by_nid(to->indigest,
+ digest_get_nid(myself->indigest),
+ digest_length(myself->indigest))) {
abort();
}
bin2hex(key, key, keylen);
// Reset sequence number and late packet window
- mykeyused = true;
to->received_seqno = 0;
to->received = 0;
to->status.validkey_in = true;
- return send_request(to->nexthop->connection, "%d %s %s %s %d %d %d %d", ANS_KEY,
+ return send_request(to->nexthop->connection, "%d %s %s %s %d %d %zu %d", ANS_KEY,
myself->name, to->name, key,
cipher_get_nid(to->incipher),
digest_get_nid(to->indigest),
- (int)digest_length(to->indigest),
+ digest_length(to->indigest),
to->incompression);
#endif
}
char key[MAX_STRING_SIZE];
char address[MAX_STRING_SIZE] = "";
char port[MAX_STRING_SIZE] = "";
- int cipher, digest, maclength, compression;
+ int cipher, digest;
+ size_t maclength;
+ int compression;
node_t *from, *to;
- if(sscanf(request, "%*d "MAX_STRING" "MAX_STRING" "MAX_STRING" %d %d %d %d "MAX_STRING" "MAX_STRING,
+ if(sscanf(request, "%*d "MAX_STRING" "MAX_STRING" "MAX_STRING" %d %d %zu %d "MAX_STRING" "MAX_STRING,
from_name, to_name, key, &cipher, &digest, &maclength,
&compression, address, port) < 7) {
logger(DEBUG_ALWAYS, LOG_ERR, "Got bad %s from %s (%s)", "ANS_KEY", c->name,
#ifndef DISABLE_LEGACY
/* Don't use key material until every check has passed. */
- cipher_close(from->outcipher);
- digest_close(from->outdigest);
+ cipher_free(&from->outcipher);
+ digest_free(&from->outdigest);
#endif
if(!from->status.sptps) {
}
switch(compression) {
- case 12:
+ case COMPRESS_LZ4:
#ifdef HAVE_LZ4
break;
#else
return true;
#endif
- case 11:
- case 10:
+ case COMPRESS_LZO_HI:
+ case COMPRESS_LZO_LO:
#ifdef HAVE_LZO
break;
#else
return true;
#endif
- case 9:
- case 8:
- case 7:
- case 6:
- case 5:
- case 4:
- case 3:
- case 2:
- case 1:
+ case COMPRESS_ZLIB_9:
+ case COMPRESS_ZLIB_8:
+ case COMPRESS_ZLIB_7:
+ case COMPRESS_ZLIB_6:
+ case COMPRESS_ZLIB_5:
+ case COMPRESS_ZLIB_4:
+ case COMPRESS_ZLIB_3:
+ case COMPRESS_ZLIB_2:
+ case COMPRESS_ZLIB_1:
#ifdef HAVE_ZLIB
break;
#else
return true;
#endif
- case 0:
+ case COMPRESS_NONE:
break;
default:
/* SPTPS or old-style key exchange? */
if(from->status.sptps) {
- char buf[strlen(key)];
- size_t len = b64decode(key, buf, strlen(key));
+ uint8_t buf[strlen(key)];
+ size_t len = b64decode_tinc(key, buf, strlen(key));
if(!len || !sptps_receive_data(&from->sptps, buf, len)) {
/* Uh-oh. It might be that the tunnel is stuck in some corrupted state,
/* Check and lookup cipher and digest algorithms */
if(cipher) {
- if(!(from->outcipher = cipher_open_by_nid(cipher))) {
+ from->outcipher = cipher_alloc();
+
+ if(!cipher_open_by_nid(from->outcipher, cipher)) {
+ cipher_free(&from->outcipher);
logger(DEBUG_ALWAYS, LOG_ERR, "Node %s (%s) uses unknown cipher!", from->name, from->hostname);
return false;
}
}
if(digest) {
- if(!(from->outdigest = digest_open_by_nid(digest, maclength))) {
+ from->outdigest = digest_alloc();
+
+ if(!digest_open_by_nid(from->outdigest, digest, maclength)) {
+ digest_free(&from->outdigest);
logger(DEBUG_ALWAYS, LOG_ERR, "Node %s (%s) uses unknown digest!", from->name, from->hostname);
return false;
}
from->outdigest = NULL;
}
- if((size_t)maclength != digest_length(from->outdigest)) {
+ if(maclength != digest_length(from->outdigest)) {
logger(DEBUG_ALWAYS, LOG_ERR, "Node %s (%s) uses bogus MAC length!", from->name, from->hostname);
return false;
}
projects / tinc / blobdiff