index-pack, unpack-objects: restore missing ->init_fn

Commit 0578f1e66a ("global: adapt callers to use generic hash context helpers")
accidentally removed `->init_fn`, which is required for OpenSSL 3+ SHA1.

This fixes the following error on fetch:
  fatal: fetch-pack: invalid index-pack output

Signed-off-by: Jensen Huang <hmz007@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/index-pack.c b/builtin/index-pack.c
index 5ee13661a1e03b678d9d2fe2cac9510d4c1e4fd1..c7ac0795730f889f4f7418f682e69c549d374eac 100644 (file)
--- a/builtin/index-pack.c
+++ b/builtin/index-pack.c
@@ -1286,6 +1286,7 @@ static void parse_pack_objects(unsigned char *hash)
 
        /* Check pack integrity */
        flush();
+       the_hash_algo->init_fn(&tmp_ctx);
        git_hash_clone(&tmp_ctx, &input_ctx);
        git_hash_final(hash, &tmp_ctx);
        if (!hasheq(fill(the_hash_algo->rawsz), hash, the_repository->hash_algo))

diff --git a/builtin/unpack-objects.c b/builtin/unpack-objects.c
index 8383bcf404957d7e7641ffacc09b9679e6be2dbb..c5a6dca85651a93eb2ff93ea6331f00406663609 100644 (file)
--- a/builtin/unpack-objects.c
+++ b/builtin/unpack-objects.c
@@ -668,6 +668,7 @@ int cmd_unpack_objects(int argc,
        the_hash_algo->init_fn(&ctx);
        unpack_all();
        git_hash_update(&ctx, buffer, offset);
+       the_hash_algo->init_fn(&tmp_ctx);
        git_hash_clone(&tmp_ctx, &ctx);
        git_hash_final_oid(&oid, &tmp_ctx);
        if (strict) {