ParseHeader: print hexdump on error
Should help debugging https://github.com/rfjakob/gocryptfs/issues/363
This commit is contained in:
parent
19cb6d046a
commit
179471b648
|
@ -7,6 +7,7 @@ package contentenc
|
||||||
import (
|
import (
|
||||||
"bytes"
|
"bytes"
|
||||||
"encoding/binary"
|
"encoding/binary"
|
||||||
|
"encoding/hex"
|
||||||
"fmt"
|
"fmt"
|
||||||
"log"
|
"log"
|
||||||
|
|
||||||
|
@ -52,11 +53,13 @@ func ParseHeader(buf []byte) (*FileHeader, error) {
|
||||||
var h FileHeader
|
var h FileHeader
|
||||||
h.Version = binary.BigEndian.Uint16(buf[0:headerVersionLen])
|
h.Version = binary.BigEndian.Uint16(buf[0:headerVersionLen])
|
||||||
if h.Version != CurrentVersion {
|
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:]
|
h.ID = buf[headerVersionLen:]
|
||||||
if bytes.Equal(h.ID, allZeroFileID) {
|
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
|
return &h, nil
|
||||||
}
|
}
|
||||||
|
|
|
@ -98,13 +98,13 @@ func testWriteN(t *testing.T, fn string, n int) string {
|
||||||
}
|
}
|
||||||
|
|
||||||
d := make([]byte, n)
|
d := make([]byte, n)
|
||||||
written, err := file.Write(d)
|
_, err := file.Write(d)
|
||||||
if err != nil || written != len(d) {
|
if err != nil {
|
||||||
t.Errorf("err=\"%s\", written=%d", err, written)
|
t.Fatal(err)
|
||||||
}
|
}
|
||||||
err = file.Close()
|
err = file.Close()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t.Error(err)
|
t.Fatal(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
test_helpers.VerifySize(t, test_helpers.DefaultPlainDir+"/"+fn, n)
|
test_helpers.VerifySize(t, test_helpers.DefaultPlainDir+"/"+fn, n)
|
||||||
|
|
Loading…
Reference in New Issue