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

Use a new random secret key without keyfile

Browse Source
This commit is contained in:
angt
2015-12-15 09:07:44 +01:00
parent 893de45272
commit ddae22a3d9
1 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/main.c
View File

@@ -554,10 +554,16 @@ static int gt_setup_secretkey (struct crypto_ctx *ctx, char *keyfile)
{ {
const size_t size = sizeof(ctx->skey); const size_t size = sizeof(ctx->skey);
byte_set(ctx->skey, 1, size); if (!keyfile) {
char buf[2*size+1];
randombytes_buf(ctx->skey, size);
gt_tohex(buf, sizeof(buf), ctx->skey, size);
gt_print("new secret key: %s\n", buf);
if (!keyfile)
return 0; return 0;
}
int fd; int fd;
@@ -756,11 +762,6 @@ int main (int argc, char **argv)
return 1; return 1;
} }
struct crypto_ctx ctx;
if (gt_setup_secretkey(&ctx, keyfile))
return 1;
struct addrinfo *ai = ai_create(host, port, listener); struct addrinfo *ai = ai_create(host, port, listener);
if (!ai) if (!ai)
@@ -799,6 +800,11 @@ int main (int argc, char **argv)
return 1; return 1;
} }
struct crypto_ctx ctx;
if (gt_setup_secretkey(&ctx, keyfile))
return 1;
if (option_is_set(opts, "daemon")) { if (option_is_set(opts, "daemon")) {
switch (fork()) { switch (fork()) {
case -1: case -1: