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

Fix cases where files with non-ascii names would fail to decrypt.

Browse Source
This commit is contained in:
Sławomir Śpiewak
2024-08-18 10:46:41 +02:00
parent d2a22fa2fb
commit 329589122a
2 changed files with 31 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ArcFormats/DxLib/ArcDX8.cs
View File

@@ -150,7 +150,7 @@ namespace GameRes.Formats.DxLib
if (isencrypted)
{
var keyStr = Query<DXAOpts>(arcStrings.ZIPEncryptedNotice).Keyword;
key = new DxKey8(keyStr);
key = new DxKey8(keyStr,dx.CodePage);
}
@@ -191,9 +191,6 @@ namespace GameRes.Formats.DxLib
long dec_offset = dx_ent.UnpackedSize;
var key = dx_arc.Encryption.GetEntryKey(dx_ent.Name);
input = new EncryptedStream(input, dec_offset, key);
if (!dx_ent.HuffmanCompressed && !dx_ent.IsPacked)
return input;
//we ruled out the case in which neither compression is applied. We still have 3 cases to go.
byte[] tmpBuffer = new byte[dx_ent.Size];
input.Read(tmpBuffer, 0, tmpBuffer.Length);