chizui/YarikStudio
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CNUnity update, bug fixes.

Browse Source
This commit is contained in:
Razmoth
2023-02-16 21:42:02 +04:00
parent d4ea97524d
commit 8e39846caa
7 changed files with 99 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
AssetStudio/Crypto/BlkUtils.cs
View File

@@ -5,10 +5,11 @@ namespace AssetStudio
{
public static class BlkUtils
{
private const int DataPos = 0x2A;
private const int KeySize = 0x1000;
private const int SeedBlockSize = 0x800;
public static CryptoStream Decrypt(FileReader reader, Blk blk)
public static XORStream Decrypt(FileReader reader, Blk blk)
{
reader.Endian = EndianType.LittleEndian;
@@ -53,7 +54,7 @@ namespace AssetStudio
BinaryPrimitives.WriteUInt64LittleEndian(xorpad.AsSpan(i, 8), mt64.Int64());
}
return new CryptoStream(reader.BaseStream, xorpad);
return new XORStream(reader.BaseStream, DataPos, xorpad);
}
}
}

20
AssetStudio/Crypto/CNUnity.cs
View File

@@ -49,7 +49,7 @@ namespace AssetStudio
{
using var aes = Aes.Create();
aes.Mode = CipherMode.ECB;
aes.Key = Encoding.UTF8.GetBytes(entry.Key);
aes.Key = entry.GenerateKey();
Encryptor = aes.CreateEncryptor();
}
@@ -140,24 +140,18 @@ namespace AssetStudio
public bool Validate()
{
try
var bytes = GenerateKey();
if (bytes.Length != 0x10)
{
var bytes = Encoding.UTF8.GetBytes(Key);
if (bytes.Length != 0x10)
{
Logger.Warning($"[CNUnity] {this} has invalid key, size should be 16 bytes, skipping...");
return false;
}
}
catch(Exception e)
{
Logger.Error($"[CNUnity] Error while adding {this}: {e.Message}");
Logger.Warning($"[CNUnity] {this} has invalid key, size should be 16 bytes, skipping...");
return false;
}
return true;
}
public byte[] GenerateKey() => Convert.FromHexString(Key);
public override string ToString() => $"{Name} ({Key})";
}
}