[openssl-commits] [openssl] OpenSSL_1_1_0-stable update
Rich Salz
rsalz at openssl.org
Thu Jun 8 20:13:11 UTC 2017
The branch OpenSSL_1_1_0-stable has been updated
via 2984afdad9696e4de4762ebc0039f9353773f66c (commit)
from 3ff170c6a137c330bb23731f1193c5005e9b85a9 (commit)
- Log -----------------------------------------------------------------
commit 2984afdad9696e4de4762ebc0039f9353773f66c
Author: Rich Salz <rsalz at openssl.org>
Date: Thu Jun 8 16:05:52 2017 -0400
Fix a read off the end of the input buffer
when building with OPENSSL_SMALL_FOOTPRINT defined.
Reviewed-by: Tim Hudson <tjh at openssl.org>
Reviewed-by: Rich Salz <rsalz at openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3533)
(cherry picked from commit 0b20ad127ce86b05a854f31d51d91312c86ccc74)
-----------------------------------------------------------------------
Summary of changes:
crypto/whrlpool/wp_dgst.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/crypto/whrlpool/wp_dgst.c b/crypto/whrlpool/wp_dgst.c
index ed06424..6d92551 100644
--- a/crypto/whrlpool/wp_dgst.c
+++ b/crypto/whrlpool/wp_dgst.c
@@ -174,7 +174,7 @@ void WHIRLPOOL_BitUpdate(WHIRLPOOL_CTX *c, const void *_inp, size_t bits)
goto reconsider;
} else
#endif
- if (bits >= 8) {
+ if (bits > 8) {
b = ((inp[0] << inpgap) | (inp[1] >> (8 - inpgap)));
b &= 0xff;
if (bitrem)
@@ -191,7 +191,7 @@ void WHIRLPOOL_BitUpdate(WHIRLPOOL_CTX *c, const void *_inp, size_t bits)
}
if (bitrem)
c->data[byteoff] = b << (8 - bitrem);
- } else { /* remaining less than 8 bits */
+ } else { /* remaining less than or equal to 8 bits */
b = (inp[0] << inpgap) & 0xff;
if (bitrem)
More information about the openssl-commits
mailing list