Merge branch 'UMSKT:master' into master

.github/workflows/freebsd.yml

@@ -24,18 +24,22 @@
   push:
     branches: [ "*" ]
     paths-ignore: [ '**.md', 'doc/**', '.idea/**'] # If only these files are edited, skip
+  pull_request:
+    branches: [ "*" ]
+    paths-ignore: [ '**.md', 'doc/**', '.idea/**'] # If only these files are edited, skip
+
   workflow_dispatch:
   
  jobs: 
    build: 
-     runs-on: macos-latest
+     runs-on: ubuntu-latest
      name: build-x86_64 
      steps: 
      - uses: actions/checkout@v3 
   
      - name: Build & Test in FreeBSD 
        id: test 
-       uses: vmactions/freebsd-vm@v0 
+       uses: vmactions/freebsd-vm@v1 
        with: 
          envs: 'MYTOKEN MYTOKEN2' 
          usesh: true 

.github/workflows/windows.yml

@@ -52,11 +52,36 @@ jobs:
               exit 1
           }
 
-      - name: Download And Install 32-bit OpenSSL 3.1.4
+      - name: Download And Install 32-bit OpenSSL
         run: |
           $installDir = "$Env:ProgramFiles\OpenSSL"
-          $installerURL = "https://slproweb.com/download/Win32OpenSSL-3_1_4.exe"
-          $installerName = "Win32OpenSSL-3_1_4.exe"
+          # Define the URL for the JSON file containing the hashes
+          $jsonUrl = "https://raw.githubusercontent.com/slproweb/opensslhashes/master/win32_openssl_hashes.json"
+          
+          # Download the JSON data
+          $jsonData = Invoke-RestMethod -Uri $jsonUrl
+          
+          # Initialize variables for the latest version and URL
+          $latestVersion = "0.0.0"
+          $latestUrl = ""
+            
+          # Iterate through the files to find the latest 3.1.x version
+          foreach ($file in $jsonData.files.PSObject.Properties) {
+              $details = $file.Value
+              if ($details.basever -like "3.1*" -and $file.Name -like "Win32OpenSSL*") {
+                    if ([version]$details.basever -gt [version]$latestVersion) {
+                      $latestVersion = $details.basever
+                      $latestUrl = $details.url
+                   }
+              }
+          }
+
+          # Output the latest version and URL
+          Write-Output "Latest OpenSSL Win32 3.1.x version: $latestVersion"
+          Write-Output "Download link: $latestUrl"
+
+          $installerURL = $latestURL
+          $installerName = "Win32OpenSSL.exe"
           $installerPath = Join-Path -Path "${env:Temp}" -ChildPath "$installerName"
 
           (New-Object System.Net.WebClient).DownloadFile($installerURL, $installerPath)
@@ -112,11 +137,36 @@ jobs:
               exit 1
           }
     
-      - name: Download And Install 64-bit OpenSSL 3.1.4
+      - name: Download And Install 64-bit OpenSSL
         run: |
           $installDir = "$Env:ProgramFiles\OpenSSL"
-          $installerURL = "https://slproweb.com/download/Win64OpenSSL-3_1_4.exe"
-          $installerName = "Win64OpenSSL-3_1_4.exe"
+          # Define the URL for the JSON file containing the hashes
+          $jsonUrl = "https://raw.githubusercontent.com/slproweb/opensslhashes/master/win32_openssl_hashes.json"
+          
+          # Download the JSON data
+          $jsonData = Invoke-RestMethod -Uri $jsonUrl
+          
+          # Initialize variables for the latest version and URL
+          $latestVersion = "0.0.0"
+          $latestUrl = ""
+            
+          # Iterate through the files to find the latest 3.1.x version
+          foreach ($file in $jsonData.files.PSObject.Properties) {
+              $details = $file.Value
+              if ($details.basever -like "3.1*" -and $file.Name -like "Win64OpenSSL*") {
+                    if ([version]$details.basever -gt [version]$latestVersion) {
+                      $latestVersion = $details.basever
+                      $latestUrl = $details.url
+                   }
+              }
+          }
+
+          # Output the latest version and URL
+          Write-Output "Latest OpenSSL Win64 3.1.x version: $latestVersion"
+          Write-Output "Download link: $latestUrl"
+
+          $installerURL = $latestURL
+          $installerName = "Win64OpenSSL.exe"
           $installerPath = Join-Path -Path "${env:Temp}" -ChildPath "$installerName"
 
           (New-Object System.Net.WebClient).DownloadFile($installerURL, $installerPath)

