projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use correct format specifiers.
[tinc]
/
src
/
protocol_key.c
diff --git
a/src/protocol_key.c
b/src/protocol_key.c
index
06ce733
..
bc02054
100644
(file)
--- a/
src/protocol_key.c
+++ b/
src/protocol_key.c
@@
-46,7
+46,7
@@
bool send_key_changed() {
if(!mykeyused)
return true;
if(!mykeyused)
return true;
- return send_request(broadcast, "%d %
lx %s", KEY_CHANGED, random
(), myself->name);
+ return send_request(broadcast, "%d %
x %s", KEY_CHANGED, rand
(), myself->name);
}
bool key_changed_h(connection_t *c, char *request) {
}
bool key_changed_h(connection_t *c, char *request) {
@@
-146,8
+146,7
@@
bool send_ans_key(node_t *to) {
cp();
cipher_open_by_nid(&to->incipher, cipher_get_nid(&myself->incipher));
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);
to->incompression = myself->incompression;
randomize(key, keylen);
@@
-161,10
+160,11
@@
bool send_ans_key(node_t *to) {
to->received_seqno = 0;
memset(to->late, 0, sizeof(to->late));
to->received_seqno = 0;
memset(to->late, 0, sizeof(to->late));
- 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),
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);
}
to->incompression);
}
@@
-228,14
+228,12
@@
bool ans_key_h(connection_t *c, char *request) {
return false;
}
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;
}
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;
}
logger(LOG_ERR, _("Node %s (%s) uses bogus MAC length!"), from->name, from->hostname);
return false;
}