undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

http: compute hash of downloaded objects using the_hash_algo

Browse Source 
Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
brian m. carlson 2019-02-19 00:05:14 +00:00 committed by Junio C Hamano
parent ae041a0f9a
commit eed0e60f02
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
http.c
View File

@ -2337,7 +2337,7 @@ static size_t fwrite_sha1_file(char *ptr, size_t eltsize, size_t nmemb,
freq->stream.next_out = expn; freq->stream.next_out = expn;
freq->stream.avail_out = sizeof(expn); freq->stream.avail_out = sizeof(expn);
freq->zret = git_inflate(&freq->stream, Z_SYNC_FLUSH); freq->zret = git_inflate(&freq->stream, Z_SYNC_FLUSH);
git_SHA1_Update(&freq->c, expn, the_hash_algo->update_fn(&freq->c, expn,
sizeof(expn) - freq->stream.avail_out); sizeof(expn) - freq->stream.avail_out);
} while (freq->stream.avail_in && freq->zret == Z_OK); } while (freq->stream.avail_in && freq->zret == Z_OK);
return size; 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) { if (prev_read == -1) {
memset(&freq->stream, 0, sizeof(freq->stream)); memset(&freq->stream, 0, sizeof(freq->stream));
git_inflate_init(&freq->stream); git_inflate_init(&freq->stream);
git_SHA1_Init(&freq->c); the_hash_algo->init_fn(&freq->c);
if (prev_posn>0) { if (prev_posn>0) {
prev_posn = 0; prev_posn = 0;
lseek(freq->localfile, 0, SEEK_SET); 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) { if (freq->zret != Z_STREAM_END) {
unlink_or_warn(freq->tmpfile.buf); unlink_or_warn(freq->tmpfile.buf);
return -1; return -1;

2
http.h
View File

@ -225,7 +225,7 @@ struct http_object_request {
long http_code; long http_code;
struct object_id oid; struct object_id oid;
struct object_id real_oid; struct object_id real_oid;
git_SHA_CTX c; git_hash_ctx c;
git_zstream stream; git_zstream stream;
int zret; int zret;
int rename; int rename;