diff options
| author | Rich Salz <rsalz@openssl.org> | 2017-06-08 16:05:52 -0400 |
|---|---|---|
| committer | Rich Salz <rsalz@openssl.org> | 2017-06-08 16:05:52 -0400 |
| commit | 0b20ad127ce86b05a854f31d51d91312c86ccc74 (patch) | |
| tree | bc81573f6bcb9d5b61dc3e324b76bfe8e8417a41 | |
| parent | 135976b3dd24e674c202c20b5746fc04ebb1fc1a (diff) | |
| download | openssl-0b20ad127ce86b05a854f31d51d91312c86ccc74.tar.gz | |
Fix a read off the end of the input buffer
when building with OPENSSL_SMALL_FOOTPRINT defined.
Reviewed-by: Tim Hudson <tjh@openssl.org>
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3533)
| -rw-r--r-- | crypto/whrlpool/wp_dgst.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crypto/whrlpool/wp_dgst.c b/crypto/whrlpool/wp_dgst.c index ed064244fa..6d925517a2 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) |