Commit 27f4cd98 authored by Niels Möller's avatar Niels Möller
Browse files

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

parents f1812845 6d3968ca
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> 2013-04-04 Niels Möller <nisse@lysator.liu.se>
* ecc-point.c (ecc_point_get): Allow NULL x or y, ignore * ecc-point.c (ecc_point_get): Allow NULL x or y, ignore
......
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 NEWS for the 2.6 release
Bug fixes: Bug fixes:
......
...@@ -61,7 +61,7 @@ _sha3_update (struct sha3_state *state, ...@@ -61,7 +61,7 @@ _sha3_update (struct sha3_state *state,
if (pos > 0) if (pos > 0)
{ {
unsigned left = block_size - pos; unsigned left = block_size - pos;
if (length < pos) if (length < left)
{ {
memcpy (block + pos, data, length); memcpy (block + pos, data, length);
return pos + length; return pos + length;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment