diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2011-12-18 00:27:59 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-12-18 00:28:16 -0800 |
| commit | 03f94ae9f909952ed5a78917ab319a312889354b (patch) | |
| tree | 0fd041e8b390bd0d2a960ae629d8e965d363de92 /pack-check.c | |
| parent | commit, merge: initialize static strbuf (diff) | |
| parent | Move 'builtin-*' into a 'builtin/' subdirectory (diff) | |
| download | tgif-03f94ae9f909952ed5a78917ab319a312889354b.tar.xz | |
Update jk/maint-strbuf-missing-init to builtin/ rename
Diffstat (limited to 'pack-check.c')
| -rw-r--r-- | pack-check.c | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/pack-check.c b/pack-check.c index f596bf2db5..166ca703c1 100644 --- a/pack-check.c +++ b/pack-check.c @@ -47,9 +47,9 @@ static int verify_packfile(struct packed_git *p, { off_t index_size = p->index_size; const unsigned char *index_base = p->index_data; - SHA_CTX ctx; + git_SHA_CTX ctx; unsigned char sha1[20], *pack_sig; - off_t offset = 0, pack_sig_ofs = p->pack_size - 20; + off_t offset = 0, pack_sig_ofs = 0; uint32_t nr_objects, i; int err = 0; struct idx_entry *entries; @@ -60,16 +60,18 @@ static int verify_packfile(struct packed_git *p, * immediately. */ - SHA1_Init(&ctx); - while (offset < pack_sig_ofs) { + git_SHA1_Init(&ctx); + do { unsigned int remaining; unsigned char *in = use_pack(p, w_curs, offset, &remaining); offset += remaining; + if (!pack_sig_ofs) + pack_sig_ofs = p->pack_size - 20; if (offset > pack_sig_ofs) remaining -= (unsigned int)(offset - pack_sig_ofs); - SHA1_Update(&ctx, in, remaining); - } - SHA1_Final(sha1, &ctx); + git_SHA1_Update(&ctx, in, remaining); + } while (offset < pack_sig_ofs); + git_SHA1_Final(sha1, &ctx); pack_sig = use_pack(p, w_curs, pack_sig_ofs, NULL); if (hashcmp(sha1, pack_sig)) err = error("%s SHA1 checksum mismatch", @@ -135,7 +137,7 @@ int verify_pack(struct packed_git *p) { off_t index_size; const unsigned char *index_base; - SHA_CTX ctx; + git_SHA_CTX ctx; unsigned char sha1[20]; int err = 0; struct pack_window *w_curs = NULL; @@ -146,9 +148,9 @@ int verify_pack(struct packed_git *p) index_base = p->index_data; /* Verify SHA1 sum of the index file */ - SHA1_Init(&ctx); - SHA1_Update(&ctx, index_base, (unsigned int)(index_size - 20)); - SHA1_Final(sha1, &ctx); + git_SHA1_Init(&ctx); + git_SHA1_Update(&ctx, index_base, (unsigned int)(index_size - 20)); + git_SHA1_Final(sha1, &ctx); if (hashcmp(sha1, index_base + index_size - 20)) err = error("Packfile index for %s SHA1 mismatch", p->pack_name); |