QPQ-AG/libsodium
12
0
Fork 0
mirror of https://github.com/jedisct1/libsodium.git synced 2026-08-25 08:37:13 +09:00
Code Issues Packages Projects Releases Wiki Activity

Leverage randombytes_salsa20_random_rekey()

Browse Source
This commit is contained in:
Frank Denis
2015-06-01 12:45:45 +02:00
parent 3c3635e53a
commit 21fc07e6f4
1 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libsodium/randombytes/salsa20/randombytes_salsa20_random.c
+12 -14
View File
@@ -221,6 +221,17 @@ randombytes_salsa20_random_init(void)
}
#endif
static void
randombytes_salsa20_random_rekey(const unsigned char * const mix)
{
unsigned char *key = stream.key;
size_t i;
for (i = (size_t) 0U; i < sizeof stream.key; i++) {
key[i] ^= mix[i];
}
}
void
randombytes_salsa20_random_stir(void)
{
@@ -267,9 +278,7 @@ randombytes_salsa20_random_stir(void)
COMPILER_ASSERT(sizeof stream.key == crypto_auth_hmacsha512256_BYTES);
crypto_auth_hmacsha512256(stream.key, k0, sizeof_k0, s);
COMPILER_ASSERT(sizeof stream.key <= sizeof m0);
for (i = (size_t) 0U; i < sizeof stream.key; i++) {
stream.key[i] ^= m0[i];
}
randombytes_salsa20_random_rekey(m0);
sodium_memzero(m0, sizeof m0);
#ifndef _MSC_VER
stream.pid = getpid();
@@ -292,17 +301,6 @@ randombytes_salsa20_random_stir_if_needed(void)
#endif
}
static void
randombytes_salsa20_random_rekey(const unsigned char * const mix)
{
unsigned char *key = stream.key;
size_t i;
for (i = (size_t) 0U; i < sizeof stream.key; i++) {
key[i] ^= mix[i];
}
}
static uint32_t
randombytes_salsa20_random_getword(void)
{