hardcoresushi/libgocryptfs
1
0
Fork 0
Code Issues Pull Requests Releases Activity

ParseHeader: print hexdump on error

Browse Source 
Should help debugging https://github.com/rfjakob/gocryptfs/issues/363
This commit is contained in:
Jakob Unterwurzacher 2019-02-17 17:13:20 +01:00
parent 19cb6d046a
commit 179471b648
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
internal/contentenc/file_header.go
View File

@ -7,6 +7,7 @@ package contentenc
import (
"bytes"
"encoding/binary"
"encoding/hex"
"fmt"
"log"
@ -52,11 +53,13 @@ func ParseHeader(buf []byte) (*FileHeader, error) {
var h FileHeader
h.Version = binary.BigEndian.Uint16(buf[0:headerVersionLen])
if h.Version != CurrentVersion {
return nil, fmt.Errorf("ParseHeader: invalid version, want=%d have=%d", CurrentVersion, h.Version)
return nil, fmt.Errorf("ParseHeader: invalid version, want=%d have=%d. Hexdump: %s",
CurrentVersion, h.Version, hex.EncodeToString(buf))
}
h.ID = buf[headerVersionLen:]
if bytes.Equal(h.ID, allZeroFileID) {
return nil, fmt.Errorf("ParseHeader: file id is all-zero")
return nil, fmt.Errorf("ParseHeader: file id is all-zero. Hexdump: %s",
hex.EncodeToString(buf))
}
return &h, nil
}

8
tests/matrix/matrix_test.go
View File

@ -98,13 +98,13 @@ func testWriteN(t *testing.T, fn string, n int) string {
}
d := make([]byte, n)
written, err := file.Write(d)
if err != nil || written != len(d) {
t.Errorf("err=\"%s\", written=%d", err, written)
_, err := file.Write(d)
if err != nil {
t.Fatal(err)
}
err = file.Close()
if err != nil {
t.Error(err)
t.Fatal(err)
}
test_helpers.VerifySize(t, test_helpers.DefaultPlainDir+"/"+fn, n)