|
|
@ -353,11 +353,15 @@ class Decryptor(object):
|
|
|
|
|
|
|
|
|
|
|
|
def decompress(self, bytes):
|
|
|
|
def decompress(self, bytes):
|
|
|
|
dc = zlib.decompressobj(-15)
|
|
|
|
dc = zlib.decompressobj(-15)
|
|
|
|
bytes = dc.decompress(bytes)
|
|
|
|
try:
|
|
|
|
|
|
|
|
decompressed_bytes = dc.decompress(bytes)
|
|
|
|
ex = dc.decompress(b'Z') + dc.flush()
|
|
|
|
ex = dc.decompress(b'Z') + dc.flush()
|
|
|
|
if ex:
|
|
|
|
if ex:
|
|
|
|
bytes = bytes + ex
|
|
|
|
decompressed_bytes = decompressed_bytes + ex
|
|
|
|
|
|
|
|
except:
|
|
|
|
|
|
|
|
# possibly not compressed by zip - just return bytes
|
|
|
|
return bytes
|
|
|
|
return bytes
|
|
|
|
|
|
|
|
return decompressed_bytes
|
|
|
|
|
|
|
|
|
|
|
|
def decrypt(self, path, data):
|
|
|
|
def decrypt(self, path, data):
|
|
|
|
if path.encode('utf-8') in self._encrypted:
|
|
|
|
if path.encode('utf-8') in self._encrypted:
|
|
|
|