Changeset 726

Timestamp:

01/17/12 12:47:13 (4 months ago)

Author:

shiretu

Message:

-- minor refactoring on md5 function

Files:

• branches/1.0/sources/common/include/utils/misc/crypto.h (modified) (3 diffs)
• branches/1.0/sources/common/src/utils/misc/crypto.cpp (modified) (3 diffs)
• trunk/sources/common/include/utils/misc/crypto.h (modified) (3 diffs)
• trunk/sources/common/src/utils/misc/crypto.cpp (modified) (3 diffs)

branches/1.0/sources/common/include/utils/misc/crypto.h

@@ -1 @@
-/* 
+/*
  *  Copyright (c) 2010,
  *  Gavriloaie Eugen-Andrei (shiretu@gmail.com)
@@ -75 +75 @@
         */
         bool CreateSharedKey(uint8_t *pPeerPublicKey, int32_t length);
-        
+
         /*!
                 @brief Copies the shared secret key.
@@ -90 +90 @@
                 RC4_KEY *rc4keyIn, RC4_KEY *rc4keyOut);
 DLLEXP string md5(string source, bool textResult);
+DLLEXP string md5(uint8_t *pBuffer, uint32_t length, bool textResult);
 DLLEXP void HMACsha256(const void *pData, uint32_t dataLength, const void *pKey,
                 uint32_t keyLength, void *pResult);

branches/1.0/sources/common/src/utils/misc/crypto.cpp

@@ -1 @@
-/* 
+/*
  *  Copyright (c) 2010,
  *  Gavriloaie Eugen-Andrei (shiretu@gmail.com)
@@ -217 +217 @@
 
 string md5(string source, bool textResult) {
+        return md5((uint8_t*) source.c_str(), source.length(), textResult);
+}
+
+string md5(uint8_t *pBuffer, uint32_t length, bool textResult) {
         EVP_MD_CTX mdctx;
         unsigned char md_value[EVP_MAX_MD_SIZE];
@@ -222 +226 @@
 
         EVP_DigestInit(&mdctx, EVP_md5());
-        EVP_DigestUpdate(&mdctx, STR(source), source.length());
+        EVP_DigestUpdate(&mdctx, pBuffer, length);
         EVP_DigestFinal_ex(&mdctx, md_value, &md_len);
         EVP_MD_CTX_cleanup(&mdctx);

trunk/sources/common/include/utils/misc/crypto.h

@@ -1 @@
-/* 
+/*
  *  Copyright (c) 2010,
  *  Gavriloaie Eugen-Andrei (shiretu@gmail.com)
@@ -75 +75 @@
         */
         bool CreateSharedKey(uint8_t *pPeerPublicKey, int32_t length);
-        
+
         /*!
                 @brief Copies the shared secret key.
@@ -90 +90 @@
                 RC4_KEY *rc4keyIn, RC4_KEY *rc4keyOut);
 DLLEXP string md5(string source, bool textResult);
+DLLEXP string md5(uint8_t *pBuffer, uint32_t length, bool textResult);
 DLLEXP void HMACsha256(const void *pData, uint32_t dataLength, const void *pKey,
                 uint32_t keyLength, void *pResult);

trunk/sources/common/src/utils/misc/crypto.cpp

@@ -1 @@
-/* 
+/*
  *  Copyright (c) 2010,
  *  Gavriloaie Eugen-Andrei (shiretu@gmail.com)
@@ -217 +217 @@
 
 string md5(string source, bool textResult) {
+        return md5((uint8_t*) source.c_str(), source.length(), textResult);
+}
+
+string md5(uint8_t *pBuffer, uint32_t length, bool textResult) {
         EVP_MD_CTX mdctx;
         unsigned char md_value[EVP_MAX_MD_SIZE];
@@ -222 +226 @@
 
         EVP_DigestInit(&mdctx, EVP_md5());
-        EVP_DigestUpdate(&mdctx, STR(source), source.length());
+        EVP_DigestUpdate(&mdctx, pBuffer, length);
         EVP_DigestFinal_ex(&mdctx, md_value, &md_len);
         EVP_MD_CTX_cleanup(&mdctx);