From d44ae939d5996c72b2dc0752839060ad9a25ace0 Mon Sep 17 00:00:00 2001 From: Mirek Kratochvil Date: Sun, 30 Mar 2014 19:15:43 +0200 Subject: [PATCH] chacha: fix discarding although it's not needed here. --- src/chacha.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/chacha.cpp b/src/chacha.cpp index 6314dc0..9c65695 100644 --- a/src/chacha.cpp +++ b/src/chacha.cpp @@ -109,13 +109,15 @@ void chacha20::gen (size_t n, byte*out) { //empty the block buffer first while (n && blockpos < 64) { - * (out++) = block[blockpos++]; + if (out) * (out++) = block[blockpos++]; + else blockpos++; --n; } //fill in whole blocks while (n >= 64) { - chacha_gen (key, counter, (uint32_t*) &out); + if (out) chacha_gen (key, counter, (uint32_t*) &out); + chacha_incr_counter (counter); out += 64; n -= 64; @@ -129,7 +131,8 @@ void chacha20::gen (size_t n, byte*out) chacha_incr_counter (counter); while (n) { - * (out++) = block[blockpos++]; + if (out) * (out++) = block[blockpos++]; + else blockpos++; --n; } }