README.md

@@ -4,7 +4,7 @@
 
 [![Zulip chat](https://img.shields.io/badge/zulip-join_chat-brightgreen.svg)](https://umskt.zulipchat.com)
 [![libera.chat - #mspid](https://img.shields.io/badge/libera.chat-%23mspid-brightgreen)](https://web.libera.chat/gamja/?nick=Guest?#mspid)
-[![Discord](https://dcbadge.vercel.app/api/server/cUZxfNNSdt?style=flat)](https://umskt-invite.glitch.me/)
+[![Discord](https://dcbadge.vercel.app/api/server/cUZxfNNSdt?style=flat)](https://discord.gg/PpBSpuphWM)
 
 **Build status**
 
@@ -51,13 +51,12 @@ In light of the recent exponential interest in this project I've decided to put
     * Download the latest experimental version using the Actions tab ([Windows](../../actions/workflows/windows.yml?query=branch%3Amaster+is%3Asuccess), [Linux](../../actions/workflows/linux.yml?query=branch%3Amaster+is%3Asuccess), [macOS](../../actions/workflows/macos.yml?query=branch%3Amaster+is%3Asuccess), [FreeBSD](../../actions/workflows/freebsd.yml?query=branch%3Amaster+is%3Asuccess), [DOS DJGPP](../../actions/workflows/dos-djgpp.yml?query=branch%3Amaster+is%3Asuccess))
 
 
-* ~~*(GitHub account \*not\* required)*~~
-    * ~~Download the latest release for your operating system and architecture from [the releases page](../../releases)~~
-    * No official releases right now, use the other method to get the latest version.
+* *(GitHub account \*not\* required)*
+    * Download the latest release for your operating system and architecture from [the releases page](../../releases)
 
 * **Note:** Before continuing, please ensure you have the `umskt` executable extracted and on UNIX-like systems, have execution permissions (`chmod +x umskt`).
 
-#### 2. Install OpenSSL 3.1.2. 
+#### 2. Install OpenSSL. 
 For Windows, click [here](https://slproweb.com/products/Win32OpenSSL.html) and choose the right version. For other operating systems, consult your package manager.
 *Note: This only applies if the build you download has OpenSSL embedded (static library) or not. You can usually tell if the download size is measured in KB or MB. If it's MB, you don't need this.*
 

keys.json

@@ -147,6 +147,9 @@
     "Office 2007 Standard / Professional / Ultimate / Enterprise": {
       "BINK": ["82", "83"]
     },
+    "Office 2007 OEM (2007 MS Office system)": {
+      "BINK": ["84"]
+    },
     "Office 2007 Home & Student": {
       "BINK": ["88", "89"]
     }

src/cli.cpp

@@ -71,6 +71,7 @@ void CLI::showHelp(char *argv[]) {
     fmt::print("\t-u --upgrade\tspecifies the Product Key will be an \"Upgrade\" version\n");
     fmt::print("\t-V --validate\tproduct key to validate signature\n");
     fmt::print("\t-N --nonewlines\tdisables newlines (for easier embedding in other apps)\n");
+    fmt::print("\t-o --override\tDisables version check for confirmation ID's, if you need this send an issue on GitHub");
     fmt::print("\n");
 }
 
@@ -92,6 +93,7 @@ int CLI::parseCommandLine(int argc, char* argv[], Options* options) {
             false,
             false,
 	    false,
+	    false,
             MODE_BINK1998_GENERATE,
             WINDOWS
     };
@@ -210,6 +212,8 @@ int CLI::parseCommandLine(int argc, char* argv[], Options* options) {
 		
 	} else if (arg == "-N" || arg == "--nonewlines") {
 	    options->nonewlines = true;
+	} else if (arg == "-o" || arg == "--override") {
+	    options->overrideVersion = true;
 	} else {
             options->error = true;
         }
@@ -559,7 +563,7 @@ int CLI::BINK2002Validate() {
 
 int CLI::ConfirmationID() {
     char confirmation_id[49];
-    int err = ConfirmationID::Generate(this->options.instid.c_str(), confirmation_id, options.activationMode, options.productid);
+    int err = ConfirmationID::Generate(this->options.instid.c_str(), confirmation_id, options.activationMode, options.productid, options.overrideVersion);
 
     switch (err) {
         case ERR_TOO_SHORT:

src/cli.h

@@ -68,6 +68,7 @@ struct Options {
     bool error;
     bool list;
     bool nonewlines;
+    bool overrideVersion;
 
     MODE applicationMode;
     ACTIVATION_ALGORITHM activationMode;

src/libumskt/confid/confid.cpp

@@ -773,7 +773,7 @@ void ConfirmationID::Unmix(unsigned char* buffer, size_t bufSize, const unsigned
 	}
 }
 
-int ConfirmationID::Generate(const char* installation_id_str, char confirmation_id[49], int mode, std::string productid)
+int ConfirmationID::Generate(const char* installation_id_str, char confirmation_id[49], int mode, std::string productid, bool overrideVersion)
 {
 	int version;
 	unsigned char hardwareID[8];
@@ -870,7 +870,7 @@ int ConfirmationID::Generate(const char* installation_id_str, char confirmation_
 			iid_key[3] = 0xF3;
 	}
 	Unmix(installation_id, totalCount == 41 ? 17 : 19, iid_key, 4);
-	if (installation_id[18] >= 0x10)
+	if (installation_id[18] >= 0x10 && overrideVersion == false)
 		return ERR_UNKNOWN_VERSION;
 
 #pragma pack(push, 1)
@@ -891,31 +891,37 @@ int ConfirmationID::Generate(const char* installation_id_str, char confirmation_
 			productID[2] = (parsed.ProductIDLow >> 27) & ((1 << 24) - 1);
 			version    = (parsed.ProductIDLow >> 51) & 15;
 			productID[3] = (parsed.ProductIDLow >> 55) | (parsed.ProductIDHigh << 9);
-			switch (activationMode) {
-				case 0:
-					if (version != (totalCount == 41 ? 9 : 10))
-						return ERR_UNKNOWN_VERSION;
-					break;
-				case 1:
-					if (version != 1)
-						return ERR_UNKNOWN_VERSION;
-					break;
-				case 3:
-					if (version != 4)
-						return ERR_UNKNOWN_VERSION;
+			if (overrideVersion == false) {
+			        switch (activationMode) {
+					case 0:
+						if (version != (totalCount == 41 ? 9 : 10))
+							return ERR_UNKNOWN_VERSION;
+						break;
+					case 1:
+						if (version != 1)
+							return ERR_UNKNOWN_VERSION;
+						break;
+					case 3:
+						if (version != 4)
+							return ERR_UNKNOWN_VERSION;
+				}
 			}
+
 			break;
 		case 2:
 		case 3:
 			decode_iid_new_version(installation_id, hardwareID, &version);
-			switch (activationMode) {
-				case 2:
-					if (version != 3)
-						return ERR_UNKNOWN_VERSION;
-					break;
-				case 3:
+			if (overrideVersion == false) {
+			    switch (activationMode) {
+			    	case 2:
+			    		if (version != 3)
+				    		return ERR_UNKNOWN_VERSION;
+			    		break;
+		                case 3:
 					if (version != 4)
 						return ERR_UNKNOWN_VERSION;
+				        break;
+			    }
 			}
 			memcpy(&parsed, hardwareID, 8);
 			productID[0] = stoi(productid.substr(0,5));

src/libumskt/confid/confid.h

@@ -66,7 +66,7 @@ EXPORT class ConfirmationID {
     static void Unmix(unsigned char* buffer, size_t bufSize, const unsigned char* key, size_t keySize);
 
 public:
-    static int Generate(const char* installation_id_str, char confirmation_id[49], int mode, std::string productid);
+    static int Generate(const char* installation_id_str, char confirmation_id[49], int mode, std::string productid, bool overrideVersion);
     //EXPORT static int CLIRun();
 };
 

src/libumskt/libumskt.cpp

@@ -27,8 +27,8 @@
 #include "pidgen3/BINK2002.h"
 #include "pidgen2/PIDGEN2.h"
 
-FNEXPORT int ConfirmationID_Generate(const char* installation_id_str, char confirmation_id[49], int mode, std::string productid) {
-    return ConfirmationID::Generate(installation_id_str, confirmation_id, mode, productid);
+FNEXPORT int ConfirmationID_Generate(const char* installation_id_str, char confirmation_id[49], int mode, std::string productid, bool bypassVersion) {
+    return ConfirmationID::Generate(installation_id_str, confirmation_id, mode, productid, bypassVersion);
 }
 
 FNEXPORT EC_GROUP* PIDGEN3_initializeEllipticCurve(char* pSel, char* aSel, char* bSel, char* generatorXSel, char* generatorYSel, char* publicKeyXSel, char* publicKeyYSel, EC_POINT *&genPoint, EC_POINT *&pubPoint) {