CryptoC-3: fix for Merkle tree root issue

jezal · jezal · commit 6b1858d965ad · 2014-09-04T17:37:24.000+01:00
diff --git a/src/crypto/tree-hash.c b/src/crypto/tree-hash.c
@@ -32,7 +32,7 @@ void tree_hash(const char (*hashes)[HASH_SIZE], size_t count, char *root_hash) {
     size_t i, j;
     size_t cnt = count - 1;
     char (*ints)[HASH_SIZE];
-    for (i = 1; i < sizeof(size_t); i <<= 1) {
+    for (i = 1; i < 8 * sizeof(size_t); i <<= 1) {
       cnt |= cnt >> i;
     }
     cnt &= ~(cnt >> 1);
diff --git a/src/version.h.in b/src/version.h.in
@@ -1,4 +1,4 @@
 #define BUILD_COMMIT_ID "@VERSION@"
 #define PROJECT_VERSION "1.0.2"
-#define PROJECT_VERSION_BUILD_NO "336"
+#define PROJECT_VERSION_BUILD_NO "358"
 #define PROJECT_VERSION_LONG PROJECT_VERSION "." PROJECT_VERSION_BUILD_NO "(" BUILD_COMMIT_ID ")"

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ void tree_hash(const char (hashes)[HASH_SIZE], size_t count, char root_hash) {`
`32`	`32`	`size_t i, j;`
`33`	`33`	`size_t cnt = count - 1;`
`34`	`34`	`char (*ints)[HASH_SIZE];`
`35`		`- for (i = 1; i < sizeof(size_t); i <<= 1) {`
	`35`	`+ for (i = 1; i < 8 * sizeof(size_t); i <<= 1) {`
`36`	`36`	`cnt \|= cnt >> i;`
`37`	`37`	`}`
`38`	`38`	`cnt &= ~(cnt >> 1);`