Update copyright

BurnOutSharp/BurnOutSharp.nuspec

@@ -2,7 +2,7 @@
 <package >
   <metadata>
     <id>BurnOutSharp</id>
-    <version>1.03.8.1</version>
+    <version>1.03.9.0</version>
     <title>BurnOutSharp</title>
     <authors>Matt Nadareski, Gernot Knippen</authors>
     <owners>Matt Nadareski, Gernot Knippen</owners>
@@ -10,7 +10,7 @@
     <projectUrl>https://github.com/mnadareski/BurnOutSharp</projectUrl>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <description>Port of BurnOut to C#, with additions</description>
-    <copyright>Copyright (c)2005-2010 Gernot Knippen, Copyright (c)2018-2019 Matt Nadareski</copyright>
+    <copyright>Copyright (c)2005-2010 Gernot Knippen, Copyright (c)2018-2020 Matt Nadareski</copyright>
     <tags>protection scan burnout</tags>
     <dependencies>
       <dependency id="LessIO" version="0.5.0" />

BurnOutSharp/EVORE.cs

@@ -37,7 +37,7 @@ namespace BurnOutSharp
 
         private static Process StartSafe(string file)
         {
-            if (file == null)
+            if (file == null || !File.Exists(file))
                 return null;
 
             Process startingprocess = new Process();
@@ -59,7 +59,7 @@ namespace BurnOutSharp
 
         private static string MakeTempFile(string file, string sExtension = ".exe")
         {
-            if (file == null)
+            if (file == null || !File.Exists(file))
                 return string.Empty;
 
             FileInfo filei = new FileInfo(file);
@@ -75,7 +75,7 @@ namespace BurnOutSharp
 
         private static bool IsEXE(string file)
         {
-            if (file == null)
+            if (file == null || !File.Exists(file))
                 return false;
 
             BinaryReader breader = new BinaryReader(File.OpenRead(file));
@@ -199,7 +199,7 @@ namespace BurnOutSharp
 
         public static string SearchProtectDiscVersion(string file)
         {
-            if (file == null)
+            if (file == null || !File.Exists(file))
                 return string.Empty;
 
             Process exe = new Process();
@@ -357,7 +357,7 @@ namespace BurnOutSharp
 
         public static string SearchSafeDiscVersion(string file)
         {
-            if (file == null)
+            if (file == null || !File.Exists(file))
                 return string.Empty;
 
             Process exe = new Process();

BurnOutSharp/External/psxt001z/CRC16.cs

@@ -0,0 +1,53 @@
+namespace BurnOutSharp.External.psxt001z
+{
+    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);
+        }
+    }
+}

BurnOutSharp/External/psxt001z/LibCrypt.cs

@@ -0,0 +1,139 @@
+using System;
+using System.IO;
+
+namespace BurnOutSharp.External.psxt001z
+{
+	/// <summary>
+	/// LibCrypt detection code
+	/// Originally written by Dremora: https://github.com/Dremora/psxt001z
+	/// Ported and changed by darksabre76
+	/// </summary>
+	public class LibCrypt
+    {
+        public static bool CheckSubfile(string subFilePath)
+        {
+			// opening .sub
+			FileStream subfile;
+			try
+			{
+				subfile = File.OpenRead(subFilePath);
+			}
+			catch
+			{
+				Console.WriteLine($"Error opening {subFilePath}");
+				return false;
+			}
+
+			// checking extension
+			string ext = Path.GetExtension(subFilePath).TrimStart('.').ToLowerInvariant();
+			if (ext != "sub")
+			{
+				Console.WriteLine($"{ext}: unknown file extension");
+				return false;
+			}
+			
+			// filesize
+			long size = subfile.Length;
+			if (size % 96 != 0)
+			{
+				Console.WriteLine($"{subFilePath}: wrong size");
+				return false;
+			}
+
+			return CheckSubfile(subfile);
+		}
+
+		public static bool CheckSubfile(Stream subfile)
+		{
+			// Variables
+			byte[] buffer = new byte[16];
+			byte[] sub = new byte[16];
+			int tpos = 0;
+			uint sector, psectors = 0;
+			long size = subfile.Length;
+
+			for (sector = 150; sector < ((size / 96) + 150); sector++)
+			{
+				subfile.Seek(12, SeekOrigin.Current);
+				if (subfile.Read(buffer, 0, 12) == 0)
+					return true;
+
+				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[7] != sub[7] || buffer[4] != sub[4] || buffer[8] != sub[8] || buffer[5] != sub[5] || buffer[9] != sub[9]))
+				{
+					if (buffer[10] != sub[10] || buffer[11] != sub[11] || 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($"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: %02x:%02x:%02x Q-Data: %02x%02x%02x %02x:%02x:%02x %02x %02x:%02x:%02x %02x%02x", sub[7], sub[8], sub[9], sub[0], sub[1], sub[2], sub[3], sub[4], sub[5], sub[6], sub[7], sub[8], sub[9], sub[10], sub[11]);
+						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");
+						psectors++;
+					}
+				}
+			}
+
+			Console.WriteLine($"Number of modified sectors: {psectors}");
+			return true;
+		}
+
+		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);
+		}
+	}
+}

