keccak: fix mdlen bounds sanity checking

found by h908714124
6 years ago · e4646379a6
parent 2e3e90acbe
commit e4646379a6
1 changed files with 2 additions and 1 deletions
--- 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();