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

Rename s to hsigma, use hex, clarify that this constant is not a PRNG "seed"

Browse Source
This commit is contained in:
Frank Denis
2015-11-07 09:35:12 +01:00
parent c574ad86e5
commit 77c25db23a
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libsodium/randombytes/salsa20/randombytes_salsa20_random.c
+7 -5
View File
@@ -254,10 +254,12 @@ randombytes_salsa20_random_rekey(const unsigned char * const mix)
void
randombytes_salsa20_random_stir(void)
{
const unsigned char s[crypto_auth_hmacsha512256_KEYBYTES] = {
'T', 'h', 'i', 's', 'I', 's', 'J', 'u', 's', 't', 'A', 'T',
'h', 'i', 'r', 't', 'y', 'T', 'w', 'o', 'B', 'y', 't', 'e',
's', 'S', 'e', 'e', 'd', '.', '.', '.'
/* constant to personalize the hash function */
const unsigned char hsigma[crypto_auth_hmacsha512256_KEYBYTES] = {
0x54, 0x68, 0x69, 0x73, 0x49, 0x73, 0x4a, 0x75,
0x73, 0x74, 0x41, 0x54, 0x68, 0x69, 0x72, 0x74,
0x79, 0x54, 0x77, 0x6f, 0x42, 0x79, 0x74, 0x65,
0x73, 0x53, 0x65, 0x65, 0x64, 0x2e, 0x2e, 0x2e
};
unsigned char m0[crypto_auth_hmacsha512256_BYTES +
2U * SHA512_BLOCK_SIZE - SHA512_MIN_PAD_SIZE];
@@ -298,7 +300,7 @@ randombytes_salsa20_random_stir(void)
}
#endif
COMPILER_ASSERT(sizeof stream.key == crypto_auth_hmacsha512256_BYTES);
crypto_auth_hmacsha512256(stream.key, k0, sizeof_k0, s);
crypto_auth_hmacsha512256(stream.key, k0, sizeof_k0, hsigma);
COMPILER_ASSERT(sizeof stream.key <= sizeof m0);
randombytes_salsa20_random_rekey(m0);
sodium_memzero(m0, sizeof m0);