diff options
| -rw-r--r-- | internal/contentenc/file_header.go | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/internal/contentenc/file_header.go b/internal/contentenc/file_header.go index 5c05818..8a08ef0 100644 --- a/internal/contentenc/file_header.go +++ b/internal/contentenc/file_header.go @@ -6,10 +6,11 @@ package contentenc import ( "encoding/binary" - "fmt" "log" + "syscall" "github.com/rfjakob/gocryptfs/internal/cryptocore" + "github.com/rfjakob/gocryptfs/internal/tlog" ) const ( @@ -43,12 +44,14 @@ func (h *FileHeader) Pack() []byte { // ParseHeader - parse "buf" into fileHeader object func ParseHeader(buf []byte) (*FileHeader, error) { if len(buf) != HeaderLen { - return nil, fmt.Errorf("ParseHeader: invalid length: got %d, want %d", len(buf), HeaderLen) + tlog.Warn.Printf("ParseHeader: invalid length: want %d bytes, got %d. Returning EINVAL.", HeaderLen, len(buf)) + return nil, syscall.EINVAL } var h FileHeader h.Version = binary.BigEndian.Uint16(buf[0:headerVersionLen]) if h.Version != CurrentVersion { - return nil, fmt.Errorf("ParseHeader: invalid version: got %d, want %d", h.Version, CurrentVersion) + tlog.Warn.Printf("ParseHeader: invalid version: want %d, got %d. Returning EINVAL.", CurrentVersion, h.Version) + return nil, syscall.EINVAL } h.ID = buf[headerVersionLen:] return &h, nil |