lifegpc/GARbro-crskycode
1
0
Fork 0
mirror of https://github.com/crskycode/GARbro.git synced 2026-07-08 01:30:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

(PackOpener): correctly handle version 3 archives without encryption.

Browse Source
This commit is contained in:
morkt
2016-02-26 22:14:30 +04:00
parent 1d6a803982
commit f26bc064c9
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ArcFormats/Qlie/ArcQLIE.cs
View File

@@ -135,6 +135,8 @@ namespace GameRes.Formats.Qlie
// currently, user is prompted to choose encryption scheme only if there's 'key.fkey' file found. // currently, user is prompted to choose encryption scheme only if there's 'key.fkey' file found.
if (key_file != null) if (key_file != null)
arc_key = QueryEncryption(); arc_key = QueryEncryption();
if (null == arc_key)
key_file = null;
var key_data = new byte[0x100]; var key_data = new byte[0x100];
file.View.Read (file.MaxOffset-0x41C, key_data, 0, 0x100); file.View.Read (file.MaxOffset-0x41C, key_data, 0, 0x100);
@@ -170,7 +172,7 @@ namespace GameRes.Formats.Qlie
entry.IsEncrypted = 0 != file.View.ReadInt32 (index_offset+0x14); entry.IsEncrypted = 0 != file.View.ReadInt32 (index_offset+0x14);
entry.Hash = file.View.ReadUInt32 (index_offset+0x18); entry.Hash = file.View.ReadUInt32 (index_offset+0x18);
entry.KeyFile = key_file; entry.KeyFile = key_file;
if (3 == pack_version && entry.Name.Contains ("pack_keyfile")) if (3 == pack_version && null != arc_key && entry.Name.Contains ("pack_keyfile"))
{ {
// note that 'pack_keyfile' itself is encrypted using 'key.fkey' file contents. // note that 'pack_keyfile' itself is encrypted using 'key.fkey' file contents.
key_file = ReadEntryBytes (file, entry, name_key, arc_key); key_file = ReadEntryBytes (file, entry, name_key, arc_key);