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

Merge branch '1.1' of github.com:gsliepen/tinc into thkr-1.1-ponyhof

Browse source 
,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
This commit is contained in:
thorkill 2015-04-24 23:47:25 +02:00
commit 9e0c4a7349
3 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/net_setup.c
View file

@ -148,9 +148,6 @@ bool read_ecdsa_public_key(connection_t *c) {
#ifndef DISABLE_LEGACY #ifndef DISABLE_LEGACY
bool read_rsa_public_key(connection_t *c) { bool read_rsa_public_key(connection_t *c) {
if(ecdsa_active(c->ecdsa))
return true;
FILE *fp; FILE *fp;
char *fname; char *fname;
char *n; char *n;

3
src/protocol.c
View file

@ -135,7 +135,8 @@ bool receive_request(connection_t *c, const char *request) {
if(!request_handlers[reqno](c, request)) { if(!request_handlers[reqno](c, request)) {
/* Something went wrong. Probably scriptkiddies. Terminate. */ /* Something went wrong. Probably scriptkiddies. Terminate. */
logger(DEBUG_ALWAYS, LOG_ERR, "Error while processing %s from %s (%s)", request_name[reqno], c->name, c->hostname); if(request != TERMREQ)
logger(DEBUG_ALWAYS, LOG_ERR, "Error while processing %s from %s (%s)", request_name[reqno], c->name, c->hostname);
return false; return false;
} }
} else { } else {

4
src/protocol_auth.c
View file

@ -387,7 +387,7 @@ bool id_h(connection_t *c, const char *request) {
/* Forbid version rollback for nodes whose Ed25519 key we know */ /* Forbid version rollback for nodes whose Ed25519 key we know */
if(ecdsa_active(c->ecdsa) && c->protocol_minor < 2) { if(ecdsa_active(c->ecdsa) && c->protocol_minor < 1) {
logger(DEBUG_ALWAYS, LOG_ERR, "Peer %s (%s) tries to roll back protocol version to %d.%d", logger(DEBUG_ALWAYS, LOG_ERR, "Peer %s (%s) tries to roll back protocol version to %d.%d",
c->name, c->hostname, c->protocol_major, c->protocol_minor); c->name, c->hostname, c->protocol_major, c->protocol_minor);
return false; return false;
@ -781,6 +781,8 @@ static bool upgrade_h(connection_t *c, const char *request) {
logger(DEBUG_ALWAYS, LOG_INFO, "Got Ed25519 public key from %s (%s), upgrading!", c->name, c->hostname); logger(DEBUG_ALWAYS, LOG_INFO, "Got Ed25519 public key from %s (%s), upgrading!", c->name, c->hostname);
append_config_file(c->name, "Ed25519PublicKey", pubkey); append_config_file(c->name, "Ed25519PublicKey", pubkey);
c->allow_request = TERMREQ; c->allow_request = TERMREQ;
if(c->outgoing)
c->outgoing->timeout = 0;
return send_termreq(c); return send_termreq(c);
} }