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

Define VERSION_MAJOR and use it in handshake

Browse Source
This commit is contained in:
angt
2015-12-29 18:31:23 +01:00
parent ec85be5c6a
commit ba0af8cc20
3 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main.c
View File

@@ -651,6 +651,8 @@ static int gt_setup_secretkey (struct crypto_ctx *ctx, char *keyfile)
static int gt_setup_crypto (struct crypto_ctx *ctx, int fd, int listener)
{
const uint8_t gt[] = {'G', 'T', VERSION_MAJOR, 0 };
const size_t size = 96;
const size_t hash_size = 32;
@@ -673,7 +675,7 @@ static int gt_setup_crypto (struct crypto_ctx *ctx, int fd, int listener)
randombytes_buf(secret, sizeof(secret));
crypto_scalarmult_base(&data_w[nonce_size], secret);
byte_cpy(&data_w[size-hash_size-4], "GT\0\0", 4);
byte_cpy(&data_w[size-hash_size-sizeof(gt)], gt, sizeof(gt));
crypto_generichash(&data_w[size-hash_size], hash_size,
data_w, size-hash_size, ctx->skey, sizeof(ctx->skey));
@@ -684,7 +686,7 @@ static int gt_setup_crypto (struct crypto_ctx *ctx, int fd, int listener)
if (fd_read_all(fd, data_r, size)!=size)
return -1;
if (memcmp(&data_r[size-hash_size-4], &data_w[size-hash_size-4], 4))
if (memcmp(&data_r[size-hash_size-sizeof(gt)], gt, sizeof(gt)))
return -2;
crypto_generichash(hash, hash_size,