X-Git-Url: http://tinc-vpn.org/git/browse?a=blobdiff_plain;ds=sidebyside;f=src%2Fprotocol_auth.c;h=4eb61bdf115b59e5a602e7411702f422cb77dd08;hb=2f4ccfe2473948372f7c9f14d9ffce1d77f5fd8c;hp=7595c48e16c48ba482d32467301d705d80f8f702;hpb=2ba61742d4c2ab82525efb806dc654a6d95d335e;p=tinc

diff --git a/src/protocol_auth.c b/src/protocol_auth.c
index 7595c48e..4eb61bdf 100644
--- a/src/protocol_auth.c
+++ b/src/protocol_auth.c
@@ -110,6 +110,9 @@ bool id_h(connection_t *c, char *request) {
 		return send_ack(c);
 	}
 
+	if(!experimental)
+		c->protocol_minor = 0;
+
 	if(!c->config_tree) {
 		init_configuration(&c->config_tree);
 
@@ -123,13 +126,10 @@ bool id_h(connection_t *c, char *request) {
 			if(!read_ecdsa_public_key(c))
 				return false;
 	} else {
-		if(!ecdsa_active(&c->ecdsa))
+		if(c->protocol_minor && !ecdsa_active(&c->ecdsa))
 			c->protocol_minor = 1;
 	}
 
-	if(!experimental)
-		c->protocol_minor = 0;
-
 	c->allow_request = METAKEY;
 
 	if(c->protocol_minor >= 2)
@@ -547,7 +547,7 @@ static bool upgrade_h(connection_t *c, char *request) {
 	}
 
 	logger(LOG_INFO, "Got ECDSA public key from %s (%s), upgrading!", c->name, c->hostname);
-	append_connection_config(c, "ECDSAPublicKey", pubkey);
+	append_config_file(c->name, "ECDSAPublicKey", pubkey);
 	c->allow_request = TERMREQ;
 	return send_termreq(c);
 }