3 files changed, 31 insertions, 110 deletions
diff --git a/format/pack/checksum/checksum.go b/format/pack/checksum/checksum.go
deleted file mode 100644
index 7fc1c954..00000000
--- a/format/pack/checksum/checksum.go
+++ /dev/null
@@ -1,108 +0,0 @@
-// Package checksum provides Git pack/index checksum primitives.
-package checksum
-
-import (
-	"bytes"
-	"fmt"
-
-	"codeberg.org/lindenii/furgit/objectid"
-)
-
-// VerifyPackTrailer verifies one pack trailer hash against the pack payload.
-//
-// This computes the object hash over all bytes except the trailing hash, so it
-// is O(pack size).
-func VerifyPackTrailer(data []byte, algo objectid.Algorithm) error {
-	hashSize := algo.Size()
-	if hashSize <= 0 {
-		return objectid.ErrInvalidAlgorithm
-	}
-	if len(data) < hashSize {
-		return fmt.Errorf("format/pack/checksum: pack too short for trailer hash")
-	}
-
-	hash, err := algo.New()
-	if err != nil {
-		return err
-	}
-	if _, err := hash.Write(data[:len(data)-hashSize]); err != nil {
-		return err
-	}
-	computed := hash.Sum(nil)
-	trailer := data[len(data)-hashSize:]
-	if !bytes.Equal(computed, trailer) {
-		return fmt.Errorf("format/pack/checksum: pack trailer hash mismatch")
-	}
-	return nil
-}
-
-// PackTrailerHash returns the trailer hash bytes from one pack file.
-func PackTrailerHash(data []byte, algo objectid.Algorithm) ([]byte, error) {
-	hashSize := algo.Size()
-	if hashSize <= 0 {
-		return nil, objectid.ErrInvalidAlgorithm
-	}
-	if len(data) < hashSize {
-		return nil, fmt.Errorf("format/pack/checksum: pack too short for trailer hash")
-	}
-	return data[len(data)-hashSize:], nil
-}
-
-// ParseIdxTrailer parses one idx v2 trailer and returns (packHash, idxHash).
-func ParseIdxTrailer(data []byte, algo objectid.Algorithm) ([]byte, []byte, error) {
-	hashSize := algo.Size()
-	if hashSize <= 0 {
-		return nil, nil, objectid.ErrInvalidAlgorithm
-	}
-	if len(data) < hashSize*2 {
-		return nil, nil, fmt.Errorf("format/pack/checksum: idx too short for trailer hashes")
-	}
-	packHashOff := len(data) - hashSize*2
-	idxHashOff := len(data) - hashSize
-	return data[packHashOff:idxHashOff], data[idxHashOff:], nil
-}
-
-// VerifyIdxTrailer verifies one idx trailer checksum against preceding bytes.
-func VerifyIdxTrailer(data []byte, algo objectid.Algorithm) error {
-	hashSize := algo.Size()
-	if hashSize <= 0 {
-		return objectid.ErrInvalidAlgorithm
-	}
-	if len(data) < hashSize*2 {
-		return fmt.Errorf("format/pack/checksum: idx too short for trailer hashes")
-	}
-
-	_, idxHash, err := ParseIdxTrailer(data, algo)
-	if err != nil {
-		return err
-	}
-	hash, err := algo.New()
-	if err != nil {
-		return err
-	}
-	if _, err := hash.Write(data[:len(data)-hashSize]); err != nil {
-		return err
-	}
-	computed := hash.Sum(nil)
-	if !bytes.Equal(computed, idxHash) {
-		return fmt.Errorf("format/pack/checksum: idx trailer hash mismatch")
-	}
-	return nil
-}
-
-// VerifyPackMatchesIdx compares a pack trailer hash with one idx-recorded pack
-// hash.
-func VerifyPackMatchesIdx(packData, idxData []byte, algo objectid.Algorithm) error {
-	packTrailerHash, err := PackTrailerHash(packData, algo)
-	if err != nil {
-		return err
-	}
-	idxPackHash, _, err := ParseIdxTrailer(idxData, algo)
-	if err != nil {
-		return err
-	}
-	if !bytes.Equal(packTrailerHash, idxPackHash) {
-		return fmt.Errorf("format/pack/checksum: pack hash does not match idx")
-	}
-	return nil
-}
diff --git a/objectstore/packed/pack_idx_checksum.go b/objectstore/packed/pack_idx_checksum.go
new file mode 100644
index 00000000..2f55a469
--- /dev/null
+++ b/objectstore/packed/pack_idx_checksum.go
@@ -0,0 +1,30 @@
+package packed
+
+import (
+	"bytes"
+	"fmt"
+
+	"codeberg.org/lindenii/furgit/objectid"
+)
+
+// verifyMappedPackMatchesMappedIdx compares one mapped pack trailer hash with
+// the pack hash recorded in one mapped idx trailer.
+func verifyMappedPackMatchesMappedIdx(packData, idxData []byte, algo objectid.Algorithm) error {
+	hashSize := algo.Size()
+	if hashSize <= 0 {
+		return objectid.ErrInvalidAlgorithm
+	}
+	if len(packData) < hashSize {
+		return fmt.Errorf("objectstore/packed: pack too short for trailer hash")
+	}
+	if len(idxData) < hashSize*2 {
+		return fmt.Errorf("objectstore/packed: idx too short for trailer hashes")
+	}
+
+	packTrailerHash := packData[len(packData)-hashSize:]
+	idxPackHash := idxData[len(idxData)-hashSize*2 : len(idxData)-hashSize]
+	if !bytes.Equal(packTrailerHash, idxPackHash) {
+		return fmt.Errorf("objectstore/packed: pack hash does not match idx")
+	}
+	return nil
+}
diff --git a/objectstore/packed/store.go b/objectstore/packed/store.go
index bb6936ea..abd7175f 100644
--- a/objectstore/packed/store.go
+++ b/objectstore/packed/store.go
@@ -7,7 +7,6 @@ import (
 	"os"
 	"sync"
 
-	packchecksum "codeberg.org/lindenii/furgit/format/pack/checksum"
 	"codeberg.org/lindenii/furgit/objectid"
 	"codeberg.org/lindenii/furgit/objectstore"
 )
@@ -195,7 +194,7 @@ func (store *Store) verifyPackMatchesIndexes(pack *packFile) error {
 	if err != nil {
 		return err
 	}
-	if err := packchecksum.VerifyPackMatchesIdx(pack.data, index.data, store.algo); err != nil {
+	if err := verifyMappedPackMatchesMappedIdx(pack.data, index.data, store.algo); err != nil {
 		return fmt.Errorf("objectstore/packed: pack %q does not match idx %q: %w", pack.name, index.idxName, err)
 	}
 	return nil