kevin/libsodium
1
Fork 0
mirror of https://github.com/jedisct1/libsodium.git synced 2024-12-20 02:25:14 -07:00
Code Releases Wiki Activity

Correct an assertion and prefer compile-time assertions

Browse Source
This commit is contained in:
Frank Denis 2016-12-11 20:28:03 +01:00
parent 9979762bbe
commit 9d2ac5f747
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/libsodium/crypto_stream/xchacha20/stream_xchacha20.c
View File

@ -1,6 +1,5 @@
#include <stdlib.h>
#include <assert.h>
#include "crypto_core_hchacha20.h"
#include "crypto_stream_chacha20.h"
@ -23,9 +22,10 @@ crypto_stream_xchacha20(unsigned char *c, unsigned long long clen,
unsigned char k2[crypto_core_hchacha20_OUTPUTBYTES];
crypto_core_hchacha20(k2, n, k, NULL);
assert(crypto_stream_chacha20_KEYBYTES <= sizeof k2);
assert(crypto_stream_chacha20_NONCEBYTES ==
(sizeof n) - crypto_core_hchacha20_INPUTBYTES);
(void) sizeof(int[crypto_stream_chacha20_KEYBYTES <= sizeof k2 ? 1 : -1]);
(void) sizeof(int[crypto_stream_chacha20_NONCEBYTES ==
crypto_stream_xchacha20_NONCEBYTES -
crypto_core_hchacha20_INPUTBYTES ? 1 : -1]);
return crypto_stream_chacha20(c, clen,
n + crypto_core_hchacha20_INPUTBYTES, k2);
}