Merge branch 'maint'

diff --git a/patch-id.c b/patch-id.c
index 086d2d9c68835c6a7434932f6e3b430e0906578d..871f1d20c0e364220d23035b34685ced8737cda8 100644 (file)
--- a/patch-id.c
+++ b/patch-id.c
@@ -1,6 +1,6 @@
 #include "cache.h"
 
-static void flush_current_id(int patchlen, unsigned char *id, SHA_CTX *c)
+static void flush_current_id(int patchlen, unsigned char *id, git_SHA_CTX *c)
 {
        unsigned char result[20];
        char name[50];
@@ -8,10 +8,10 @@ static void flush_current_id(int patchlen, unsigned char *id, SHA_CTX *c)
        if (!patchlen)
                return;
 
-       SHA1_Final(result, c);
+       git_SHA1_Final(result, c);
        memcpy(name, sha1_to_hex(id), 41);
        printf("%s %s\n", sha1_to_hex(result), name);
-       SHA1_Init(c);
+       git_SHA1_Init(c);
 }
 
 static int remove_space(char *line)
@@ -31,10 +31,10 @@ static void generate_id_list(void)
 {
        static unsigned char sha1[20];
        static char line[1000];
-       SHA_CTX ctx;
+       git_SHA_CTX ctx;
        int patchlen = 0;
 
-       SHA1_Init(&ctx);
+       git_SHA1_Init(&ctx);
        while (fgets(line, sizeof(line), stdin) != NULL) {
                unsigned char n[20];
                char *p = line;
@@ -67,7 +67,7 @@ static void generate_id_list(void)
                /* Compute the sha without whitespace */
                len = remove_space(line);
                patchlen += len;
-               SHA1_Update(&ctx, line, len);
+               git_SHA1_Update(&ctx, line, len);
        }
        flush_current_id(patchlen, sha1, &ctx);
 }
@@ -81,4 +81,4 @@ int main(int argc, char **argv)
 
        generate_id_list();
        return 0;
-}      
+}