diff --git a/DICUI.Library/DiscImageCreator/CRC16.cs b/DICUI.Library/DiscImageCreator/CRC16.cs
new file mode 100644
index 00000000..a07e0d41
--- /dev/null
+++ b/DICUI.Library/DiscImageCreator/CRC16.cs
@@ -0,0 +1,53 @@
+namespace DICUI.DiscImageCreator
+{
+ public class CRC16
+ {
+ // Table of CRC constants - implements x^16+x^12+x^5+1
+ private static ushort[] crc16_tab = new ushort[]
+ {
+ 0x0000, 0x1021, 0x2042, 0x3063, 0x4084, 0x50a5, 0x60c6, 0x70e7,
+ 0x8108, 0x9129, 0xa14a, 0xb16b, 0xc18c, 0xd1ad, 0xe1ce, 0xf1ef,
+ 0x1231, 0x0210, 0x3273, 0x2252, 0x52b5, 0x4294, 0x72f7, 0x62d6,
+ 0x9339, 0x8318, 0xb37b, 0xa35a, 0xd3bd, 0xc39c, 0xf3ff, 0xe3de,
+ 0x2462, 0x3443, 0x0420, 0x1401, 0x64e6, 0x74c7, 0x44a4, 0x5485,
+ 0xa56a, 0xb54b, 0x8528, 0x9509, 0xe5ee, 0xf5cf, 0xc5ac, 0xd58d,
+ 0x3653, 0x2672, 0x1611, 0x0630, 0x76d7, 0x66f6, 0x5695, 0x46b4,
+ 0xb75b, 0xa77a, 0x9719, 0x8738, 0xf7df, 0xe7fe, 0xd79d, 0xc7bc,
+ 0x48c4, 0x58e5, 0x6886, 0x78a7, 0x0840, 0x1861, 0x2802, 0x3823,
+ 0xc9cc, 0xd9ed, 0xe98e, 0xf9af, 0x8948, 0x9969, 0xa90a, 0xb92b,
+ 0x5af5, 0x4ad4, 0x7ab7, 0x6a96, 0x1a71, 0x0a50, 0x3a33, 0x2a12,
+ 0xdbfd, 0xcbdc, 0xfbbf, 0xeb9e, 0x9b79, 0x8b58, 0xbb3b, 0xab1a,
+ 0x6ca6, 0x7c87, 0x4ce4, 0x5cc5, 0x2c22, 0x3c03, 0x0c60, 0x1c41,
+ 0xedae, 0xfd8f, 0xcdec, 0xddcd, 0xad2a, 0xbd0b, 0x8d68, 0x9d49,
+ 0x7e97, 0x6eb6, 0x5ed5, 0x4ef4, 0x3e13, 0x2e32, 0x1e51, 0x0e70,
+ 0xff9f, 0xefbe, 0xdfdd, 0xcffc, 0xbf1b, 0xaf3a, 0x9f59, 0x8f78,
+ 0x9188, 0x81a9, 0xb1ca, 0xa1eb, 0xd10c, 0xc12d, 0xf14e, 0xe16f,
+ 0x1080, 0x00a1, 0x30c2, 0x20e3, 0x5004, 0x4025, 0x7046, 0x6067,
+ 0x83b9, 0x9398, 0xa3fb, 0xb3da, 0xc33d, 0xd31c, 0xe37f, 0xf35e,
+ 0x02b1, 0x1290, 0x22f3, 0x32d2, 0x4235, 0x5214, 0x6277, 0x7256,
+ 0xb5ea, 0xa5cb, 0x95a8, 0x8589, 0xf56e, 0xe54f, 0xd52c, 0xc50d,
+ 0x34e2, 0x24c3, 0x14a0, 0x0481, 0x7466, 0x6447, 0x5424, 0x4405,
+ 0xa7db, 0xb7fa, 0x8799, 0x97b8, 0xe75f, 0xf77e, 0xc71d, 0xd73c,
+ 0x26d3, 0x36f2, 0x0691, 0x16b0, 0x6657, 0x7676, 0x4615, 0x5634,
+ 0xd94c, 0xc96d, 0xf90e, 0xe92f, 0x99c8, 0x89e9, 0xb98a, 0xa9ab,
+ 0x5844, 0x4865, 0x7806, 0x6827, 0x18c0, 0x08e1, 0x3882, 0x28a3,
+ 0xcb7d, 0xdb5c, 0xeb3f, 0xfb1e, 0x8bf9, 0x9bd8, 0xabbb, 0xbb9a,
+ 0x4a75, 0x5a54, 0x6a37, 0x7a16, 0x0af1, 0x1ad0, 0x2ab3, 0x3a92,
+ 0xfd2e, 0xed0f, 0xdd6c, 0xcd4d, 0xbdaa, 0xad8b, 0x9de8, 0x8dc9,
+ 0x7c26, 0x6c07, 0x5c64, 0x4c45, 0x3ca2, 0x2c83, 0x1ce0, 0x0cc1,
+ 0xef1f, 0xff3e, 0xcf5d, 0xdf7c, 0xaf9b, 0xbfba, 0x8fd9, 0x9ff8,
+ 0x6e17, 0x7e36, 0x4e55, 0x5e74, 0x2e93, 0x3eb2, 0x0ed1, 0x1ef0,
+ };
+
+ public static ushort Calculate(byte[] buf, int bufPtr, int len)
+ {
+ ushort cksum = 0;
+ for (int i = 0; i < len; i++)
+ {
+ cksum = (ushort)(crc16_tab[((cksum >> 8) ^ buf[bufPtr++]) & 0xFF] ^ (cksum << 8));
+ }
+
+ return (ushort)(~cksum);
+ }
+ }
+}
diff --git a/DICUI.Library/DiscImageCreator/LibCrypt.cs b/DICUI.Library/DiscImageCreator/LibCrypt.cs
new file mode 100644
index 00000000..c617db36
--- /dev/null
+++ b/DICUI.Library/DiscImageCreator/LibCrypt.cs
@@ -0,0 +1,143 @@
+using System;
+using System.IO;
+
+namespace DICUI.DiscImageCreator
+{
+ ///
+ /// LibCrypt detection code
+ /// Originally written by Dremora: https://github.com/Dremora/psxt001z
+ /// Ported and changed by darksabre76
+ ///
+ public class LibCrypt
+ {
+ public static bool CheckSubfile(string subFilePath)
+ {
+ // Check the file exists first
+ if (!File.Exists(subFilePath))
+ {
+ Console.WriteLine($"{subFilePath} could not be found");
+ return false;
+ }
+
+ // Check the extension is a subfile
+ string ext = Path.GetExtension(subFilePath).TrimStart('.').ToLowerInvariant();
+ if (ext != "sub")
+ {
+ Console.WriteLine($"{ext}: unknown file extension");
+ return false;
+ }
+
+ // Open and check the subfile for LibCrypt
+ try
+ {
+ using (FileStream subfile = File.OpenRead(subFilePath))
+ {
+ return CheckSubfile(subfile);
+ }
+ }
+ catch
+ {
+ Console.WriteLine($"Error processing {subFilePath}");
+ return false;
+ }
+ }
+
+ public static bool CheckSubfile(Stream subfile)
+ {
+ // Check the length is valid for subfiles
+ long size = subfile.Length;
+ if (size % 96 != 0)
+ return false;
+
+ // Persistent values
+ byte[] buffer = new byte[16];
+ byte[] sub = new byte[16];
+ int tpos = 0;
+ int modifiedSectors = 0;
+
+ // Check each sector for modifications
+ for (uint sector = 150; sector < ((size / 96) + 150); sector++)
+ {
+ subfile.Seek(12, SeekOrigin.Current);
+ if (subfile.Read(buffer, 0, 12) == 0)
+ return false;
+
+ subfile.Seek(72, SeekOrigin.Current);
+
+ // New track
+ if ((btoi(buffer[1]) == (btoi(sub[1]) + 1)) && (buffer[2] == 0 || buffer[2] == 1))
+ {
+ Array.Copy(buffer, sub, 6);
+ tpos = ((btoi((byte)(buffer[3] * 60)) + btoi(buffer[4])) * 75) + btoi(buffer[5]);
+ }
+
+ // New index
+ else if (btoi(buffer[2]) == (btoi(sub[2]) + 1) && buffer[1] == sub[1])
+ {
+ Array.Copy(buffer, 2, sub, 2, 4);
+ tpos = ((btoi((byte)(buffer[3] * 60)) + btoi(buffer[4])) * 75) + btoi(buffer[5]);
+ }
+
+ // MSF1 [3-5]
+ else
+ {
+ if (sub[2] == 0)
+ tpos--;
+ else
+ tpos++;
+
+ sub[3] = itob((byte)(tpos / 60 / 75));
+ sub[4] = itob((byte)((tpos / 75) % 60));
+ sub[5] = itob((byte)(tpos % 75));
+ }
+
+ // MSF2 [7-9]
+ sub[7] = itob((byte)(sector / 60 / 75));
+ sub[8] = itob((byte)((sector / 75) % 60));
+ sub[9] = itob((byte)(sector % 75));
+
+ // CRC-16 [10-11]
+ ushort crc = CRC16.Calculate(sub, 0, 10);
+ byte[] crcBytes = BitConverter.GetBytes(crc);
+ sub[10] = crcBytes[0];
+ sub[11] = crcBytes[1];
+
+ // TODO: This *was* a memcmp, but that's harder to do. Fix this for C# later
+ if (buffer[10] != sub[10] && buffer[11] != sub[11] && (buffer[3] != sub[3] || buffer[4] != sub[4] || buffer[5] != sub[5] || buffer[7] != sub[7] || buffer[8] != sub[8] || buffer[9] != sub[9]))
+ {
+ if (buffer[3] != sub[3] || buffer[4] != sub[4] || buffer[5] != sub[5] || buffer[7] != sub[7] || buffer[8] != sub[8] || buffer[9] != sub[9] || buffer[10] != sub[10] || buffer[11] != sub[11])
+ {
+ Console.Write($"MSF: {sub[7]:x}:{sub[8]:x}:{sub[9]:x} Q-Data: {buffer[0]:x}{buffer[1]:x}{buffer[2]:x} {buffer[3]:x}:{buffer[4]:x}:{buffer[5]:x} {buffer[6]:x} {buffer[7]:x}:{buffer[8]:x}:{buffer[9]:x} {buffer[10]:x}{buffer[11]:x} xor {crc ^ ((buffer[10] << 8) + buffer[11]):x} % {CRC16.Calculate(buffer, 0, 10) ^ ((buffer[10] << 8) + buffer[11]):x}");
+ //Console.Write($"\nMSF: {sub[7]:x}:{sub[8]:x}:{sub[9]:x} Q-Data: {sub[0]:x}{sub[1]:x}{sub[2]:x} {sub[3]:x}:{sub[4]:x}:{sub[5]:x} {sub[6]:x} {sub[7]:x}:{sub[8]:x}:{sub[9]:x} {sub[10]:x}{sub[11]:x}");
+ if (buffer[3] != sub[3] && buffer[7] != sub[7] && buffer[4] == sub[4] && buffer[8] == sub[8] && buffer[5] == sub[5] && buffer[9] == sub[9])
+ Console.Write($" P1 xor {buffer[3] ^ sub[3]:x} {buffer[7] ^ sub[7]:x}");
+ else if (buffer[3] == sub[3] && buffer[7] == sub[7] && buffer[4] != sub[4] && buffer[8] != sub[8] && buffer[5] == sub[5] && buffer[9] == sub[9])
+ Console.Write($" P2 xor {buffer[4] ^ sub[4]:x} {buffer[8] ^ sub[8]:x}");
+ else if (buffer[3] == sub[3] && buffer[7] == sub[7] && buffer[4] == sub[4] && buffer[8] == sub[8] && buffer[5] != sub[5] && buffer[9] != sub[9])
+ Console.Write($" P3 xor {buffer[5] ^ sub[5]:x} {buffer[9] ^ sub[9]:x}");
+ else
+ Console.Write(" ?");
+
+ Console.Write("\n");
+ modifiedSectors++;
+ }
+ }
+ }
+
+ Console.WriteLine($"Number of modified sectors: {modifiedSectors}");
+ return modifiedSectors != 0;
+ }
+
+ private static byte btoi(byte b)
+ {
+ /* BCD to u_char */
+ return (byte)((b) / 16 * 10 + (b) % 16);
+ }
+
+ private static byte itob(byte i)
+ {
+ /* u_char to BCD */
+ return (byte)((i) / 10 * 16 + (i) % 10);
+ }
+ }
+}
diff --git a/DICUI.Library/DiscImageCreator/Parameters.cs b/DICUI.Library/DiscImageCreator/Parameters.cs
index 1e7993ef..317fe9cf 100644
--- a/DICUI.Library/DiscImageCreator/Parameters.cs
+++ b/DICUI.Library/DiscImageCreator/Parameters.cs
@@ -2433,7 +2433,7 @@ namespace DICUI.DiscImageCreator
if (!File.Exists(sub))
return null;
- return LibCrypt.CheckSubfile(sub);
+ return DICUI.DiscImageCreator.LibCrypt.CheckSubfile(sub);
}
///