cheng/libsodium
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

salsa20_random_buf(): mix the output size with the key

Browse Source
This commit is contained in:
Frank Denis 2015-04-23 00:09:17 +02:00
parent 0b9d1cbc88
commit 957a29c469
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/libsodium/randombytes/salsa20/randombytes_salsa20_random.c
View File

@ -367,7 +367,8 @@ randombytes_salsa20_random(void)
void
randombytes_salsa20_random_buf(void * const buf, const size_t size)
{
int ret;
size_t i;
int ret;
randombytes_salsa20_random_stir_if_needed();
COMPILER_ASSERT(sizeof stream.nonce == crypto_stream_salsa20_NONCEBYTES);
@ -378,6 +379,9 @@ randombytes_salsa20_random_buf(void * const buf, const size_t size)
ret = crypto_stream_salsa20((unsigned char *) buf, (unsigned long long) size,
(unsigned char *) &stream.nonce, stream.key);
assert(ret == 0);
for (i = 0U; i < sizeof size; i++) {
stream.key[i] ^= ((const unsigned char *) (const void *) &size)[i];
}
stream.nonce++;
crypto_stream_salsa20_xor(stream.key, stream.key, sizeof stream.key,
(unsigned char *) &stream.nonce, stream.key);