Public-Mirror/GARbro-mirror
1
0
Fork 0
mirror of https://github.com/crskycode/GARbro.git synced 2024-12-24 03:44:13 +08:00
Code Issues Projects Releases Wiki Activity

(KiriKiri): SenrenCxCrypt moved to YuzCrypt.

Browse Source
This commit is contained in:
morkt 2018-04-03 02:00:26 +04:00
parent 927d335a61
commit b1e59f6b0d
2 changed files with 53 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
ArcFormats/KiriKiri/CryptAlgorithms.cs
View File

@ -1035,12 +1035,20 @@ namespace GameRes.Formats.KiriKiri
}
[Serializable]
public class SenrenCxCrypt : CxEncryption
public class NanaCxCrypt : CxEncryption
{
uint m_random_seed;
public string FileMapName { get; set; }
public SenrenCxCrypt (CxScheme scheme) : base (scheme)
public NanaCxCrypt (CxScheme scheme, uint seed) : base (scheme)
{
m_random_seed = seed;
}
internal override CxProgram NewProgram (uint seed)
{
return new CxProgramNana (seed, m_random_seed, ControlBlock);
}
public override string ReadName (BinaryReader header)
@ -1088,22 +1096,6 @@ namespace GameRes.Formats.KiriKiri
Dictionary<string, string> KnownNames = null;
}
[Serializable]
public class NanaCxCrypt : SenrenCxCrypt
{
uint m_random_seed;
public NanaCxCrypt (CxScheme scheme, uint seed) : base (scheme)
{
m_random_seed = seed;
}
internal override CxProgram NewProgram (uint seed)
{
return new CxProgramNana (seed, m_random_seed, ControlBlock);
}
}
[Serializable]
public class KissCrypt : CzCrypt
{

73
ArcFormats/KiriKiri/YuzCrypt.cs
View File

@ -32,7 +32,46 @@ using GameRes.Utility;
namespace GameRes.Formats.KiriKiri
{
[Serializable]
public class RiddleCxCrypt : CxEncryption
public class SenrenCxCrypt : CxEncryption
{
public SenrenCxCrypt (CxScheme scheme) : base (scheme)
{
}
internal virtual void ReadYuzNames (byte[] yuz, FilenameMap filename_map)
{
using (var ystream = new MemoryStream (yuz))
using (var zstream = ZLibCompressor.DeCompress (ystream))
using (var input = new BinaryReader (zstream, Encoding.Unicode))
{
long dir_offset = 0;
while (-1 != input.PeekChar())
{
uint entry_signature = input.ReadUInt32();
long entry_size = input.ReadInt64();
if (entry_size < 0)
return;
dir_offset += 12 + entry_size;
uint hash = input.ReadUInt32();
int name_size = input.ReadInt16();
if (name_size > 0)
{
entry_size -= 6;
if (name_size * 2 <= entry_size)
{
var filename = new string (input.ReadChars (name_size));
filename_map.Add (hash, filename);
}
}
input.BaseStream.Position = dir_offset;
}
filename_map.AddShortcut ("$", "startup.tjs");
}
}
}
[Serializable]
public class RiddleCxCrypt : SenrenCxCrypt
{
uint m_random_seed;
@ -66,7 +105,7 @@ namespace GameRes.Formats.KiriKiri
{
ulong key = GetKeyFromHash (entry.Hash);
key >>= (int)offset << 3;
int first_chunk = Math.Min (count, 8);
int first_chunk = Math.Min (count, 8 - (int)offset);
for (int i = 0; i < first_chunk; ++i)
{
buffer[pos+i] ^= (byte)key;
@ -84,39 +123,13 @@ namespace GameRes.Formats.KiriKiri
return (ulong)hi << 32 | lo;
}
internal void ReadYuzNames (byte[] yuz, FilenameMap filename_map)
internal override void ReadYuzNames (byte[] yuz, FilenameMap filename_map)
{
if (null == YuzKey)
throw new InvalidEncryptionScheme();
var decryptor = new YuzDecryptor (ControlBlock, YuzKey, YuzKey[4], YuzKey[5]);
decryptor.Decrypt (yuz, Math.Min (yuz.Length, 0x100));
using (var ystream = new MemoryStream (yuz))
using (var zstream = ZLibCompressor.DeCompress (ystream))
using (var input = new BinaryReader (zstream, Encoding.Unicode))
{
long dir_offset = 0;
while (-1 != input.PeekChar())
{
uint entry_signature = input.ReadUInt32();
long entry_size = input.ReadInt64();
if (entry_size < 0)
return;
dir_offset += 12 + entry_size;
uint hash = input.ReadUInt32();
int name_size = input.ReadInt16();
if (name_size > 0)
{
entry_size -= 6;
if (name_size * 2 <= entry_size)
{
var filename = new string (input.ReadChars (name_size));
filename_map.Add (hash, filename);
}
}
input.BaseStream.Position = dir_offset;
}
filename_map.AddShortcut ("$", "startup.tjs");
}
base.ReadYuzNames (yuz, filename_map);
}
}