BurnOutSharp/Properties/AssemblyInfo.cs

@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.03.7.1")]
-[assembly: AssemblyFileVersion("1.03.7.1")]
+[assembly: AssemblyVersion("1.03.9.0")]
+[assembly: AssemblyFileVersion("1.03.9.0")]

BurnOutSharp/ProtectionFind.cs

@@ -380,8 +380,11 @@ namespace BurnOutSharp
 
             #region Executable Content Checks
 
-            // Windows Executable and DLL
-            if (magic.StartsWith("MZ"))
+            if (magic.StartsWith("MZ") // Windows Executable and DLL
+                || magic.StartsWith((char)0x7f + "ELF") // Unix binaries
+                || magic.StartsWith("" + (char)0xfe + (char)0xed + (char)0xfa + (char)0xce) // Macintosh
+                || magic.StartsWith("" + (char)0xce + (char)0xfa + (char)0xed + (char)0xfe) // Macintosh
+                || magic.StartsWith("Joy!peff")) // Macintosh
             {
                 try
                 {

BurnOutSharp/ProtectionType/CDCops.cs

@@ -49,7 +49,7 @@ namespace BurnOutSharp.ProtectionType
 
         private static string GetVersion(string file, int position)
         {
-            if (file == null)
+            if (file == null || !File.Exists(file))
                 return string.Empty;
 
             using (var fs = File.Open(file, FileMode.Open, FileAccess.Read, FileShare.ReadWrite))

BurnOutSharp/ProtectionType/DVDCops.cs

@@ -15,7 +15,7 @@ namespace BurnOutSharp.ProtectionType
 
         private static string GetVersion(string file, int position)
         {
-            if (file == null)
+            if (file == null || !File.Exists(file))
                 return string.Empty;
 
             using (var fs = File.Open(file, FileMode.Open, FileAccess.Read, FileShare.ReadWrite))

BurnOutSharp/ProtectionType/InnoSetup.cs

@@ -17,7 +17,7 @@ namespace BurnOutSharp.ProtectionType
 
         private static string GetVersion(string file)
         {
-            if (file == null)
+            if (file == null || !File.Exists(file))
                 return string.Empty;
 
             using (var fs = File.Open(file, FileMode.Open, FileAccess.Read, FileShare.ReadWrite))

BurnOutSharp/ProtectionType/JoWooDXProt.cs

@@ -27,7 +27,7 @@ namespace BurnOutSharp.ProtectionType
 
         private static string GetVersion(string file, int position)
         {
-            if (file == null)
+            if (file == null || !File.Exists(file))
                 return string.Empty;
 
             using (var fs = File.Open(file, FileMode.Open, FileAccess.Read, FileShare.ReadWrite))

BurnOutSharp/ProtectionType/ProtectDisc.cs

@@ -41,7 +41,7 @@ namespace BurnOutSharp.ProtectionType
 
         private static string GetVersionBuild6till8(string file, int position)
         {
-            if (file == null)
+            if (file == null || !File.Exists(file))
                 return string.Empty;
 
             using (var fs = File.Open(file, FileMode.Open, FileAccess.Read, FileShare.ReadWrite))
@@ -93,7 +93,7 @@ namespace BurnOutSharp.ProtectionType
         private static string GetVersionBuild76till10(string file, int position, out int irefBuild)
         {
             irefBuild = 0;
-            if (file == null)
+            if (file == null || !File.Exists(file))
                 return string.Empty;
 
             using (var fs = File.Open(file, FileMode.Open, FileAccess.Read, FileShare.ReadWrite))

BurnOutSharp/ProtectionType/SafeDisc.cs

@@ -39,15 +39,22 @@ namespace BurnOutSharp.ProtectionType
                 // TODO: These are all cop-outs that don't check the existence of the other files
                 if (files.Count(f => Path.GetFileName(f).Equals("DPLAYERX.DLL", StringComparison.OrdinalIgnoreCase)) > 0)
                 {
-                    return GetDPlayerXVersion(path);
+                    string file = files.First(f => Path.GetFileName(f).Equals("DPLAYERX.DLL", StringComparison.OrdinalIgnoreCase));
+                    return GetDPlayerXVersion(file);
                 }
                 else if (files.Count(f => Path.GetFileName(f).Equals("drvmgt.dll", StringComparison.OrdinalIgnoreCase)) > 0)
                 {
-                    return GetDrvmgtVersion(path);
+                    string file = files.First(f => Path.GetFileName(f).Equals("drvmgt.dll", StringComparison.OrdinalIgnoreCase));
+                    return GetDrvmgtVersion(file);
                 }
                 else if (files.Count(f => Path.GetFileName(f).Equals("secdrv.sys", StringComparison.OrdinalIgnoreCase)) > 0)
                 {
-                    return GetSecdrvVersion(path);
+                    string file = files.First(f => Path.GetFileName(f).Equals("secdrv.sys", StringComparison.OrdinalIgnoreCase));
+                    return GetSecdrvVersion(file);
+                }
+                else if (path.EndsWith(".SafeDiscDVD.bundle", StringComparison.OrdinalIgnoreCase))
+                {
+                    return "SafeDisc for Macintosh";
                 }
             }
             else
@@ -97,7 +104,7 @@ namespace BurnOutSharp.ProtectionType
 
         private static string GetDPlayerXVersion(string file)
         {
-            if (file == null)
+            if (file == null || !File.Exists(file))
                 return string.Empty;
 
             FileInfo fi = new FileInfo(file);
@@ -125,7 +132,7 @@ namespace BurnOutSharp.ProtectionType
 
         private static string GetDrvmgtVersion(string file)
         {
-            if (file == null)
+            if (file == null || !File.Exists(file))
                 return string.Empty;
 
             FileInfo fi = new FileInfo(file);
@@ -153,7 +160,7 @@ namespace BurnOutSharp.ProtectionType
 
         private static string GetSecdrvVersion(string file)
         {
-            if (file == null)
+            if (file == null || !File.Exists(file))
                 return string.Empty;
 
             FileInfo fi = new FileInfo(file);
@@ -187,7 +194,7 @@ namespace BurnOutSharp.ProtectionType
 
         private static string GetVersion(string file, int position)
         {
-            if (file == null)
+            if (file == null || !File.Exists(file))
                 return string.Empty;
 
             using (var fs = File.Open(file, FileMode.Open, FileAccess.Read, FileShare.ReadWrite))

BurnOutSharp/ProtectionType/SecuROM.cs

@@ -80,7 +80,7 @@ namespace BurnOutSharp.ProtectionType
 
         private static string GetV4Version(string file, int position)
         {
-            if (file == null)
+            if (file == null || !File.Exists(file))
                 return string.Empty;
 
             using (var fs = File.Open(file, FileMode.Open, FileAccess.Read, FileShare.ReadWrite))
@@ -106,7 +106,7 @@ namespace BurnOutSharp.ProtectionType
 
         private static string GetV5Version(string file, int position)
         {
-            if (file == null)
+            if (file == null || !File.Exists(file))
                 return string.Empty;
 
             using (var fs = File.Open(file, FileMode.Open, FileAccess.Read, FileShare.ReadWrite))
@@ -135,7 +135,7 @@ namespace BurnOutSharp.ProtectionType
 
         private static string GetV7Version(string file)
         {
-            if (file == null)
+            if (file == null || !File.Exists(file))
                 return string.Empty;
 
             using (var fs = File.Open(file, FileMode.Open, FileAccess.Read, FileShare.ReadWrite))

BurnOutSharp/ProtectionType/SolidShield.cs

@@ -131,7 +131,7 @@ namespace BurnOutSharp.ProtectionType
 
         private static string GetVersion(string file, int position)
         {
-            if (file == null)
+            if (file == null || !File.Exists(file))
                 return string.Empty;
 
             using (var fs = File.Open(file, FileMode.Open, FileAccess.Read, FileShare.ReadWrite))

BurnOutSharp/ProtectionType/Sysiphus.cs

@@ -18,7 +18,7 @@ namespace BurnOutSharp.ProtectionType
 
         private static string GetVersion(string file, int position)
         {
-            if (file == null)
+            if (file == null || !File.Exists(file))
                 return string.Empty;
 
             using (var fs = File.Open(file, FileMode.Open, FileAccess.Read, FileShare.ReadWrite))

BurnOutSharp/ProtectionType/Tages.cs

@@ -80,7 +80,7 @@ namespace BurnOutSharp.ProtectionType
 
         private static string GetVersion(string file, int position)
         {
-            if (file == null)
+            if (file == null || !File.Exists(file))
                 return string.Empty;
 
             using (var fs = File.Open(file, FileMode.Open, FileAccess.Read, FileShare.ReadWrite))

BurnOutSharp/ProtectionType/VOBProtectCDDVD.cs

@@ -58,7 +58,7 @@ namespace BurnOutSharp.ProtectionType
 
         private static string GetBuild(string file, int position)
         {
-            if (file == null)
+            if (file == null || !File.Exists(file))
                 return string.Empty;
 
             using (var fs = File.Open(file, FileMode.Open, FileAccess.Read, FileShare.ReadWrite))
@@ -76,7 +76,7 @@ namespace BurnOutSharp.ProtectionType
 
         private static string GetOldVersion(string file, int position)
         {
-            if (file == null)
+            if (file == null || !File.Exists(file))
                 return string.Empty;
 
             using (var fs = File.Open(file, FileMode.Open, FileAccess.Read, FileShare.ReadWrite))
@@ -98,7 +98,7 @@ namespace BurnOutSharp.ProtectionType
 
         private static string GetVersion(string file, int position)
         {
-            if (file == null)
+            if (file == null || !File.Exists(file))
                 return string.Empty;
 
             using (var fs = File.Open(file, FileMode.Open, FileAccess.Read, FileShare.ReadWrite))

BurnOutSharp/Utilities.cs

@@ -14,7 +14,7 @@ namespace BurnOutSharp
         /// </summary>
         public static string GetFileVersion(string file)
         {
-            if (file == null)
+            if (file == null || !File.Exists(file))
                 return string.Empty;
 
             FileVersionInfo fvinfo = FileVersionInfo.GetVersionInfo(file);

README.md

@@ -41,6 +41,7 @@ Below is a list of the protections that can be detected using this code:
 - JoWooD X-Prot (v1/v2)
 - Key2Audio XS
 - Key-Lock (Dongle)
+- LibCrypt (Separate subfile scan only)
 - LaserLock
 - MediaCloQ
 - MediaMax CD3