From 5c7db14a557d7f980dfaa8c10d40c1ccc554b35d Mon Sep 17 00:00:00 2001 From: Daniel Vassdal Date: Wed, 2 Jul 2014 20:55:33 +0200 Subject: Hashing: Redo API * Don't assume the printable output of hashes is hex * Add virtual Compare() function, usable for KDFs like BCrypt Some changes and bugfixes are by @attilamolnar, original PR #767 --- src/modules/m_md5.cpp | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) (limited to 'src/modules/m_md5.cpp') diff --git a/src/modules/m_md5.cpp b/src/modules/m_md5.cpp index ecf76d07c..6e6f5006f 100644 --- a/src/modules/m_md5.cpp +++ b/src/modules/m_md5.cpp @@ -244,29 +244,15 @@ class MD5Provider : public HashProvider MD5Final((unsigned char*)dest, &context); } - - void GenHash(const char* src, char* dest, const char* xtab, unsigned int* ikey, size_t srclen) - { - unsigned char bytes[16]; - - MyMD5((char*)bytes, (void*)src, srclen, ikey); - - for (int i = 0; i < 16; i++) - { - *dest++ = xtab[bytes[i] / 16]; - *dest++ = xtab[bytes[i] % 16]; - } - *dest++ = 0; - } public: - std::string sum(const std::string& data) + std::string GenerateRaw(const std::string& data) { char res[16]; MyMD5(res, (void*)data.data(), data.length(), NULL); return std::string(res, 16); } - MD5Provider(Module* parent) : HashProvider(parent, "hash/md5", 16, 64) {} + MD5Provider(Module* parent) : HashProvider(parent, "md5", 16, 64) {} }; class ModuleMD5 : public Module -- cgit v1.3.1-10-gc9f91