motiejus/vtun
1
Fork 0
Code Releases Activity

Use sodium_compare()

Browse Source
This commit is contained in:
Frank Denis 2015-10-26 20:24:59 +01:00
parent 943fa76bc3
commit 366b9ff47f
1 changed files with 1 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lfd_encrypt.c
View File

@ -90,19 +90,6 @@ free_encrypt(void)
return 0; return 0;
} }
static int
is_lower_or_equal(const unsigned char *a, const unsigned char *b, size_t size)
{
size_t i;
for (i = 0U; i < size; i++) {
if (a[i] > b[i]) {
return 0;
}
}
return 1;
}
static int static int
encrypt_buf(int message_len_, char *message_, char ** const ciphertext_p) encrypt_buf(int message_len_, char *message_, char ** const ciphertext_p)
{ {
@ -140,7 +127,7 @@ decrypt_buf(int ciphertext_len_, char *ciphertext_, char ** const message_p)
} }
ciphertext_len -= crypto_aead_NPUBBYTES; ciphertext_len -= crypto_aead_NPUBBYTES;
nonce = ciphertext + ciphertext_len; nonce = ciphertext + ciphertext_len;
if (is_lower_or_equal(nonce, ctx.previous_decrypted_nonce, crypto_aead_NPUBBYTES) || if (sodium_compare(nonce, ctx.previous_decrypted_nonce, crypto_aead_NPUBBYTES) <= 0 ||
crypto_aead_aes256gcm_decrypt_afternm(ctx.message, &message_len, NULL, crypto_aead_aes256gcm_decrypt_afternm(ctx.message, &message_len, NULL,
ciphertext, ciphertext_len, ciphertext, ciphertext_len,
NULL, 0ULL, nonce, NULL, 0ULL, nonce,