projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove an unnecessary pointer dereference in execute_script().
[tinc]
/
src
/
protocol_key.c
diff --git
a/src/protocol_key.c
b/src/protocol_key.c
index
e41ec42
..
e838f61
100644
(file)
--- a/
src/protocol_key.c
+++ b/
src/protocol_key.c
@@
-98,7
+98,7
@@
static bool send_initial_sptps_data(void *handle, uint8_t type, const char *data
bool send_req_key(node_t *to) {
if(to->status.sptps) {
if(!node_read_ecdsa_public_key(to)) {
bool send_req_key(node_t *to) {
if(to->status.sptps) {
if(!node_read_ecdsa_public_key(to)) {
- logger(DEBUG_PROTOCOL, LOG_DEBUG, "No E
CDSA
key known for %s (%s)", to->name, to->hostname);
+ logger(DEBUG_PROTOCOL, LOG_DEBUG, "No E
d25519
key known for %s (%s)", to->name, to->hostname);
send_request(to->nexthop->connection, "%d %s %s %d", REQ_KEY, myself->name, to->name, REQ_PUBKEY);
return true;
}
send_request(to->nexthop->connection, "%d %s %s %d", REQ_KEY, myself->name, to->name, REQ_PUBKEY);
return true;
}
@@
-142,14
+142,14
@@
static bool req_key_ext_h(connection_t *c, const char *request, node_t *from, in
return true;
}
return true;
}
- logger(DEBUG_PROTOCOL, LOG_INFO, "Learned E
CDSA
public key from %s (%s)", from->name, from->hostname);
- append_config_file(from->name, "E
CDSA
PublicKey", pubkey);
+ logger(DEBUG_PROTOCOL, LOG_INFO, "Learned E
d25519
public key from %s (%s)", from->name, from->hostname);
+ append_config_file(from->name, "E
d25519
PublicKey", pubkey);
return true;
}
case REQ_KEY: {
if(!node_read_ecdsa_public_key(from)) {
return true;
}
case REQ_KEY: {
if(!node_read_ecdsa_public_key(from)) {
- logger(DEBUG_PROTOCOL, LOG_DEBUG, "No E
CDSA
key known for %s (%s)", from->name, from->hostname);
+ logger(DEBUG_PROTOCOL, LOG_DEBUG, "No E
d25519
key known for %s (%s)", from->name, from->hostname);
send_request(from->nexthop->connection, "%d %s %s %d", REQ_KEY, myself->name, from->name, REQ_PUBKEY);
return true;
}
send_request(from->nexthop->connection, "%d %s %s %d", REQ_KEY, myself->name, from->name, REQ_PUBKEY);
return true;
}
@@
-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;