From: Guus Sliepen <guus@tinc-vpn.org>
Date: Sun, 8 Dec 2013 20:06:03 +0000 (+0100)
Subject: Allow running without ECDSA keys If ExperimentalProtocol is not explicitly set.
X-Git-Tag: release-1.1pre10~29
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=1b580b2a6beee9d32488a1d95c45de336dee9c2e;p=oweals%2Ftinc.git

Allow running without ECDSA keys If ExperimentalProtocol is not explicitly set.

To make upgrading less painful, allow running tinc 1.1 without ECDSA keys
unless ExperimentalProtocol is explicitly set to yes.
---

diff --git a/src/net_setup.c b/src/net_setup.c
index 0085598..c7f8faa 100644
--- a/src/net_setup.c
+++ b/src/net_setup.c
@@ -673,10 +673,13 @@ static bool setup_myself(void) {
 
 	myself->options |= PROT_MINOR << 24;
 
-	get_config_bool(lookup_config(config_tree, "ExperimentalProtocol"), &experimental);
-
-	if(experimental && !read_ecdsa_private_key())
-		return false;
+	if(!get_config_bool(lookup_config(config_tree, "ExperimentalProtocol"), &experimental)) {
+		experimental = read_ecdsa_private_key();
+		logger(DEBUG_ALWAYS, LOG_WARNING, "Support for SPTPS disabled.");
+	} else {
+		if(experimental && !read_ecdsa_private_key())
+			return false;
+	}
 
 	if(!read_rsa_private_key())
 		return false;