From bddaf98342a461f4e02389d4db390098fb423fbf Mon Sep 17 00:00:00 2001 From: "Nicolas \"Pixel\" Noble" Date: Sat, 9 Aug 2014 19:23:48 -0700 Subject: Fixing even more warnings. --- includes/BHashes.h | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) (limited to 'includes/BHashes.h') diff --git a/includes/BHashes.h b/includes/BHashes.h index c08b48d..3d7be49 100644 --- a/includes/BHashes.h +++ b/includes/BHashes.h @@ -3,6 +3,8 @@ #include #include +#undef max + namespace Balau { template @@ -13,9 +15,16 @@ class Hash { int r = desc->init(&m_state); IAssert(r == CRYPT_OK, "init for %s returned %i", desc->name, r); } - void update(const uint8_t * data, const size_t len) { - int r = desc->process(&m_state, data, len); - IAssert(r == CRYPT_OK, "process for %s returned %i", desc->name, r); + void update(const uint8_t * data, size_t len) { + while (len) { + unsigned long blockLen = std::numeric_limits::max(); + if (blockLen > len) + blockLen = (unsigned long) len; + int r = desc->process(&m_state, data, blockLen); + data += blockLen; + len -= blockLen; + IAssert(r == CRYPT_OK, "process for %s returned %i", desc->name, r); + } } unsigned final(void * digest, unsigned outlen) { AAssert(outlen >= digestSize(), "digest size too small being passed on for %s: %u instead of %u", name(), outlen, digestSize()); -- cgit v1.2.3