summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEdgar E. Iglesias <edgar.iglesias@gmail.com>2013-04-06 11:30:10 +0200
committerNiels Möller <nisse@lysator.liu.se>2013-04-06 11:30:10 +0200
commite76c8b47fb4e813fc4d3b11c3e35ef12a69f794b (patch)
treee4f4a3fa37f27839fe52ba298fa2117b5c2e3f94
parent2dfae9f33daefc7c1fcb39cf50420a087cd45d5c (diff)
downloadnettle-e76c8b47fb4e813fc4d3b11c3e35ef12a69f794b.tar.gz
Fix condition for when the block buffer is full.
-rw-r--r--ChangeLog6
-rw-r--r--sha3.c2
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index ad89c2ec..09a744f8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2013-04-06 Niels Möller <nisse@lysator.liu.se>
+
+ From Edgar E. Iglesias:
+ * sha3.c (_sha3_update): Fix condition for when the block buffer
+ is full.
+
2013-04-04 Niels Möller <nisse@lysator.liu.se>
* ecc-point.c (ecc_point_get): Allow NULL x or y, ignore
diff --git a/sha3.c b/sha3.c
index d7aec46e..21e7beb7 100644
--- a/sha3.c
+++ b/sha3.c
@@ -61,7 +61,7 @@ _sha3_update (struct sha3_state *state,
if (pos > 0)
{
unsigned left = block_size - pos;
- if (length < pos)
+ if (length < left)
{
memcpy (block + pos, data, length);
return pos + length;