emo/hardened_malloc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

chacha: add constant for number of rounds

Browse Source
This commit is contained in:
Daniel Micay 2019-04-09 01:29:25 -04:00
parent cef7368b3c
commit 02bfcc3b75
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
chacha.c
View File

@ -4,6 +4,9 @@
#include "chacha.h" #include "chacha.h"
// ChaCha8
static const unsigned rounds = 8;
#define U8C(v) (v##U) #define U8C(v) (v##U)
#define U32C(v) (v##U) #define U32C(v) (v##U)
@ -108,7 +111,7 @@ void chacha_keystream_bytes(chacha_ctx *x, u8 *c, u32 bytes) {
u32 x13 = j13; u32 x13 = j13;
u32 x14 = j14; u32 x14 = j14;
u32 x15 = j15; u32 x15 = j15;
for (unsigned i = 8; i > 0; i -= 2) { for (unsigned i = rounds; i > 0; i -= 2) {
QUARTERROUND(x0, x4, x8, x12) QUARTERROUND(x0, x4, x8, x12)
QUARTERROUND(x1, x5, x9, x13) QUARTERROUND(x1, x5, x9, x13)
QUARTERROUND(x2, x6, x10, x14) QUARTERROUND(x2, x6, x10, x14)