From af02ab076f58d4fdc0fb386531e2e37b26808a35 Mon Sep 17 00:00:00 2001
From: HeroponRikiBestest <jojloj3@gmail.com>
Date: Mon, 29 Dec 2025 19:29:40 -0800
Subject: [PATCH 1/2] minor starforce fix

---
 BinaryObjectScanner/Protection/StarForce.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/BinaryObjectScanner/Protection/StarForce.cs b/BinaryObjectScanner/Protection/StarForce.cs
index 30b06353..efd64393 100644
--- a/BinaryObjectScanner/Protection/StarForce.cs
+++ b/BinaryObjectScanner/Protection/StarForce.cs
@@ -45,11 +45,13 @@ public class StarForce : IDiskImageCheck<ISO9660>, IExecutableCheck<PortableExec
 
                 // Thus far, the StarForce Keyless key is always made up of a number of characters, all either capital letters or
                 // numbers, sometimes with dashes in between. Thus far, 4 formats have been observed:
+                // 24 characters has been observed on one single disc (RID 68149). Maybe one is a space?
                 // XXXXXXXXXXXXXXXXXXXXXXXXX (25 characters)
                 // XXXXX-XXXXX-XXXXX-XXXXX-XXXXX (25 characters, plus 4 dashes seperating 5 groups of 5)
                 // XXXXXXXXXXXXXXXXXXXXXXXXXXXX (28 characters)
                 // XXXX-XXXXXX-XXXXXX-XXXXXX-XXXXXX (28 characters, with 4 dashes)
-                if (Regex.IsMatch(dataPreparerIdentiferString, "^[A-Z0-9]{25}$", RegexOptions.Compiled)
+                if (Regex.IsMatch(dataPreparerIdentiferString, "^[A-Z0-9]{24}$", RegexOptions.Compiled)
+                    || Regex.IsMatch(dataPreparerIdentiferString, "^[A-Z0-9]{25}$", RegexOptions.Compiled)
                     || Regex.IsMatch(dataPreparerIdentiferString, "^[A-Z0-9]{5}-[A-Z0-9]{5}-[A-Z0-9]{5}-[A-Z0-9]{5}-[A-Z0-9]{5}$", RegexOptions.Compiled)
                     || Regex.IsMatch(dataPreparerIdentiferString, "^[A-Z0-9]{28}$", RegexOptions.Compiled)
                     || Regex.IsMatch(dataPreparerIdentiferString, "^[A-Z0-9]{4}-[A-Z0-9]{6}-[A-Z0-9]{6}-[A-Z0-9]{6}-[A-Z0-9]{6}$", RegexOptions.Compiled))

From a9f69991a20a1f38bb6677d24176e98bcfe78585 Mon Sep 17 00:00:00 2001
From: HeroponRikiBestest <jojloj3@gmail.com>
Date: Mon, 29 Dec 2025 19:56:20 -0800
Subject: [PATCH 2/2] combine regex checks

---
 BinaryObjectScanner/Protection/StarForce.cs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/BinaryObjectScanner/Protection/StarForce.cs b/BinaryObjectScanner/Protection/StarForce.cs
index efd64393..2eedd0a3 100644
--- a/BinaryObjectScanner/Protection/StarForce.cs
+++ b/BinaryObjectScanner/Protection/StarForce.cs
@@ -50,8 +50,7 @@ public class StarForce : IDiskImageCheck<ISO9660>, IExecutableCheck<PortableExec
                 // XXXXX-XXXXX-XXXXX-XXXXX-XXXXX (25 characters, plus 4 dashes seperating 5 groups of 5)
                 // XXXXXXXXXXXXXXXXXXXXXXXXXXXX (28 characters)
                 // XXXX-XXXXXX-XXXXXX-XXXXXX-XXXXXX (28 characters, with 4 dashes)
-                if (Regex.IsMatch(dataPreparerIdentiferString, "^[A-Z0-9]{24}$", RegexOptions.Compiled)
-                    || Regex.IsMatch(dataPreparerIdentiferString, "^[A-Z0-9]{25}$", RegexOptions.Compiled)
+                if (Regex.IsMatch(dataPreparerIdentiferString, "^[A-Z0-9]{24,25}$", RegexOptions.Compiled)
                     || Regex.IsMatch(dataPreparerIdentiferString, "^[A-Z0-9]{5}-[A-Z0-9]{5}-[A-Z0-9]{5}-[A-Z0-9]{5}-[A-Z0-9]{5}$", RegexOptions.Compiled)
                     || Regex.IsMatch(dataPreparerIdentiferString, "^[A-Z0-9]{28}$", RegexOptions.Compiled)
                     || Regex.IsMatch(dataPreparerIdentiferString, "^[A-Z0-9]{4}-[A-Z0-9]{6}-[A-Z0-9]{6}-[A-Z0-9]{6}-[A-Z0-9]{6}$", RegexOptions.Compiled))