From 1e2004c7dd8bd3c2998c05c585260bc6bd3547fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrien=20Gallou=C3=ABt?= Date: Tue, 15 May 2018 06:42:51 +0000 Subject: [PATCH] Ask for a keyfile MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Adrien Gallouët --- src/bind.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/src/bind.c b/src/bind.c index de38e90..7c78a3b 100644 --- a/src/bind.c +++ b/src/bind.c @@ -132,6 +132,11 @@ gt_bind(int argc, char **argv) if (argz(bindz, argc, argv)) return 1; + if (str_empty(keyfile)) { + gt_log("a keyfile is needed!\n"); + return 1; + } + gt_set_port((struct sockaddr *)&bind_addr, bind_port); gt_set_port((struct sockaddr *)&peer_addr, peer_port); @@ -152,15 +157,8 @@ gt_bind(int argc, char **argv) return 1; } - if (str_empty(keyfile)) { - if (mud_set_key(mud, NULL, 0)) { - gt_log("couldn't generate a new key\n"); - return 1; - } - } else { - if (gt_setup_secretkey(mud, keyfile)) - return 1; - } + if (gt_setup_secretkey(mud, keyfile)) + return 1; if (!chacha && mud_set_aes(mud)) { gt_log("AES is not available\n");