From 32ac1666e2277834ee4d03035b94e4b6050e4db9 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Tue, 12 Jul 2011 14:03:03 -0700
Subject: [PATCH 1/3] size

Change-Id: I0b43832bc896864abb0a659fc3bf58793879a2e8
---
 dedupe/dedupe.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dedupe/dedupe.c b/dedupe/dedupe.c
index 9897599..e057c4e 100644
--- a/dedupe/dedupe.c
+++ b/dedupe/dedupe.c
@@ -104,7 +104,7 @@ static int store_file(struct DEDUPE_STORE_CONTEXT *context, struct stat st, cons
         return ret;
     }
     
-    fprintf(context->output_manifest, "%s\t\n", psum);
+    fprintf(context->output_manifest, "%s\t%d\t\n", psum, st.st_size);
     return 0;
 }
 

From 70f25bead8995edab2c9ae8271ee05c41f6e4c33 Mon Sep 17 00:00:00 2001
From: codeworkx <daniel.hillenbrand@codeworkx.de>
Date: Tue, 12 Jul 2011 14:49:39 -0700
Subject: [PATCH 2/3] dedupe: include external/openssl/include for host build

Change-Id: I65907c5fa5736c0587567b0d6b4cfb2ce155472e
---
 dedupe/Android.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dedupe/Android.mk b/dedupe/Android.mk
index 03c5de3..6696c49 100644
--- a/dedupe/Android.mk
+++ b/dedupe/Android.mk
@@ -7,6 +7,7 @@ LOCAL_FORCE_STATIC_EXECUTABLE := true
 LOCAL_MODULE_TAGS := eng
 LOCAL_MODULE := dedupe
 LOCAL_STATIC_LIBRARIES := libcrypto_static
+LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../../external/openssl/include
 include $(BUILD_HOST_EXECUTABLE)
 
 include $(CLEAR_VARS)

From 1115c8f32545c0461e12a9746ef753036f0f7e39 Mon Sep 17 00:00:00 2001
From: Koushik Dutta <koushd@gmail.com>
Date: Tue, 12 Jul 2011 16:15:05 -0700
Subject: [PATCH 3/3] use sha256 instead

Change-Id: Ie4e7bfec568c786f58367f55fee866b6aae9732b
---
 dedupe/dedupe.c | 37 ++++++++++++++++++++-----------------
 1 file changed, 20 insertions(+), 17 deletions(-)

diff --git a/dedupe/dedupe.c b/dedupe/dedupe.c
index e057c4e..b8ac0bf 100644
--- a/dedupe/dedupe.c
+++ b/dedupe/dedupe.c
@@ -50,29 +50,29 @@ static int copy_file(const char *dst, const char *src) {
     return 0;
 }
 
-static void do_md5sum(FILE *mfile, unsigned char *rptr) {
+static void do_sha256sum(FILE *mfile, unsigned char *rptr) {
     char rdata[BUFSIZ];
     int rsize;
-    MD5_CTX c;
+    SHA256_CTX c;
     
-    MD5_Init(&c);
+    SHA256_Init(&c);
     while(!feof(mfile)) {
         rsize = fread(rdata, sizeof(char), BUFSIZ, mfile);
         if(rsize > 0) {
-            MD5_Update(&c, rdata, rsize);
+            SHA256_Update(&c, rdata, rsize);
         }
     }
 
-    MD5_Final(rptr, &c);
+    SHA256_Final(rptr, &c);
 }
 
-static int do_md5sum_file(const char* filename, unsigned char *rptr) {
+static int do_sha256sum_file(const char* filename, unsigned char *rptr) {
     FILE *f = fopen(filename, "rb");
     if (f == NULL) {
         fprintf(stderr, "Unable to open file: %s\n", filename);
         return 1;
     }
-    do_md5sum(f, rptr);
+    do_sha256sum(f, rptr);
     fclose(f);
     return 0;
 }
@@ -85,17 +85,17 @@ void print_stat(struct DEDUPE_STORE_CONTEXT *context, char type, struct stat st,
 
 static int store_file(struct DEDUPE_STORE_CONTEXT *context, struct stat st, const char* f) {
     printf("%s\n", f);
-    unsigned char sumdata[SHA_DIGEST_LENGTH];
+    unsigned char sumdata[SHA256_DIGEST_LENGTH];
     int ret;
-    if (ret = do_md5sum_file(f, sumdata)) {
-        fprintf(stderr, "Error calculating md5sum of %s\n", f);
+    if (ret = do_sha256sum_file(f, sumdata)) {
+        fprintf(stderr, "Error calculating sha256sum of %s\n", f);
         return ret; 
     }
-    char psum[41];
+    char psum[128];
     int j;
-    for (j = 0; j < MD5_DIGEST_LENGTH; j++)
+    for (j = 0; j < SHA256_DIGEST_LENGTH; j++)
         sprintf(&psum[(j*2)], "%02x", (int)sumdata[j]);
-    psum[(MD5_DIGEST_LENGTH * 2)] = '\0';
+    psum[(SHA256_DIGEST_LENGTH * 2)] = '\0';
 
     char out_blob[PATH_MAX];
     sprintf(out_blob, "%s/%s", context->blob_dir, psum);
@@ -276,12 +276,15 @@ int main(int argc, char** argv) {
             int ret;
             printf("%s\t%s\t%s\t%s\t%s\t", type, mode, uid, gid, filename);
             if (strcmp(type, "f") == 0) {
-                char md5[41];
-                token = tokenize(md5, token, '\t');
-                printf("%s\n", md5);
+                char sha256[128];
+                token = tokenize(sha256, token, '\t');
+                char sizeStr[32];
+                token = tokenize(sizeStr, token, '\t');
+                int size = atoi(sizeStr);
+                printf("%s\t%d\n", sha256, size);
                 
                 char blob_file[PATH_MAX];
-                sprintf(blob_file, "%s/%s", blob_dir, md5);
+                sprintf(blob_file, "%s/%s", blob_dir, sha256);
                 if (ret = copy_file(filename, blob_file)) {
                     fprintf(stderr, "Unable to copy file %s\n", filename);
                     fclose(input_manifest);