projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Merge up work for to remove build.cc
[awesomized/libmemcached]
/
libhashkit
/
md5.c
diff --git
a/libhashkit/md5.c
b/libhashkit/md5.c
index d550c77300c94d493da827251bf65de6a525ca7f..1af5e6c00c834d967b148924780c32f1525422ad 100644
(file)
--- a/
libhashkit/md5.c
+++ b/
libhashkit/md5.c
@@
-1,5
+1,5
@@
/*
/*
- This Library has been modified from its original form by
+ This Library has been modified from its original form by
Brian Aker (brian@tangent.org)
See below for original Copyright.
Brian Aker (brian@tangent.org)
See below for original Copyright.
@@
-29,7
+29,7
@@
These notices must be retained in any copies of any part of this
documentation and/or software.
*/
documentation and/or software.
*/
-#include
"common.h"
+#include
<libhashkit/common.h>
#include <string.h>
#include <sys/types.h>
#include <string.h>
#include <sys/types.h>
@@
-125,7
+125,7
@@
Rotation is separate from addition to prevent recomputation.
}
}
-/*
+/*
Just a simple method for getting the signature
result must be == 16
*/
Just a simple method for getting the signature
result must be == 16
*/
@@
-169,8
+169,8
@@
static void MD5Update (
/* Update number of bits */
if ((context->count[0] += ((UINT4)inputLen << 3))
/* Update number of bits */
if ((context->count[0] += ((UINT4)inputLen << 3))
- < ((UINT4)inputLen << 3))
- context->count[1]++;
+
< ((UINT4)inputLen << 3))
+
context->count[1]++;
context->count[1] += ((UINT4)inputLen >> 29);
partLen = 64 - idx;
context->count[1] += ((UINT4)inputLen >> 29);
partLen = 64 - idx;
@@
-352,9
+352,10
@@
unsigned int len)
(((UINT4)input[j+2]) << 16) | (((UINT4)input[j+3]) << 24);
}
(((UINT4)input[j+2]) << 16) | (((UINT4)input[j+3]) << 24);
}
-uint32_t hashkit_md5(const char *key, size_t key_length)
+uint32_t hashkit_md5(const char *key, size_t key_length
, void *context
)
{
unsigned char results[16];
{
unsigned char results[16];
+ (void)context;
md5_signature((unsigned char*)key, (unsigned int)key_length, results);
md5_signature((unsigned char*)key, (unsigned int)key_length, results);