haskell/cryptonite
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #104 from brandonhamilton/master

Browse Source 
Correct XSalsa20 initialization when using 8/12 rounds
This commit is contained in:
Vincent Hanquez 2016-11-07 14:27:48 +00:00 committed by GitHub
commit 47cb6ebdea
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cbits/cryptonite_xsalsa.c
View File

@ -57,7 +57,7 @@ void cryptonite_xsalsa_init(cryptonite_salsa_context *ctx, uint8_t nb_rounds,
/* Compute (z0, z1, . . . , z15) = doubleround ^(r/2) (x0, x1, . . . , x15) */ /* Compute (z0, z1, . . . , z15) = doubleround ^(r/2) (x0, x1, . . . , x15) */
block hSalsa; block hSalsa;
memset(&hSalsa, 0, sizeof(block)); memset(&hSalsa, 0, sizeof(block));
cryptonite_salsa_core_xor(20, &hSalsa, &ctx->st); cryptonite_salsa_core_xor(nb_rounds, &hSalsa, &ctx->st);
/* Build a new 512-bit input block (x′0, x′1, . . . , x′15): /* Build a new 512-bit input block (x′0, x′1, . . . , x′15):
(x′0, x′5, x′10, x′15) is the Salsa20 constant (x′0, x′5, x′10, x′15) is the Salsa20 constant