Changeset 6492

Timestamp:

08/24/08 00:32:58 (3 months ago)

Author:

flynd

Message:

Digest from md5 function might contain null bytes so we can't use normal string handling on it. Changed function call to same as for openssl function so we can return all 16 bytes even if there is a null in them.

Location:

trunk/licq

Files:

• include/licq_md5.h (modified) (1 diff)
• src/md5.cpp (modified) (1 diff)

trunk/licq/include/licq_md5.h

@@ -10 +10 @@
 #define MD5_H
 
-#include <string>
-
-std::string md5(const std::string&);
+#define MD5_DIGEST_LENGTH 16
 
 #define UINT8 unsigned char
 #define UINT32 unsigned long
+
+void md5(const UINT8* buf, unsigned int len, UINT8* digest);
 
 struct MD5Context {

trunk/licq/src/md5.cpp

@@ -20 +20 @@
 
 #include <cstring>      /* for memcpy() */
-#include <string>
 
 #include "licq_md5.h"
 
-std::string md5(const std::string& toHash)
+void md5(const UINT8* buf, unsigned int len, UINT8* digest)
 {
   MD5Context context;
-  UINT8 digest[16];
 
   MD5Init(&context);
-  MD5Update(&context, reinterpret_cast<const unsigned char *>(toHash.c_str()), toHash.size());
+  MD5Update(&context, buf, len);
   MD5Final(digest, &context);
-
-  std::string result(reinterpret_cast<const char *>(digest));
-  return result;
 }