projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Reserve legacy active bit in connection_status_t.
[tinc]
/
src
/
protocol_key.c
diff --git
a/src/protocol_key.c
b/src/protocol_key.c
index
b8744a9
..
fcb748f
100644
(file)
--- a/
src/protocol_key.c
+++ b/
src/protocol_key.c
@@
-41,7
+41,7
@@
void send_key_changed(void) {
/* Immediately send new keys to directly connected nodes to keep UDP mappings alive */
for list_each(connection_t, c, connection_list)
/* Immediately send new keys to directly connected nodes to keep UDP mappings alive */
for list_each(connection_t, c, connection_list)
- if(c->
status.activ
e && c->node && c->node->status.reachable && !c->node->status.sptps)
+ if(c->
edg
e && c->node && c->node->status.reachable && !c->node->status.sptps)
send_ans_key(c->node);
/* Force key exchange for connections using SPTPS */
send_ans_key(c->node);
/* Force key exchange for connections using SPTPS */
@@
-260,24
+260,31
@@
bool send_ans_key(node_t *to) {
if(to->status.sptps)
abort();
if(to->status.sptps)
abort();
- size_t keylen =
cipher_keylength(myself->incipher)
;
+ size_t keylen =
myself->incipher ? cipher_keylength(myself->incipher) : 1
;
char key[keylen * 2 + 1];
char key[keylen * 2 + 1];
+ randomize(key, keylen);
+
cipher_close(to->incipher);
digest_close(to->indigest);
cipher_close(to->incipher);
digest_close(to->indigest);
- to->incipher = cipher_open_by_nid(cipher_get_nid(myself->incipher));
- to->indigest = digest_open_by_nid(digest_get_nid(myself->indigest), digest_length(myself->indigest));
- to->incompression = myself->incompression;
+ if(myself->incipher) {
+ to->incipher = cipher_open_by_nid(cipher_get_nid(myself->incipher));
+ if(!to->incipher)
+ abort();
+ if(!cipher_set_key(to->incipher, key, false))
+ abort();
+ }
- if(!to->incipher || !to->indigest)
- abort();
+ if(myself->indigest) {
+ to->indigest = digest_open_by_nid(digest_get_nid(myself->indigest), digest_length(myself->indigest));
+ if(!to->indigest)
+ abort();
+ if(!digest_set_key(to->indigest, key, keylen))
+ abort();
+ }
- randomize(key, keylen);
- if(!cipher_set_key(to->incipher, key, false))
- abort();
- if(!digest_set_key(to->indigest, key, keylen))
- abort();
+ to->incompression = myself->incompression;
bin2hex(key, key, keylen);
bin2hex(key, key, keylen);
@@
-422,16
+429,16
@@
bool ans_key_h(connection_t *c, const char *request) {
keylen = hex2bin(key, key, sizeof key);
keylen = hex2bin(key, key, sizeof key);
- if(keylen !=
cipher_keylength(from->outcipher
)) {
+ if(keylen !=
(from->outcipher ? cipher_keylength(from->outcipher) : 1
)) {
logger(DEBUG_ALWAYS, LOG_ERR, "Node %s (%s) uses wrong keylength!", from->name, from->hostname);
return true;
}
/* Update our copy of the origin's packet key */
logger(DEBUG_ALWAYS, LOG_ERR, "Node %s (%s) uses wrong keylength!", from->name, from->hostname);
return true;
}
/* Update our copy of the origin's packet key */
- if(!cipher_set_key(from->outcipher, key, true))
+ if(
from->outcipher &&
!cipher_set_key(from->outcipher, key, true))
return false;
return false;
- if(!digest_set_key(from->outdigest, key, keylen))
+ if(
from->outdigest &&
!digest_set_key(from->outdigest, key, keylen))
return false;
from->status.validkey = true;
return false;
from->status.validkey = true;