re
/
zip
forked from mirror/zip
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add check for AE-2, skip CRC

This commit is contained in:
alexmullins 2015-11-26 16:44:38 -06:00
parent 28a48eb706
commit 0f3df4a457
1 changed files with 4 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
reader.go
View File

@ -39,20 +39,6 @@ type File struct {
headerOffset int64 headerOffset int64
} }
// SetPassword must be called before calling Open on the file.
func (f *File) SetPassword(password []byte) {
f.password = password
}
// IsEncrypted indicates whether this file's data is encrypted.
func (f *File) IsEncrypted() bool {
return f.Flags&0x1 == 1
}
func (f *File) isAE2() bool {
return f.ae == 2
}
func (f *File) hasDataDescriptor() bool { func (f *File) hasDataDescriptor() bool {
return f.Flags&0x8 != 0 return f.Flags&0x8 != 0
} }
@ -171,19 +157,14 @@ func (f *File) Open() (rc io.ReadCloser, err error) {
return return
} }
rc = dcomp(r) rc = dcomp(r)
// TODO: if AE-2, skip CRC and possible dataDescriptor // If AE-2, skip CRC and possible dataDescriptor
if f.isAE2() {
return
}
var desr io.Reader var desr io.Reader
if f.hasDataDescriptor() { if f.hasDataDescriptor() {
desr = io.NewSectionReader(f.zipr, f.headerOffset+bodyOffset+size, dataDescriptorLen) desr = io.NewSectionReader(f.zipr, f.headerOffset+bodyOffset+size, dataDescriptorLen)
} }
// if !f.isAE2() {
// rc = &checksumReader{
// rc: rc,
// hash: crc32.NewIEEE(),
// f: f,
// desr: desr,
// }
// }
rc = &checksumReader{ rc = &checksumReader{
rc: rc, rc: rc,
hash: crc32.NewIEEE(), hash: crc32.NewIEEE(),