Merge branch 'master' of git://git.lysator.liu.se/nettle/nettle

27f4cd98 · Niels Möller · f1812845 · 6d3968ca · 27f4cd98 · 27f4cd98
Commit 27f4cd98 authored Apr 10, 2013 by Niels Möller
Hide whitespace changes
Inline Side-by-side

Showing with 15 additions and 1 deletion

ChangeLog ChangeLog +6 -0

NEWS NEWS +8 -0

sha3.c sha3.c +1 -1

No files found.
--- a/ChangeLog
+++ b/ChangeLog
+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

--- a/NEWS
+++ b/NEWS
+NEWS for the 2.7 release
+
+	Bug fixes:
+
+	* Fixed a bug in the buffer handling for incremental sha3
+	  hashing, with a possible buffer overflow. Patch by Edgar
+	  E. Iglesias.
+
 NEWS for the 2.6 release

 	Bug fixes:

--- 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;