motiejus/vtun
1
Fork 0
Code Releases Activity

Missing return in derive_key() + explicit type conversions

Browse Source
This commit is contained in:
Frank Denis 2015-10-09 13:18:38 +02:00
parent 9335457ca4
commit 64c9a90fae
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lfd_encrypt.c
View File

@ -42,6 +42,8 @@ derive_key(unsigned char *key, size_t key_size, struct vtun_host *host)
crypto_generichash(key, key_size, host->key, HOST_KEYBYTES, NULL, 0U); crypto_generichash(key, key_size, host->key, HOST_KEYBYTES, NULL, 0U);
sodium_free(host->key); sodium_free(host->key);
host->key = NULL; host->key = NULL;
return 0;
} }
static int static int
@ -136,7 +138,7 @@ encrypt_buf(int message_len_, char *message_, char ** const ciphertext_p)
memcpy(ctx.ciphertext + message_len + crypto_aead_ABYTES, memcpy(ctx.ciphertext + message_len + crypto_aead_ABYTES,
ctx.nonce, crypto_aead_NPUBBYTES); ctx.nonce, crypto_aead_NPUBBYTES);
sodium_increment(ctx.nonce, crypto_aead_NPUBBYTES); sodium_increment(ctx.nonce, crypto_aead_NPUBBYTES);
*ciphertext_p = ctx.ciphertext; *ciphertext_p = (char *) ctx.ciphertext;
return (int) ciphertext_len + crypto_aead_NPUBBYTES; return (int) ciphertext_len + crypto_aead_NPUBBYTES;
} }
@ -162,7 +164,7 @@ decrypt_buf(int ciphertext_len_, char *ciphertext_, char ** const message_p)
return -1; return -1;
} }
memcpy(ctx.previous_decrypted_nonce, nonce, crypto_aead_NPUBBYTES); memcpy(ctx.previous_decrypted_nonce, nonce, crypto_aead_NPUBBYTES);
*message_p = ctx.message; *message_p = (char *) ctx.message;
return (int) message_len; return (int) message_len;
} }