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

Rename random_rekey() to random_xorkey() for clarity

Browse Source 
Zero the xor key after having used it
This commit is contained in:
Frank Denis 2017-11-25 17:49:30 +01:00
parent 01e2aabbfd
commit 3cef66a853
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -295,7 +295,7 @@ randombytes_salsa20_random_init(void)
#endif #endif
static void static void
randombytes_salsa20_random_rekey(const unsigned char * const mix) randombytes_salsa20_random_xorkey(const unsigned char * const mix)
{ {
unsigned char *key = stream.key; unsigned char *key = stream.key;
size_t i; size_t i;
@ -357,7 +357,7 @@ randombytes_salsa20_random_stir(void)
abort(); /* really abort -- it should never happen */ /* LCOV_EXCL_LINE */ abort(); /* really abort -- it should never happen */ /* LCOV_EXCL_LINE */
} }
COMPILER_ASSERT(sizeof stream.key <= sizeof m0); COMPILER_ASSERT(sizeof stream.key <= sizeof m0);
randombytes_salsa20_random_rekey(m0); randombytes_salsa20_random_xorkey(m0);
sodium_memzero(m0, sizeof m0); sodium_memzero(m0, sizeof m0);
#ifdef HAVE_GETPID #ifdef HAVE_GETPID
stream.pid = getpid(); stream.pid = getpid();
@ -458,7 +458,8 @@ randombytes_salsa20_random(void)
stream.key); stream.key);
assert(ret == 0); assert(ret == 0);
stream.rnd32_outleft = (sizeof stream.rnd32) - (sizeof stream.key); stream.rnd32_outleft = (sizeof stream.rnd32) - (sizeof stream.key);
randombytes_salsa20_random_rekey(&stream.rnd32[stream.rnd32_outleft]); randombytes_salsa20_random_xorkey(&stream.rnd32[stream.rnd32_outleft]);
memset(&stream.rnd32[stream.rnd32_outleft], 0, sizeof stream.key);
stream.nonce++; stream.nonce++;
} }
stream.rnd32_outleft -= sizeof val; stream.rnd32_outleft -= sizeof val;