projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
CI: use compilation database for clang-tidy job
[tinc]
/
src
/
protocol_auth.c
diff --git
a/src/protocol_auth.c
b/src/protocol_auth.c
index
211d908
..
7a3e6dd
100644
(file)
--- a/
src/protocol_auth.c
+++ b/
src/protocol_auth.c
@@
-82,6
+82,7
@@
static bool send_proxyrequest(connection_t *c) {
case PROXY_EXEC:
return true;
case PROXY_EXEC:
return true;
+ case PROXY_NONE:
default:
logger(DEBUG_ALWAYS, LOG_ERR, "Unknown proxy type");
return false;
default:
logger(DEBUG_ALWAYS, LOG_ERR, "Unknown proxy type");
return false;
@@
-94,7
+95,7
@@
bool send_id(connection_t *c) {
int minor = 0;
if(experimental) {
int minor = 0;
if(experimental) {
- if(c->outgoing && !
read_ecdsa_public_key(&c->ecdsa, &c->config_tree, c->name
)) {
+ if(c->outgoing && !
ecdsa_active(c->ecdsa) && !(c->ecdsa = read_ecdsa_public_key(&c->config_tree, c->name)
)) {
minor = 1;
} else {
minor = myself->connection->protocol_minor;
minor = 1;
} else {
minor = myself->connection->protocol_minor;
@@
-399,8
+400,8
@@
bool id_h(connection_t *c, const char *request) {
return false;
}
return false;
}
- if(experimental) {
-
read_ecdsa_public_key(&c->ecdsa,
&c->config_tree, c->name);
+ if(experimental
&& !ecdsa_active(c->ecdsa)
) {
+
c->ecdsa = read_ecdsa_public_key(
&c->config_tree, c->name);
}
/* Ignore failures if no key known yet */
}
/* Ignore failures if no key known yet */
@@
-880,7
+881,7
@@
static bool upgrade_h(connection_t *c, const char *request) {
return false;
}
return false;
}
- if(ecdsa_active(c->ecdsa) ||
read_ecdsa_public_key(&c->ecdsa, &c->config_tree, c->name
)) {
+ if(ecdsa_active(c->ecdsa) ||
(c->ecdsa = read_ecdsa_public_key(&c->config_tree, c->name)
)) {
char *knownkey = ecdsa_get_base64_public_key(c->ecdsa);
bool different = strcmp(knownkey, pubkey);
free(knownkey);
char *knownkey = ecdsa_get_base64_public_key(c->ecdsa);
bool different = strcmp(knownkey, pubkey);
free(knownkey);