From 4d77b7247f80a031b22d3259c470a489604df422 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Thu, 20 Mar 2014 18:31:30 +0100
Subject: Enable secure handshakes by default

---
 src/config.c | 4 +---
 src/config.y | 1 -
 src/fastd.h  | 1 -
 3 files changed, 1 insertion(+), 5 deletions(-)

(limited to 'src')

diff --git a/src/config.c b/src/config.c
index 0031113..7876f75 100644
--- a/src/config.c
+++ b/src/config.c
@@ -64,6 +64,7 @@ static void default_config(fastd_config_t *conf) {
 	conf->mtu = 1500;
 	conf->mode = MODE_TAP;
 
+	conf->secure_handshakes = true;
 	conf->drop_caps = DROP_CAPS_ON;
 
 	conf->protocol = &fastd_protocol_ec25519_fhmqvc;
@@ -573,9 +574,6 @@ void fastd_config_check(fastd_context_t *ctx, fastd_config_t *conf) {
 		fastd_config_method(ctx, conf, "null");
 	}
 
-	if (!conf->secure_handshakes_set)
-		pr_warn(ctx, "`secure handshakes' not set, please read the documentation about this option; defaulting to no");
-
 	configure_user(ctx, conf);
 	configure_methods(ctx, conf);
 }
diff --git a/src/config.y b/src/config.y
index 6fe6a63..e6688d6 100644
--- a/src/config.y
+++ b/src/config.y
@@ -231,7 +231,6 @@ drop_capabilities_enabled:
 
 secure_handshakes:
 		boolean {
-			conf->secure_handshakes_set = true;
 			conf->secure_handshakes = $1;
 		}
 	;
diff --git a/src/fastd.h b/src/fastd.h
index 2a7b5ab..721c9b5 100644
--- a/src/fastd.h
+++ b/src/fastd.h
@@ -174,7 +174,6 @@ struct fastd_config {
 	uint32_t packet_mark;
 	bool forward;
 	fastd_tristate_t pmtu;
-	bool secure_handshakes_set;
 	bool secure_handshakes;
 
 	fastd_drop_caps_t drop_caps;
-- 
cgit v1.2.3