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

Set nonce in randombytes_salsa20_random_stir() instead of random_init()

Browse Source
This commit is contained in:
Frank Denis 2019-01-06 04:31:44 +01:00
parent ab0932bf80
commit 358767f238
1 changed files with 2 additions and 4 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

@ -163,8 +163,6 @@ sodium_hrtime(void)
static void static void
randombytes_salsa20_random_init(void) randombytes_salsa20_random_init(void)
{ {
stream.nonce = sodium_hrtime();
assert(stream.nonce != (uint64_t) 0U);
global.rdrand_available = sodium_runtime_has_rdrand(); global.rdrand_available = sodium_runtime_has_rdrand();
} }
@ -304,9 +302,7 @@ randombytes_salsa20_random_init(void)
{ {
const int errno_save = errno; const int errno_save = errno;
stream.nonce = sodium_hrtime();
global.rdrand_available = sodium_runtime_has_rdrand(); global.rdrand_available = sodium_runtime_has_rdrand();
assert(stream.nonce != (uint64_t) 0U);
# ifdef HAVE_SAFE_ARC4RANDOM # ifdef HAVE_SAFE_ARC4RANDOM
errno = errno_save; errno = errno_save;
@ -342,6 +338,8 @@ randombytes_salsa20_random_init(void)
static void static void
randombytes_salsa20_random_stir(void) randombytes_salsa20_random_stir(void)
{ {
stream.nonce = sodium_hrtime();
assert(stream.nonce != (uint64_t) 0U);
memset(stream.rnd32, 0, sizeof stream.rnd32); memset(stream.rnd32, 0, sizeof stream.rnd32);
stream.rnd32_outleft = (size_t) 0U; stream.rnd32_outleft = (size_t) 0U;
if (global.initialized == 0) { if (global.initialized == 0) {