http: compute hash of downloaded objects using the_hash_algo

Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/http.c b/http.c
index 993ddc956a574f1df53896eae65675c2dd87fc87..458d07fabbf7a1a3b12b7a35a5ccec6c6cca74d5 100644 (file)
--- a/http.c
+++ b/http.c
@@ -2337,8 +2337,8 @@ static size_t fwrite_sha1_file(char *ptr, size_t eltsize, size_t nmemb,
                freq->stream.next_out = expn;
                freq->stream.avail_out = sizeof(expn);
                freq->zret = git_inflate(&freq->stream, Z_SYNC_FLUSH);
                freq->stream.next_out = expn;
                freq->stream.avail_out = sizeof(expn);
                freq->zret = git_inflate(&freq->stream, Z_SYNC_FLUSH);

-               git_SHA1_Update(&freq->c, expn,
-                               sizeof(expn) - freq->stream.avail_out);
+               the_hash_algo->update_fn(&freq->c, expn,
+                                        sizeof(expn) - freq->stream.avail_out);

        } while (freq->stream.avail_in && freq->zret == Z_OK);
        return size;
 }
        } while (freq->stream.avail_in && freq->zret == Z_OK);
        return size;
 }


@@ -2396,7 +2396,7 @@ struct http_object_request *new_http_object_request(const char *base_url,
 
        git_inflate_init(&freq->stream);
 
 
        git_inflate_init(&freq->stream);
 

-       git_SHA1_Init(&freq->c);
+       the_hash_algo->init_fn(&freq->c);

 
        freq->url = get_remote_object_url(base_url, hex, 0);
 
 
        freq->url = get_remote_object_url(base_url, hex, 0);
 


@@ -2431,7 +2431,7 @@ struct http_object_request *new_http_object_request(const char *base_url,
        if (prev_read == -1) {
                memset(&freq->stream, 0, sizeof(freq->stream));
                git_inflate_init(&freq->stream);
        if (prev_read == -1) {
                memset(&freq->stream, 0, sizeof(freq->stream));
                git_inflate_init(&freq->stream);

-               git_SHA1_Init(&freq->c);
+               the_hash_algo->init_fn(&freq->c);

                if (prev_posn>0) {
                        prev_posn = 0;
                        lseek(freq->localfile, 0, SEEK_SET);
                if (prev_posn>0) {
                        prev_posn = 0;
                        lseek(freq->localfile, 0, SEEK_SET);


@@ -2502,7 +2502,7 @@ int finish_http_object_request(struct http_object_request *freq)
        }
 
        git_inflate_end(&freq->stream);
        }
 
        git_inflate_end(&freq->stream);

-       git_SHA1_Final(freq->real_oid.hash, &freq->c);
+       the_hash_algo->final_fn(freq->real_oid.hash, &freq->c);

        if (freq->zret != Z_STREAM_END) {
                unlink_or_warn(freq->tmpfile.buf);
                return -1;
        if (freq->zret != Z_STREAM_END) {
                unlink_or_warn(freq->tmpfile.buf);
                return -1;

diff --git a/http.h b/http.h
index 4eb4e808e5731a3a9a650ca4c1efb3e471604d05..10d3cfdb80de45d2dbe9779185d0c6a8913e8dd6 100644 (file)
--- a/http.h
+++ b/http.h
@@ -225,7 +225,7 @@ struct http_object_request {
        long http_code;
        struct object_id oid;
        struct object_id real_oid;
        long http_code;
        struct object_id oid;
        struct object_id real_oid;

-       git_SHA_CTX c;
+       git_hash_ctx c;

        git_zstream stream;
        int zret;
        int rename;
        git_zstream stream;
        int zret;
        int rename;