updated ShiinaRio encryption schemes.

ArcFormats/ShiinaRio/WarcEncryption.cs

@@ -582,41 +582,58 @@ namespace GameRes.Formats.ShiinaRio
     }
 
     [Serializable]
-    public abstract class KeyDecryptExtra : IDecryptExtra
+    public abstract class KeyDecryptBase : IDecryptExtra
     {
-        readonly uint     Key;
+        protected readonly uint     Seed;
-        readonly byte[]   DecodeTable;
+        protected readonly byte[]   DecodeTable;
+        protected uint MinLength = 0x400;
 
-        public KeyDecryptExtra (uint key, byte[] decode_bin)
+        public KeyDecryptBase (uint seed, byte[] decode_bin)
         {
-            Key = key;
+            Seed = seed;
             DecodeTable = decode_bin;
         }
 
         public void Decrypt (byte[] data, int index, uint length, uint flags)
         {
-            if (length < 0x400)
+            if (length < MinLength)
                 return;
             if ((flags & 0x202) == 0x202)
-            {
+                DecryptPre (data, index, length);
-                var k = new uint[4];
-                InitKey (Key, k);
-                for (int i = 0; i < 0xFF; ++i)
-                {
-                    uint j = k[3] ^ (k[3] << 11) ^ k[0] ^ ((k[3] ^ (k[3] << 11) ^ (k[0] >> 11)) >> 8);
-                    k[3] = k[2];
-                    k[2] = k[1];
-                    k[1] = k[0];
-                    k[0] = j;
-                    data[index + i] ^= DecodeTable[j % DecodeTable.Length];
-                }
-            }
             if ((flags & 0x204) == 0x204)
+                DecryptPost (data, index, length);
+        }
+
+        protected abstract void DecryptPre (byte[] data, int index, uint length);
+
+        protected virtual void DecryptPost (byte[] data, int index, uint length)
+        {
+            data[index + 0x200] ^= (byte)Seed;
+            data[index + 0x201] ^= (byte)(Seed >> 8);
+            data[index + 0x202] ^= (byte)(Seed >> 16);
+            data[index + 0x203] ^= (byte)(Seed >> 24);
+        }
+    }
+
+    [Serializable]
+    public abstract class KeyDecryptExtra : KeyDecryptBase
+    {
+        public KeyDecryptExtra (uint seed, byte[] decode_bin) : base (seed, decode_bin)
+        {
+        }
+
+        protected override void DecryptPre (byte[] data, int index, uint length)
+        {
+            var k = new uint[4];
+            InitKey (Seed, k);
+            for (int i = 0; i < 0xFF; ++i)
             {
-                data[index + 0x200] ^= (byte)Key;
+                uint j = k[3] ^ (k[3] << 11) ^ k[0] ^ ((k[3] ^ (k[3] << 11) ^ (k[0] >> 11)) >> 8);
-                data[index + 0x201] ^= (byte)(Key >> 8);
+                k[3] = k[2];
-                data[index + 0x202] ^= (byte)(Key >> 16);
+                k[2] = k[1];
-                data[index + 0x203] ^= (byte)(Key >> 24);
+                k[1] = k[0];
+                k[0] = j;
+                data[index + i] ^= DecodeTable[j % DecodeTable.Length];
             }
         }
 
@@ -656,27 +673,64 @@ namespace GameRes.Formats.ShiinaRio
     }
 
     [Serializable]
-    public class UnknownCrypt : IDecryptExtra
+    public class MakiFesCrypt : KeyDecryptBase
+    {
+        public MakiFesCrypt (uint seed, byte[] key) : base (seed, key)
+        {
+        }
+
+        protected override void DecryptPre (byte[] data, int index, uint length)
+        {
+            uint k = Seed;
+            for (int i = 0; i < 0x100; ++i)
+            {
+                k = 0x343FD * k + 0x269EC3;
+                data[index+i] ^= DecodeTable[((int)(k >> 16) & 0x7FFF) % DecodeTable.Length];
+            }
+        }
+    }
+
+    [Serializable]
+    public class MajimeCrypt : IDecryptExtra
+    {
+        public void Decrypt (byte[] data, int index, uint length, uint flags)
+        {
+            if (length < 0x200)
+                return;
+            if ((flags & 0x202) == 0x202)
+            {
+                int sum = 0;
+                int bit = 0;
+                byte v;
+                for (int i = 0; i < 0x100; ++i)
+                {
+                    v = data[index+i];
+                    sum += v >> 1;
+                    data[index+i] = (byte)(v >> 1 | bit);
+                    bit = v << 7;
+                }
+                data[index] |= (byte)bit;
+                data[index + 0x104] ^= (byte)sum;
+                data[index + 0x105] ^= (byte)(sum >> 8);
+            }
+        }
+    }
+
+    [Serializable]
+    public class AlcotCrypt : IDecryptExtra
     {
         public void Decrypt (byte[] data, int index, uint length, uint flags)
         {
             if (length < 0x400)
                 return;
-            int src = index;
+            if ((flags & 0x204) == 0x204)
-            uint key = 0;
-            for (uint i = (length & 0x7eu) + 1; i != 0; --i)
             {
-                key ^= data[src++];
+                var crc16 = new Kogado.Crc16();
-                for (int j = 0; j < 8; ++j)
+                crc16.Update (data, index, (int)length & 0x7E | 1);
-                {
+                var sum = crc16.Value ^ 0xFFFF;
-                    uint bit = key & 1;
+                data[index + 0x104] ^= (byte)sum;
-                    key = bit << 15 | key >> 1;
+                data[index + 0x105] ^= (byte)(sum >> 8);
-                    if (0 == bit)
-                        key ^= 0x408;
-                }
             }
-            data[index+0x104] ^= (byte)key;
-            data[index+0x105] ^= (byte)(key >> 8);
         }
     }
 }

