From e4646379a6fb5d1dcff71cc38db5e60802a21dcb Mon Sep 17 00:00:00 2001 From: moneromooo-monero Date: Wed, 7 Feb 2018 13:39:32 +0000 Subject: [PATCH] keccak: fix mdlen bounds sanity checking found by h908714124 --- src/crypto/keccak.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/crypto/keccak.c b/src/crypto/keccak.c index 7386d37a3..533021af3 100644 --- a/src/crypto/keccak.c +++ b/src/crypto/keccak.c @@ -81,7 +81,8 @@ void keccak(const uint8_t *in, size_t inlen, uint8_t *md, int mdlen) uint8_t temp[144]; size_t i, rsiz, rsizw; - if (mdlen <= 0 || mdlen > 200 || sizeof(st) != 200) + static_assert(HASH_DATA_AREA <= sizeof(temp), "Bad keccak preconditions"); + if (mdlen <= 0 || (mdlen > 100 && sizeof(st) != (size_t)mdlen)) { fprintf(stderr, "Bad keccak use"); abort();