amorfo77/restic
1
0
Fork 0
mirror of https://github.com/restic/restic.git synced 2026-05-24 02:55:24 +00:00
Code Issues Projects Releases Wiki Activity

clarify pack ID in decryption error (#5710)

Browse Source 
pack ID is included in full. In addition, the error message now says
that it is a pack file.
This commit is contained in:
Michael Eischer
2026-02-18 20:43:10 +01:00
committed by GitHub
parent 7101f11133
commit d1937a530b
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/repository/repository.go
+6 -6
View File
@@ -1280,7 +1280,7 @@ func (b *packBlobIterator) Next() (packBlobValue, error) {
nonce, ciphertext := buf[:b.key.NonceSize()], buf[b.key.NonceSize():]
plaintext, err := b.key.Open(ciphertext[:0], nonce, ciphertext, nil)
if err != nil {
err = fmt.Errorf("decrypting blob %v from %v failed: %w", h, b.packID.Str(), err)
err = fmt.Errorf("decrypting blob %v from pack %v failed: %w", h, b.packID.String(), err)
}
if err == nil && entry.IsCompressed() {
// DecodeAll will allocate a slice if it is not large enough since it
@@ -1288,16 +1288,16 @@ func (b *packBlobIterator) Next() (packBlobValue, error) {
b.decode, err = b.dec.DecodeAll(plaintext, b.decode[:0])
plaintext = b.decode
if err != nil {
err = fmt.Errorf("decompressing blob %v from %v failed: %w", h, b.packID.Str(), err)
err = fmt.Errorf("decompressing blob %v from pack %v failed: %w", h, b.packID.String(), err)
}
}
if err == nil {
id := restic.Hash(plaintext)
if !id.Equal(entry.ID) {
debug.Log("read blob %v/%v from %v: wrong data returned, hash is %v",
h.Type, h.ID, b.packID.Str(), id)
err = fmt.Errorf("read blob %v from %v: wrong data returned, hash is %v",
h, b.packID.Str(), id)
debug.Log("read blob %v/%v from pack %v: wrong data returned, hash is %v",
h.Type, h.ID, b.packID.String(), id)
err = fmt.Errorf("read blob %v from pack %v: wrong data returned, hash is %v",
h, b.packID.String(), id)
}
}