supported.html

@@ -102,6 +102,7 @@ Okaa-san ga Ippai!<br/>
 Chikan Ou ~Inkoku no Souzousha~<br/>
 Daisaimin Rankou Gakuen<br/>
 Haitoku no Gakuen ~Yami ni Sasagerareta Otome-tachi~<br/>
+Haitoku no Gakuen 2 ~Yami o Tsugu Mono~<br/>
 Injoku Shinryuu Club<br/>
 Moon.<br/>
 Ryoujoku Famiresu Choukyou Menu<br/>
@@ -367,6 +368,7 @@ Touka Gettan<br/>
 </td></tr>
 <tr class="odd"><td>*</td><td><tt>\x00\x00\x04\x00</tt></td><td>No</td></tr>
 <tr><td>*.war</td><td><tt>WARC 1.7</tt><br/><tt>WARC 1.5</tt><br/><tt>WARC 1.3</tt></td><td>No</td><td rowspan="5">Shiina Rio</td><td rowspan="5">
+Aneiro <span class="footnote">ShiinaRio v2.49</span><br/>
 Can Fes! ~Itazura Majo to Naisho no Gakuensai~ <span class="footnote">ShiinaRio v2.47</span><br/>
 Chikan Circle <span class="footnote">ShiinaRio v2.46</span><br/>
 Chikan Circle 2 <span class="footnote">ShiinaRio v2.47</span><br/>
@@ -374,11 +376,13 @@ Chuuchuu Nurse <span class="footnote">ShiinaRio v2.45</span><br/>
 Classmate no Okaa-san <span class="footnote">ShiinaRio v2.37</span><br/>
 Draculius <span class="footnote">ShiinaRio v2.38</span><br/>
 Enkaku Sousa <span class="footnote">2.36 or 2.37</span><br/>
+Gohoushi Nurse ~Mayonaka no Kyousei Call~ <span class="footnote">ShiinaRio v2.50</span><br/>
 Helter Skelter <span class="footnote">ShiinaRio v2.40</span><br/>
 Hitozuma Onna Kyoushi Reika <span class="footnote">ShiinaRio v2.39</span><br/>
 Itsuka, Dokoka de ~Ano Ameoto no Kioku~<span class="footnote">2.36 or 2.37</span><br/>
 Kichiku Nakadashi Suieibu<span class="footnote">ShiinaRio v2.41</span><br/>
 Mahou Shoujo no Taisetsu na Koto <span class="footnote">ShiinaRio v2.47</span><br/>
+Maki Fes! <span class="footnote">ShiinaRio v2.50</span><br/>
 Nagagutsu wo Haita Deco <span class="footnote">ShiinaRio v2.39</span><br/>
 Najimi no Oba-chan <span class="footnote">ShiinaRio v2.47</span><br/>
 Niizuma to Yuukaihan <span class="footnote">ShiinaRio v2.45</span><br/>
@@ -386,9 +390,12 @@ Otome Chibaku Yuugi <span class="footnote">ShiinaRio v2.40</span><br/>
 Otome Juurin Yuugi <span class="footnote">ShiinaRio v2.37</span><br/>
 Ran→Sem <span class="footnote">ShiinaRio v2.47</span><br/>
 Rin×Sen <span class="footnote">ShiinaRio v2.47</span><br/>
+Shinigami no Testament <span class="footnote">ShiinaRio v2.49</span><br/>
 Shojo Mama<span class="footnote">ShiinaRio v2.49</span><br/>
 Tantei Shounen A<span class="footnote">some old version, like 2.twenty-something</span><br/>
 Tekoire Princess!<span class="footnote">ShiinaRio v2.37</span><br/>
+Wana ~Hakudaku Mamire no Houkago~<span class="footnote">ShiinaRio v2.36</span><br/>
+Wana II ~Gang Rape~<span class="footnote">ShiinaRio v2.44</span><br/>
 Yoyogi Hitozuma Senmon Gakuin<span class="footnote">ShiinaRio v2.37</span><br/>
 Zansho Omimai Moushiagemasu<span class="footnote">ShiinaRio v2.41</span><br/>
 </td></tr>
@@ -431,6 +438,7 @@ Shuffle! Essence+<br/>
 Clover Heart's<br/>
 Geki Tama! ~Seiryou Gakuen Engeki Bu~<br/>
 Maria ~Tenshi no Kiss to Akuma no Hanayome~<br/>
+Marionette Zero<br/>
 Triptych<br/>
 Tsurugi Otome Noah<br/>
 </td></tr>