From 2eeee990f029779d8d1c2205b99a239bf87fbbe5 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 24 Jun 2024 23:45:27 +0200 Subject: Hash to a vector of bytes rather than an ASCII string. --- src/KM_fileio.cpp | 34 +++++----------------------------- 1 file changed, 5 insertions(+), 29 deletions(-) (limited to 'src/KM_fileio.cpp') diff --git a/src/KM_fileio.cpp b/src/KM_fileio.cpp index de3948a..bc4624a 100644 --- a/src/KM_fileio.cpp +++ b/src/KM_fileio.cpp @@ -34,6 +34,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include #include +#include #ifdef KM_WIN32 #include @@ -786,39 +787,14 @@ Kumu::FileWriter::MaybeHash(void const * data, int size) } } -std::string +std::vector Kumu::FileWriter::StopHashing() { m_Hashing = false; - unsigned char digest[MD5_DIGEST_LENGTH]; - MD5_Final (digest, &m_MD5Context); - - char buffer[33]; - snprintf( - buffer, - 33, - // 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 - "%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x", - digest[0], - digest[1], - digest[2], - digest[3], - digest[4], - digest[5], - digest[6], - digest[7], - digest[8], - digest[9], - digest[10], - digest[11], - digest[12], - digest[13], - digest[14], - digest[15] - ); - - return buffer; + std::vector digest(MD5_DIGEST_LENGTH); + MD5_Final(digest.data(), &m_MD5Context); + return digest; } Kumu::FileReader::FileReader() -- cgit v1.2.3