From 1b580b2a6beee9d32488a1d95c45de336dee9c2e Mon Sep 17 00:00:00 2001 From: Guus Sliepen Date: Sun, 8 Dec 2013 21:06:03 +0100 Subject: [PATCH] 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. --- src/net_setup.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/net_setup.c b/src/net_setup.c index 0085598e..c7f8faa3 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; -- 2.20.1