exa/codecrypt
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

chacha: fix discarding

Browse source 
although it's not needed here.
This commit is contained in:
Mirek Kratochvil 2014-03-30 19:15:43 +02:00
parent 7d1d95784a
commit d44ae939d5
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/chacha.cpp
View file

@ -109,13 +109,15 @@ void chacha20::gen (size_t n, byte*out)
{ {
//empty the block buffer first //empty the block buffer first
while (n && blockpos < 64) { while (n && blockpos < 64) {
* (out++) = block[blockpos++]; if (out) * (out++) = block[blockpos++];
else blockpos++;
--n; --n;
} }
//fill in whole blocks //fill in whole blocks
while (n >= 64) { while (n >= 64) {
chacha_gen (key, counter, (uint32_t*) &out); if (out) chacha_gen (key, counter, (uint32_t*) &out);
chacha_incr_counter (counter); chacha_incr_counter (counter);
out += 64; out += 64;
n -= 64; n -= 64;
@ -129,7 +131,8 @@ void chacha20::gen (size_t n, byte*out)
chacha_incr_counter (counter); chacha_incr_counter (counter);
while (n) { while (n) {
* (out++) = block[blockpos++]; if (out) * (out++) = block[blockpos++];
else blockpos++;
--n; --n;
} }
} }