j3d1/tinc
1
0
Fork 0
Code Issues 1 Pull requests Releases Wiki Activity

Handle truncated message authentication codes.

Browse source
This commit is contained in:
Guus Sliepen 2009-06-06 19:04:04 +02:00
parent 5a132550de
commit 4124b9682f
8 changed files with 64 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/protocol_key.c
View file

@ -146,8 +146,7 @@ bool send_ans_key(node_t *to) {
cp();
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;
digest_open_by_nid(&to->indigest, digest_get_nid(&myself->indigest), digest_length(&myself->indigest));
to->incompression = myself->incompression;
randomize(key, keylen);
@ -164,7 +163,8 @@ bool send_ans_key(node_t *to) {
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,
digest_get_nid(&to->indigest),
digest_length(&to->indigest),
to->incompression);
}
@ -228,14 +228,12 @@ bool ans_key_h(connection_t *c, char *request) {
return false;
}
from->outmaclength = maclength;
if(!digest_open_by_nid(&from->outdigest, digest)) {
if(!digest_open_by_nid(&from->outdigest, digest, maclength)) {
logger(LOG_ERR, _("Node %s (%s) uses unknown digest!"), from->name, from->hostname);
return false;
}
if(from->outmaclength > digest_length(&from->outdigest) || from->outmaclength < 0) {
if(maclength != digest_length(&from->outdigest)) {
logger(LOG_ERR, _("Node %s (%s) uses bogus MAC length!"), from->name, from->hostname);
return false;
}