miegl/glorytun
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Ask for a keyfile

Browse Source 
Signed-off-by: Adrien Gallouët <adrien@gallouet.fr>
This commit is contained in:
Adrien Gallouët
2018-05-15 06:42:51 +00:00
parent e12d136ba3
commit 1e2004c7dd
1 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/bind.c
View File

@@ -132,6 +132,11 @@ gt_bind(int argc, char **argv)
if (argz(bindz, argc, argv)) if (argz(bindz, argc, argv))
return 1; 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 *)&bind_addr, bind_port);
gt_set_port((struct sockaddr *)&peer_addr, peer_port); gt_set_port((struct sockaddr *)&peer_addr, peer_port);
@@ -152,15 +157,8 @@ gt_bind(int argc, char **argv)
return 1; return 1;
} }
if (str_empty(keyfile)) { if (gt_setup_secretkey(mud, keyfile))
if (mud_set_key(mud, NULL, 0)) { return 1;
gt_log("couldn't generate a new key\n");
return 1;
}
} else {
if (gt_setup_secretkey(mud, keyfile))
return 1;
}
if (!chacha && mud_set_aes(mud)) { if (!chacha && mud_set_aes(mud)) {
gt_log("AES is not available\n"); gt_log("AES is not available\n");