epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix bogus mixfile header decryption. Fixes #2176.

Browse Source
This commit is contained in:
Paul Chote
2013-05-02 20:40:13 +12:00
parent b595c7f435
commit 5af983a409
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
OpenRA.FileFormats/Filesystem/MixFile.cs
View File

@@ -81,7 +81,7 @@ namespace OpenRA.FileFormats
byte[] keyblock = reader.ReadBytes(80); byte[] keyblock = reader.ReadBytes(80);
byte[] blowfishKey = new BlowfishKeyProvider().DecryptKey(keyblock); byte[] blowfishKey = new BlowfishKeyProvider().DecryptKey(keyblock);
uint[] h = ReadUints(reader, 2); uint[] h = ReadBlocks(reader, 1);
Blowfish fish = new Blowfish(blowfishKey); Blowfish fish = new Blowfish(blowfishKey);
MemoryStream ms = Decrypt( h, fish ); MemoryStream ms = Decrypt( h, fish );
@@ -93,12 +93,12 @@ namespace OpenRA.FileFormats
s.Position = headerStart; s.Position = headerStart;
reader = new BinaryReader(s); reader = new BinaryReader(s);
int byteCount = 6 + numFiles * PackageEntry.Size; // Round up to the next full block
h = ReadUints( reader, ( byteCount + 3 ) / 4 ); int blockCount = (13 + numFiles*PackageEntry.Size)/8;
h = ReadBlocks(reader, blockCount);
ms = Decrypt( h, fish ); ms = Decrypt( h, fish );
dataStart = headerStart + byteCount + ( ( ~byteCount + 1 ) & 7 ); dataStart = headerStart + 8*blockCount;
long ds; long ds;
return ParseTdHeader( ms, out ds ); return ParseTdHeader( ms, out ds );
@@ -118,9 +118,10 @@ namespace OpenRA.FileFormats
return ms; return ms;
} }
uint[] ReadUints(BinaryReader r, int count) uint[] ReadBlocks(BinaryReader r, int count)
{ {
uint[] ret = new uint[count]; // A block is a single encryption unit (represented as two 32-bit integers)
uint[] ret = new uint[2*count];
for (int i = 0; i < ret.Length; i++) for (int i = 0; i < ret.Length; i++)
ret[i] = r.ReadUInt32(); ret[i] = r.ReadUInt32();