Merge pull request #116 from UMSKT/disable-freebsd

Disable automatic FreeBSD GH action
Disable FreeBSD GH action
2025-06-12 08:34:16 +03:00 · 2025-04-13 21:14:58 -04:00 · 2025-04-13 19:52:53 -04:00 · 2025-04-13 19:09:02 -04:00 · 2025-04-13 17:50:24 -04:00 · 2025-04-13 17:50:14 -04:00
15 changed files with 660 additions and 160 deletions
--- a/.github/workflows/dos-djgpp.yml
+++ b/.github/workflows/dos-djgpp.yml
@ -22,9 +22,9 @@ name: C/C++ CI (DOS DJGPP)

 on:
  push:
-    branches: [ "master" ]
-  pull_request:
-    branches: [ "master" ]
+    branches: [ "*" ]
+    paths-ignore: [ '**.md', 'doc/**', '.idea/**'] # If only these files are edited, skip
+  workflow_dispatch:

 env:
  CC: ${{ github.workspace }}/djgpp/bin/i586-pc-msdosdjgpp-gcc
@ -37,7 +37,7 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Checkout Source Tree
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4

      - name: Setup build environment
        run: |
@ -81,7 +81,7 @@ jobs:
          mv build/umskt.exe build/actions_upload/

      - name: Upload build artifact
-        uses: actions/upload-artifact@v3.1.2
+        uses: actions/upload-artifact@v4.6.2
        with:
          name: UMSKT-DOS
          path: build/actions_upload
--- a/.github/workflows/freebsd.yml
+++ b/.github/workflows/freebsd.yml
@ -21,21 +21,25 @@
 name: C/C++ CI (FreeBSD) 
  
 on: 
-   push: 
-     branches: [ "master" ] 
-   pull_request: 
-     branches: [ "master" ] 
+  #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 
+     - uses: actions/checkout@v4
  
     - name: Build & Test in FreeBSD 
       id: test 
-       uses: vmactions/freebsd-vm@v0 
+       uses: vmactions/freebsd-vm@v1 
       with: 
         envs: 'MYTOKEN MYTOKEN2' 
         usesh: true 
@ -55,7 +59,7 @@
           mv build/umskt build/actions_upload/umskt 
  
     - name: Upload build artifact 
-       uses: actions/upload-artifact@v3.1.2 
+       uses: actions/upload-artifact@v4.6.2
       with: 
         name: UMSKT-FreeBSD 
         path: build/actions_upload
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@ -22,9 +22,9 @@ name: C/C++ CI (Linux)

 on:
  push:
-    branches: [ "master" ]
-  pull_request:
-    branches: [ "master" ]
+    branches: [ "*" ]
+    paths-ignore: [ '**.md', 'doc/**', '.idea/**'] # If only these files are edited, skip
+  workflow_dispatch:

 jobs:
  build:
@ -37,7 +37,7 @@ jobs:
          - arch: aarch64
    steps:
    - name: Checkout Source Tree
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4

    - name: Setup latest Alpine Linux for ${{ matrix.arch }}
      uses: jirutka/setup-alpine@v1
@ -50,6 +50,7 @@ jobs:
          musl-dev
          openssl-dev
          openssl-libs-static
+          zlib-dev
        arch: ${{ matrix.arch }}
        shell-name: alpine-target.sh

@ -66,7 +67,21 @@ jobs:
          mv build/umskt build/actions_upload/umskt

    - name: Upload build artifact
-      uses: actions/upload-artifact@v3.1.2
+      uses: actions/upload-artifact@v4.6.2
      with:
        name: UMSKT-linux-${{ matrix.arch }}-static
        path: build/actions_upload
+
+    - name: Configure and build static internal deps UMSKT
+      uses: threeal/cmake-action@7ef2eb8da6e5ec0a6de6b1ddc96987080bed06e8
+      with:
+        options: MUSL_STATIC=OFF BUILD_SHARED_LIBS=OFF
+        run-build: true
+        shell: alpine-target.sh {0}
+
+    - name: Configure and build shared deps UMSKT
+      uses: threeal/cmake-action@7ef2eb8da6e5ec0a6de6b1ddc96987080bed06e8
+      with:
+        options: MUSL_STATIC=OFF BUILD_SHARED_LIBS=ON
+        run-build: true
+        shell: alpine-target.sh {0}
--- a/.github/workflows/macos.yml
+++ b/.github/workflows/macos.yml
@ -22,9 +22,9 @@ name: C/C++ CI (macOS)

 on:
  push:
-    branches: [ "master" ]
-  pull_request:
-    branches: [ "master" ]
+    branches: [ "*" ]
+    paths-ignore: [ '**.md', 'doc/**', '.idea/**'] # If only these files are edited, skip
+  workflow_dispatch:

 jobs:
  build-x86:
@ -35,7 +35,7 @@ jobs:
          - arch: x86_64
    steps:
      - name: Checkout Source Tree
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4

      - name: Configure and build UMSKT
        run: |
@ -54,7 +54,7 @@ jobs:
          ./umskt

      - name: Upload build artifact
-        uses: actions/upload-artifact@v3.1.2
+        uses: actions/upload-artifact@v4.6.2
        with:
-          name: UMSKT-macOS-${{ matrix.arch }}-static
+          name: UMSKT-macOS-${{ matrix.arch }}
          path: build/actions_upload
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@ -22,9 +22,9 @@ name: C/C++ CI (Windows)

 on:
  push:
-    branches: [ "master" ]
-  pull_request:
-    branches: [ "master" ]
+    branches: [ "*" ]
+    paths-ignore: [ '**.md', 'doc/**', '.idea/**'] # If only these files are edited, skip
+  workflow_dispatch:

 jobs:
  build-32bit:
@ -52,11 +52,36 @@ jobs:
              exit 1
          }

-      - name: Download And Install 32-bit OpenSSL 3.1.2
+      - name: Download And Install 32-bit OpenSSL
        run: |
          $installDir = "$Env:ProgramFiles\OpenSSL"
-          $installerURL = "https://slproweb.com/download/Win32OpenSSL-3_1_2.exe"
-          $installerName = "Win32OpenSSL-3_1_2.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)
@ -66,7 +91,7 @@ jobs:
          Start-Process -FilePath $installerPath -ArgumentList $installerArgs -Wait -PassThru

      - name: Checkout Source Tree
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4

      - name: Setup MSBuild
        uses: microsoft/setup-msbuild@v1
@ -83,7 +108,7 @@ jobs:
        run: msbuild ALL_BUILD.vcxproj /P:Configuration=Release

      - name: Upload build artifact
-        uses: actions/upload-artifact@v3.1.2
+        uses: actions/upload-artifact@v4.6.2
        with:
          name: UMSKT-Win32
          path: build/Release
@ -112,11 +137,36 @@ jobs:
              exit 1
          }
    
-      - name: Download And Install 64-bit OpenSSL 3.1.2
+      - name: Download And Install 64-bit OpenSSL
        run: |
          $installDir = "$Env:ProgramFiles\OpenSSL"
-          $installerURL = "https://slproweb.com/download/Win64OpenSSL-3_1_2.exe"
-          $installerName = "Win64OpenSSL-3_1_2.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)
@ -126,7 +176,7 @@ jobs:
          Start-Process -FilePath $installerPath -ArgumentList $installerArgs -Wait -PassThru

      - name: Checkout Source Tree
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4

      - name: Setup MSBuild
        uses: microsoft/setup-msbuild@v1
@ -142,7 +192,7 @@ jobs:
        run: msbuild ALL_BUILD.vcxproj /P:Configuration=Release

      - name: Upload build artifact
-        uses: actions/upload-artifact@v3.1.2
+        uses: actions/upload-artifact@v4.6.2
        with:
          name: UMSKT-Win64
          path: build/Release
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -20,9 +20,11 @@

 CMAKE_MINIMUM_REQUIRED(VERSION 3.12)
 PROJECT(UMSKT)
+
 SET(CMAKE_CXX_STANDARD 17)
-SET(CMAKE_POSITION_INDEPENDENT_CODE ON)
 SET(CMAKE_OSX_SYSROOT "macosx" CACHE PATH "macOS SDK path")
+
+OPTION(BUILD_SHARED_LIBS "Build internal libraries as dynamic" OFF)
 OPTION(UMSKT_USE_SHARED_OPENSSL "Force linking against the system-wide OpenSSL library" OFF)
 OPTION(MUSL_STATIC "Enable fully static builds in a muslc environment (i.e. Alpine Linux)" OFF)
 OPTION(DJGPP_WATT32 "Enable compilation and linking with DJGPP/WATT32/OpenSSL" OFF)
@ -31,15 +33,28 @@ OPTION(MSVC_MSDOS_STUB "Specify a custom MS-DOS stub for a 32-bit MSVC compilati
 SET(UMSKT_LINK_LIBS ${UMSKT_LINK_LIBS})
 SET(UMSKT_LINK_DIRS ${UMSKT_LINK_DIRS})

+# macOS does not support static build
+if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+    SET(UMSKT_USE_SHARED_OPENSSL ON)
+endif()
+
+# neither does dos idk i'm trying random stuff
+if (DJGPP_WATT32)
+    SET(UMSKT_USE_SHARED_OPENSSL ON)
+endif()
+
 IF(UMSKT_USE_SHARED_OPENSSL)
    SET(OPENSSL_USE_STATIC_LIBS FALSE)
    SET(OPENSSL_MSVC_STATIC_RT FALSE)
-    MESSAGE(WARNING "[UMSKT] Forcing shared OpenSSL runtime")
+    MESSAGE(STATUS "[UMSKT] Requesting dynamic version of OpenSSL")
 ELSE()
    SET(OPENSSL_USE_STATIC_LIBS TRUE)
    SET(OPENSSL_MSVC_STATIC_RT TRUE)
+    MESSAGE(STATUS "[UMSKT] Requesting static version of OpenSSL")
 ENDIF()

+
+
 IF(DJGPP_WATT32)
    SET(CMAKE_SYSTEM_NAME MSDOS)
    SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
@ -50,23 +65,10 @@ IF(DJGPP_WATT32)
    SET(UMSKT_LINK_DIRS ${UMSKT_LINK_DIRS} ${WATT_ROOT}/lib)
 ENDIF()

-# find the system installed OpenSSL development library
-FIND_PACKAGE(OpenSSL REQUIRED)
-IF(NOT OPENSSL_FOUND)
-    MESSAGE(SEND_ERROR "OpenSSL Development Libraries Not Found")
-    MESSAGE(SEND_ERROR "Please consult your package manager of choice to install the prerequisite")
-    MESSAGE(SEND_ERROR "The package name is commonly called libssl-dev or openssl-dev depending on distribution")
-    MESSAGE(FATAL_ERROR "Can not continue without OpenSSL")
-ENDIF()
-
-# if we found shared libraries - do the following:
-STRING(REGEX MATCH "(\\.so|\\.dll|\\.dylib)$" OPENSSL_CRYPTO_SHARED "${OPENSSL_CRYPTO_LIBRARY}")
-IF(OPENSSL_CRYPTO_SHARED)
-    MESSAGE(STATUS "[UMSKT] Detected Shared library version of OpenSSL")
-    SET(BUILD_SHARED_LIBS ON)
-ELSE()
-    MESSAGE(STATUS "[UMSKT] Detected Static Library version of OpenSSL")
-ENDIF()
+if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+  SET(BUILD_SHARED_LIBS ON)
+  MESSAGE(STATUS "[UMSKT] macOS has no static library - Shared library forced on")
+endif()

 # if we're compiling with MSVC, respect the DEBUG compile option
 IF(MSVC)
@ -86,6 +88,9 @@ ENDIF()

 IF(MUSL_STATIC)
    MESSAGE(STATUS "[UMSKT] Performing a fully static build using muslc")
+    SET(BUILD_SHARED_LIBS OFF)
+    SET(OPENSSL_USE_STATIC_LIBS TRUE)
+
    SET(CMAKE_EXE_LINKER_FLAGS "-static -static-libgcc -static-libstdc++")
    SET(CMAKE_SHARED_LINKER_FLAGS "-static -static-libgcc -static-libstdc++")
    SET(CMAKE_FIND_LIBRARY_SUFFIXES ".a")
@ -93,6 +98,46 @@ IF(MUSL_STATIC)
    SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -static-libgcc -static-libstdc++")
 ENDIF()

+# find the system installed OpenSSL development library
+FIND_PACKAGE(OpenSSL REQUIRED)
+IF(NOT OPENSSL_FOUND)
+    MESSAGE(SEND_ERROR "OpenSSL Development Libraries Not Found")
+    MESSAGE(SEND_ERROR "Please consult your package manager of choice to install the prerequisite")
+    MESSAGE(SEND_ERROR "The package name is commonly called libssl-dev or openssl-dev depending on distribution")
+    MESSAGE(FATAL_ERROR "Can not continue without OpenSSL")
+ENDIF()
+
+IF(NOT MUSL_STATIC)
+    # if we found shared libraries - do the following:
+    IF (OPENSSL_USE_STATIC_LIBS)
+	MESSAGE(STATUS "[UMSKT] requested static version of OpenSSL")
+	if (NOT UMSKT_USE_SHARED_OPENSSL)
+	    MESSAGE(STATUS "[UMSKT] not asked for shared version of OpenSSL")
+	ENDIF()
+
+	IF(MSVC)
+	    SET(UMSKT_LINK_LIBS ${UMSKT_LINK_LIBS} "ws2_32.lib")
+	    SET(UMSKT_LINK_LIBS ${UMSKT_LINK_LIBS} "crypt32.lib")
+	    MESSAGE(STATUS "[UMSKT] msvc adding ws2_32.lib crypt32.lib")
+	ENDIF()
+    ENDIF()
+
+    STRING(REGEX MATCH "(\\.so|\\.dll|\\.dylib)$" OPENSSL_CRYPTO_SHARED "${OPENSSL_CRYPTO_LIBRARY}")
+    IF(OPENSSL_CRYPTO_SHARED)
+	MESSAGE(STATUS "[UMSKT] Detected Shared library version of OpenSSL")
+    ELSE()
+	MESSAGE(STATUS "[UMSKT] Detected Static Library version of OpenSSL")
+
+	# static libcrypto on Fedora needs -lz at link time
+	IF (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+	    FIND_PACKAGE(ZLIB REQUIRED)
+	    IF (NOT ZLIB_FOUND)
+		MESSAGE(FATAL_ERROR "[UMSKT] linux static OpenSSL requires zlib")
+	    ENDIF()
+	ENDIF()
+    ENDIF()
+ENDIF()
+
 # initalize cpm.CMake
 INCLUDE(cmake/CPM.cmake)

@ -152,28 +197,24 @@ IF (EMSCRIPTEN)
    SET_TARGET_PROPERTIES(umskt PROPERTIES COMPILE_FLAGS "-Os -sEXPORTED_RUNTIME_METHODS=ccall,cwrap")
    SET_TARGET_PROPERTIES(umskt PROPERTIES LINK_FLAGS    "-Os -sWASM=1 -sEXPORT_ALL=1 -sEXPORTED_RUNTIME_METHODS=ccall,cwrap --no-entry")
 ELSE()
-    IF(NOT UMSKT_USE_SHARED_OPENSSL)
-        ### Static library compilation
-        ADD_LIBRARY(_umskt STATIC ${LIBUMSKT_SRC})
-        TARGET_INCLUDE_DIRECTORIES(_umskt PUBLIC ${OPENSSL_INCLUDE_DIR})
-        TARGET_LINK_LIBRARIES(_umskt -static OpenSSL::Crypto fmt ${UMSKT_LINK_LIBS})
-    ELSE()
-        ### Shared library compilation
-        ADD_LIBRARY(_umskt SHARED ${LIBUMSKT_SRC} ${UMSKT_EXE_WINDOWS_EXTRA} ${UMSKT_EXE_WINDOWS_DLL})
-        TARGET_INCLUDE_DIRECTORIES(_umskt PUBLIC ${OPENSSL_INCLUDE_DIR})
-        TARGET_LINK_LIBRARIES(_umskt OpenSSL::Crypto fmt ${UMSKT_LINK_LIBS})
-        TARGET_LINK_DIRECTORIES(_umskt PUBLIC ${UMSKT_LINK_DIRS})
-    ENDIF()
+    ADD_LIBRARY(_umskt ${LIBUMSKT_SRC} ${UMSKT_EXE_WINDOWS_EXTRA} ${UMSKT_EXE_WINDOWS_DLL})
+    TARGET_INCLUDE_DIRECTORIES(_umskt PUBLIC ${OPENSSL_INCLUDE_DIR})
+    TARGET_LINK_DIRECTORIES(_umskt PUBLIC ${UMSKT_LINK_DIRS})
+    TARGET_LINK_LIBRARIES(_umskt ${OPENSSL_CRYPTO_LIBRARIES} fmt ${UMSKT_LINK_LIBS})

    ### UMSKT executable compilation
    ADD_EXECUTABLE(umskt src/main.cpp src/cli.cpp ${UMSKT_EXE_WINDOWS_EXTRA})
    TARGET_INCLUDE_DIRECTORIES(umskt PUBLIC ${OPENSSL_INCLUDE_DIR})
-    TARGET_LINK_LIBRARIES(umskt _umskt OpenSSL::Crypto fmt nlohmann_json::nlohmann_json umskt::rc ${UMSKT_LINK_LIBS})
+    TARGET_LINK_LIBRARIES(umskt _umskt ${OPENSSL_CRYPTO_LIBRARIES} ${ZLIB_LIBRARIES} fmt nlohmann_json::nlohmann_json umskt::rc ${UMSKT_LINK_LIBS})
    TARGET_LINK_DIRECTORIES(umskt PUBLIC ${UMSKT_LINK_DIRS})
    IF(MSVC AND MSVC_MSDOS_STUB)
        SET_PROPERTY(TARGET umskt APPEND PROPERTY LINK_FLAGS /STUB:${MSVC_MSDOS_STUB})
    ENDIF()

+    IF (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+        install(TARGETS umskt DESTINATION bin)
+    ENDIF()
+
    ### Copy Shared Libraries and dependency files
    IF (OPENSSL_CRYPTO_SHARED)
        GET_FILENAME_COMPONENT(OPENSSL_CRYPTO_LIBRARY_FILENAME ${OPENSSL_CRYPTO_LIBRARY} NAME)
--- a/README.md
+++ b/README.md
@ -4,6 +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://discord.gg/PpBSpuphWM)

 **Build status**

@ -13,9 +14,9 @@

 [![C/C++ CI (Linux)](https://github.com/UMSKT/UMSKT/actions/workflows/linux.yml/badge.svg)](../../actions/workflows/linux.yml)

-[![C/C++ CI (FreeBSD)](https://github.com/UMSKT/UMSKT/actions/workflows/freebsd.yml/badge.svg)](../../actions/workflows/dos-djgpp.yml)
+[![C/C++ CI (FreeBSD)](https://github.com/UMSKT/UMSKT/actions/workflows/freebsd.yml/badge.svg)](../../actions/workflows/freebsd.yml)

-[![C/C++ CI (DOS DJGPP)](https://github.com/UMSKT/UMSKT/actions/workflows/dos-djgpp.yml/badge.svg)](../../actions/workflows/freebsd.yml)
+[![C/C++ CI (DOS DJGPP)](https://github.com/UMSKT/UMSKT/actions/workflows/dos-djgpp.yml/badge.svg)](../../actions/workflows/dos-djgpp.yml)

 ------

@ -50,19 +51,24 @@ 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. Run `umskt` to generate a key, or add `--help` or `-h` to see more options.
+#### 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.*

-#### 3. *(Activation step for `Retail` and `OEM` only)*
+#### 3. Run `umskt` to generate a key, or add `--help` or `-h` to see more options.
+
+#### 4. *(Activation step for `Retail` and `OEM` only)*
 * After installation, you will be prompted to activate Windows.


 * Select the **telephone activation** method, then, run `umskt -i <Installation ID>` using the `Installation ID` the activation Wizard provides for you
+   * If you're activating a non-Windows product, use `umskt -i <Installation ID> -m <Product>`, where `<Product>` is one of `OFFICEXP`, `OFFICE2K3`, `OFFICE2K7`, or `PLUSDME`
+   * If activating Office 2003/2007, use `umskt -i <Installation ID> -m <Product> -p <Product ID>`

 #### 4. Profit!

@ -76,6 +82,7 @@ The list of people who have helped to bring the XP generation to where it is now
 * MSKey
 * diamondggg
 * pottzman
+* david4599
 * Endermanch
 * Neo-Desktop
 * WitherOrNot
--- a/keys.json
+++ b/keys.json
@ -33,6 +33,9 @@
    "Commerce Server 2002": {
      "BINK": ["0E", "0F"]
    },
+    "Passport Manager": {
+      "BINK": ["10"]
+    },
    "Windows 2000 Professional": {
      "BINK": ["12", "13"]
    },
@ -129,12 +132,18 @@
    "Windows Longhorn (6.0.4039.0 -> Pre PIDGENX)": {
      "BINK": ["74", "75"]
    },
+    "Expression Web 2007 / Sharepoint Server 2007": {
+      "BINK": ["76", "77"]
+    },
    "Identity Lifecycle Manager 2007": {
      "BINK": ["78", "79"]
    },
    "Visual Studio 2008": {
      "BINK": ["78", "79"]
    },
+    "Sharepoint Designer 2007": {
+      "BINK": ["7C", "7D"]
+    },
    "Office 2007 Applications": {
      "BINK": ["7E", "7F"]
    },
@ -144,6 +153,9 @@
    "Office 2007 Standard / Professional / Ultimate / Enterprise": {
      "BINK": ["82", "83"]
    },
+    "Office 2007 Hybrid": {
+      "BINK": ["84", "85"]
+    },
    "Office 2007 Home & Student": {
      "BINK": ["88", "89"]
    }
@ -318,15 +330,15 @@
      "a": "1",
      "b": "0",
      "g": {
-        "x": "17272533675023793624680016937607161394427776688401278127884215858369066406365237833207419170117031265147050748737186",
-        "y": "10897684556651576571671151674586120690608236542740270859915076272932083320838022698730208293779451126638581586588925"
+        "x": "2424861453756882196229359499252409442096928108454123044238107428456451053748664006504056679987776648547354283230029",
+        "y": "7324425970176151969116486392910180591819760394015255323965851504893617199075285355320677185484219270306349221725496"
      },
-      "n": "44682719955829289",
-      "p": "31123778862031392435299439090755153401162704597024288571183830527113563344679315725116915983118187065183839828632113",
-      "priv": "30177475288172038",
+      "n": "42173753096150573",
+      "p": "23576896825148261563986794905854575022252138407149635186332207102431578828005131860154350053063599250972940889198609",
+      "priv": "21644128200478272",
      "pub": {
-        "x": "10584120526089473026246191383792758367144927589909587205278073830223938861208553884400816982485323081066790399437204",
-        "y": "19710761542152200618172612283139324015316083022563473705358032993141026289202915973780473937312193485361804450068338"
+        "x": "22559965909720054111451558679234685221190121968477792217083519033370405738218408301652020048970098652944061723131120",
+        "y": "4867649293914467066273247931825593002116583959412689222356329515920397531410942846741846700237094219959206105155903"
      }
    },
    "0C": {
@ -389,6 +401,21 @@
        "y": "12300711937755714474221683340048792628817501853269187222732097530965245794898485391792926982501341822327927281168157"
      }
    },
+    "10": {
+      "a": "1",
+      "b": "0",
+      "g": {
+        "x": "18651628392962497698304079461858800038021595035623099589626558411789423821835513779530629747878048328422716050099296",
+        "y": "28457790016119433859033076174489680371110176047623886251847351799861435189214769185332948508935608870611015909181946"
+      },
+      "n": "63517138149940081",
+      "p": "34850883414891516310048088524473091032039735302322749072119923383901524249650054933039485488287948424536010614809529",
+      "priv": "42074657350570560",
+      "pub": {
+        "x": "14897248889444524585539298515527812307525445072093905045143283125792133561464628729391995919418984547359131800953862",
+        "y": "30590224388131521072842776697623219502924625149179219913459005347798492666726177600440842678766281012690402321113086"
+      }
+    },
    "12": {
      "a": "1",
      "b": "0",
@ -779,6 +806,66 @@
        "y": "4166331361209663080277908775030002767045551689443380649904104094047767422069625957190676222747168197864341871814070164924686453916110248521040648287862677"
      }
    },
+    "42": {
+      "a": "1",
+      "b": "0",
+      "g": {
+        "x": "11640071446359917693418230277272135573556102510768548148030840368465631925066661215750608051818744662399431859372010847799326485284550650513243041633181229",
+        "y": "1117219266737324272317290420713713230170128897725948728570838742460014554810962916878884036620621200355133560155042440959180864818213121429155138181344653"
+      },
+      "n": "5280334341756112909",
+      "p": "12942978066077029419384467090650680778545791198987839112733218154226202456650854446314697588718267646821306053679758777877942489272278682133825653213117273",
+      "priv": "1465309884720242143",
+      "pub": {
+        "x": "9351207863776380035890122409035060669425884047354848374635961783863142135448736359201437768670165682794001791952363648653230539557613342151297569318010149",
+        "y": "9639173047661422234418044696501057599355311018715184869788900265449733286127996011980477454425481367874466175535746037008129571512803245134460273061854442"
+      }
+    },
+    "43": {
+      "a": "1",
+      "b": "0",
+      "g": {
+        "x": "2834486376491690368456603825217677225471198398912779448345352642108764638231378782668499190157872740666167080466219457629252550710819781972327332131965258",
+        "y": "4797700757852014957418479446842892711716196864495788466729606301384034376631555735482572108714361434720650684534546885209233659101211883665277770145423350"
+      },
+      "n": "5523679238757269761",
+      "p": "6926191998299775557228051679990184107308003134668712746978570129316018332430570191924825301565850815568703875111335260944754577838427804555602564950786897",
+      "priv": "2809607843179400714",
+      "pub": {
+        "x": "5801087961280458909792080253947945286111446355062440146334723296822174085898835796467483513249817617372724731293482946799424523234786103045200852470225011",
+        "y": "1919606609989436277853545800995092035920586757555046809012910563836843544210421704301817498648513315478648381017523132165198480986231348796390852153074721"
+      }
+    },
+    "44": {
+      "a": "1",
+      "b": "0",
+      "g": {
+        "x": "9680658238923578678202657184293847763076151678383489086861167893944370179297511555508861816858010248459991161671607410772896973557285105910275482332653112",
+        "y": "38902477949345497450784597636513692713869581728781957101503157321110858542746905996206655102425053611084383171688496202957335182347019199622239575131319"
+      },
+      "n": "4714695763604443541",
+      "p": "10060218540908435736634173235406368357048589196592148828376201588591059234309957485052136941552686476146780926855972646273339825261674895471491324476121697",
+      "priv": "952494568445020851",
+      "pub": {
+        "x": "7809435572353033432542259944225681069776007713441000282689259450883474252378043956762041876078756182695744718782433033396721679522564745671507681698680124",
+        "y": "2120018000497598938986702274873490939171797105426386828711756267078880551570146718754825759969119264518218486103010877173921337418786732248062865348045969"
+      }
+    },
+    "45": {
+      "a": "1",
+      "b": "0",
+      "g": {
+        "x": "1415506028429814835609318901328901279725664469601609961018689628962980229383879276982285895935656882715108992785111554965336919510937749428526698965204901",
+        "y": "6142658768171534784725381543698447822724946469773052050322995135930968261406067031627504011235735426349765719550450476207341330596203075437382377459404055"
+      },
+      "n": "4705733954672224129",
+      "p": "8420779903875279756603065163346889837055414440294897668354571673595315405287353764209959201404596284932170027888535337670888642377481800445761115380269649",
+      "priv": "1845297747391977061",
+      "pub": {
+        "x": "5979408142886940137052651399684513359780629840102111793966097396623272737697258705143841606573133958717430112526043253582151662435203695216093728339267096",
+        "y": "3518591391911442753664238113448734968964864723243113225953452544472418473210828150121884867152997802156077007186900916060906287620287437578440526157889485"
+      }
+    },
    "50": {
      "a": "1",
      "b": "0",
@ -1531,7 +1618,7 @@
    }
  },
  "Activation": {
-    "Windowws XP": {
+    "Windows XP": {
      "p": "102011604035381881",
      "x": {
        "0": "0",
--- a/src/cli.cpp
+++ b/src/cli.cpp
@ -22,6 +22,15 @@

 #include "cli.h"

+CLI::~CLI()
+{
+    EC_GROUP_free(eCurve);
+    EC_POINT_free(genPoint);
+    EC_POINT_free(pubPoint);
+    BN_free(privateKey);
+    BN_free(genOrder);
+}
+
 bool CLI::loadJSON(const fs::path& filename, json *output) {
    if (!filename.empty() && !fs::exists(filename)) {
        fmt::print("ERROR: File {} does not exist\n", filename.string());
@ -53,12 +62,16 @@ void CLI::showHelp(char *argv[]) {
    fmt::print("\t-n --number\tnumber of keys to generate (defaults to 1)\n");
    fmt::print("\t-f --file\tspecify which keys file to load\n");
    fmt::print("\t-i --instid\tinstallation ID used to generate confirmation ID\n");
+    fmt::print("\t-m --mode\tproduct family to activate.\n\t\t\tvalid options are \"WINDOWS\", \"OFFICEXP\", \"OFFICE2K3\", \"OFFICE2K7\" or \"PLUSDME\"\n\t\t\t(defaults to \"WINDOWS\")\n");
+    fmt::print("\t-p --productid\tthe product ID of the Program to activate. only required for Office 2K3 and Office 2K7 programs\n");
    fmt::print("\t-b --binkid\tspecify which BINK identifier to load (defaults to 2E)\n");
    fmt::print("\t-l --list\tshow which products/binks can be loaded\n");
    fmt::print("\t-c --channelid\tspecify which Channel Identifier to use (defaults to 640)\n");
    fmt::print("\t-s --serial\tspecifies a serial to use in the product ID (defaults to random, BINK1998 only)\n");
    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");
 }

@ -69,21 +82,24 @@ int CLI::parseCommandLine(int argc, char* argv[], Options* options) {
            "",
            "",
            "",
+            "",
            640,
            0,
            1,
+            false,
+            false,
+            false,
+            false,
+            false,
+            false,
 	    false,
-            false,
-            false,
-            false,
-            false,
-            false,
-            MODE_BINK1998_GENERATE
+	    false,
+            MODE_BINK1998_GENERATE,
+            WINDOWS
    };

    for (int i = 1; i < argc; i++) {
        std::string arg = argv[i];
-
        if (arg == "-v" || arg == "--verbose") {
            options->verbose = true;
            UMSKT::setDebugOutput(stderr);
@ -158,6 +174,32 @@ int CLI::parseCommandLine(int argc, char* argv[], Options* options) {
            options->instid = argv[i+1];
            options->applicationMode = MODE_CONFIRMATION_ID;
            i++;
+        } else if (arg == "-m" || arg == "--mode") {
+            std::string mode = argv[i+1];
+            char *p = &mode[0];
+            for (; *p; p++) {
+                *p = toupper((unsigned char)*p);
+	    }
+            p = &mode[0];
+            if (strcmp(p, "WINDOWS") == 0) {
+                options->activationMode = WINDOWS;
+	    } else if (strcmp(p, "OFFICEXP") == 0) {
+                options->activationMode = OFFICE_XP;
+	    } else if (strcmp(p, "OFFICE2K3") == 0) {
+                options->activationMode = OFFICE_2K3;
+            } else if (strcmp(p, "OFFICE2K7") == 0) {
+                options->activationMode = OFFICE_2K7;
+	    } else if (strcmp(p, "PLUSDME") == 0) {
+                options->activationMode = PLUS_DME;
+	    }
+            i++;
+        } else if (arg == "-p" || arg == "--productid") {
+	    if (i == argc -1) {
+                options->error = true;
+                break;
+	    }
+            options->productid = argv[i+1];
+            i++;
        } else if (arg == "-V" || arg == "--validate") {
            if (i == argc - 1) {
                options->error = true;
@ -167,11 +209,21 @@ int CLI::parseCommandLine(int argc, char* argv[], Options* options) {
            options->keyToCheck = argv[i+1];
            options->applicationMode = MODE_BINK1998_VALIDATE;
            i++;
-        } else {
+		
+	} else if (arg == "-N" || arg == "--nonewlines") {
+	    options->nonewlines = true;
+	} else if (arg == "-o" || arg == "--override") {
+	    options->overrideVersion = true;
+	} else {
            options->error = true;
        }
    }

+    // make sure that a product id is entered for OFFICE_2K3 or OFFICE_2K7 IIDs
+    if ((options->activationMode == OFFICE_2K3 || options->activationMode == OFFICE_2K7) && (options->productid.empty() || options->instid.empty()) ) {
+        return options->error = true;
+    }
+
    return !options->error;
 }

@ -220,6 +272,12 @@ int CLI::validateCommandLine(Options* options, char *argv[], json *keys) {
    int intBinkID;
    sscanf(options->binkid.c_str(), "%x", &intBinkID);

+    // FE and FF are BINK 1998, but do not generate valid keys, so we throw an error
+    if (intBinkID >= 0xFE) {
+        fmt::print("ERROR: Terminal Services BINKs (FE and FF) are unsupported at this time\n");
+        return 1;
+    }
+    
    if (intBinkID >= 0x40) {
        // set bink2002 validate mode if in bink1998 validate mode, else set bink2002 generate mode
        options->applicationMode = (options->applicationMode == MODE_BINK1998_VALIDATE) ? MODE_BINK2002_VALIDATE : MODE_BINK2002_GENERATE;
@ -372,6 +430,7 @@ int CLI::BINK1998Generate() {

        sscanf(cRaw, "%d", &oRaw);
        nRaw += (oRaw % 999999); // ensure our serial is less than 999999
+	BN_free(bnrand);
    }

    if (this->options.verbose) {
@ -383,13 +442,8 @@ int CLI::BINK1998Generate() {
    // generate a key
    BN_sub(this->privateKey, this->genOrder, this->privateKey);

-    // Specify whether an upgrade version or not
-    bool bUpgrade = false;
-    if (options.upgrade == true)
-	    bUpgrade = true;
-
    for (int i = 0; i < this->total; i++) {
-        PIDGEN3::BINK1998::Generate(this->eCurve, this->genPoint, this->genOrder, this->privateKey, nRaw, bUpgrade, this->pKey);
+        PIDGEN3::BINK1998::Generate(this->eCurve, this->genPoint, this->genOrder, this->privateKey, nRaw, options.upgrade, this->pKey);

        bool isValid = PIDGEN3::BINK1998::Verify(this->eCurve, this->genPoint, this->pubPoint, this->pKey);
        if (isValid) {
@ -414,10 +468,9 @@ int CLI::BINK1998Generate() {
    if (this->options.verbose) {
        fmt::print("\nSuccess count: {}/{}", this->count, this->total);
    }
-#ifndef _WIN32
-    fmt::print("\n");
-#endif
-
+    if (this->options.nonewlines == false) {
+	fmt::print("\n"); 
+    }
    return 0;
 }

@ -438,12 +491,7 @@ int CLI::BINK2002Generate() {
            fmt::print("> AuthInfo: {}\n", pAuthInfo);
        }

-        // Specify whether an upgrade version or not
-        bool bUpgrade = false;
-        if (options.upgrade == true)
-            bUpgrade = true;
-
-        PIDGEN3::BINK2002::Generate(this->eCurve, this->genPoint, this->genOrder, this->privateKey, pChannelID, pAuthInfo, bUpgrade, this->pKey);
+        PIDGEN3::BINK2002::Generate(this->eCurve, this->genPoint, this->genOrder, this->privateKey, pChannelID, pAuthInfo, options.upgrade, this->pKey);

        bool isValid = PIDGEN3::BINK2002::Verify(this->eCurve, this->genPoint, this->pubPoint, this->pKey);
        if (isValid) {
@ -468,9 +516,9 @@ int CLI::BINK2002Generate() {
    if (this->options.verbose) {
        fmt::print("\nSuccess count: {}/{}", this->count, this->total);
    }
-#ifndef _WIN32
-    fmt::print("\n");
-#endif
+    if (this->options.nonewlines == false) {
+	fmt::print("\n"); 
+    }

    return 0;
 }
@ -515,7 +563,7 @@ int CLI::BINK2002Validate() {

 int CLI::ConfirmationID() {
    char confirmation_id[49];
-    int err = ConfirmationID::Generate(this->options.instid.c_str(), confirmation_id);
+    int err = ConfirmationID::Generate(this->options.instid.c_str(), confirmation_id, options.activationMode, options.productid, options.overrideVersion);

    switch (err) {
        case ERR_TOO_SHORT:
@ -544,9 +592,9 @@ int CLI::ConfirmationID() {

        case SUCCESS:
            fmt::print(confirmation_id);
-#ifndef _WIN32
-            fmt::print("\n");
-#endif
+    	    if (this->options.nonewlines == false) {
+	        fmt::print("\n"); 
+    	    }
            return 0;

        default:
--- a/src/cli.h
+++ b/src/cli.h
@ -36,10 +36,18 @@

 CMRC_DECLARE(umskt);

+enum ACTIVATION_ALGORITHM {
+    WINDOWS     = 0,
+    OFFICE_XP   = 1,
+    OFFICE_2K3  = 2,
+    OFFICE_2K7  = 3,
+    PLUS_DME    = 4,
+};
+
 enum MODE {
    MODE_BINK1998_GENERATE = 0,
    MODE_BINK2002_GENERATE = 1,
-    MODE_CONFIRMATION_ID = 2,
+    MODE_CONFIRMATION_ID   = 2,
    MODE_BINK1998_VALIDATE = 3,
    MODE_BINK2002_VALIDATE = 4,
 };
@ -49,6 +57,7 @@ struct Options {
    std::string keysFilename;
    std::string instid;
    std::string keyToCheck;
+    std::string productid;
    int channelID;
    int serial;
    int numKeys;
@ -58,8 +67,11 @@ struct Options {
    bool help;
    bool error;
    bool list;
+    bool nonewlines;
+    bool overrideVersion;

    MODE applicationMode;
+    ACTIVATION_ALGORITHM activationMode;
 };

 class CLI {
@ -74,6 +86,7 @@ class CLI {

 public:
    CLI(Options options, json keys);
+    ~CLI();

    static bool loadJSON(const fs::path& filename, json *output);
    static void showHelp(char *argv[]);
--- a/src/libumskt/confid/confid.cpp
+++ b/src/libumskt/confid/confid.cpp
@ -29,9 +29,22 @@

 #include "confid.h"

-#define MOD 0x16A6B036D7F2A79ULL
-#define NON_RESIDUE 43
-static const QWORD f[6] = {0, 0x21840136C85381ULL, 0x44197B83892AD0ULL, 0x1400606322B3B04ULL, 0x1400606322B3B04ULL, 1};
+QWORD MOD = 0;
+QWORD NON_RESIDUE = 0;
+QWORD f[6] = { 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 };
+int productID[4];
+int activationMode;
+
+int ConfirmationID::calculateCheckDigit(int pid)
+{
+	unsigned int i = 0, j = 0, k = 0;
+	for (j = pid; j; i += k)
+	{
+		k = j % 10;
+		j /= 10;
+	}
+	return ((10 * pid) - (i % 7)) + 7;
+}

 QWORD ConfirmationID::residue_add(QWORD x, QWORD y)
 {
@ -95,18 +108,65 @@ QWORD ConfirmationID::ui128_quotient_mod(QWORD lo, QWORD hi)
 {
 	// hi:lo * ceil(2**170/MOD) >> (64 + 64 + 42)
 	QWORD prod1;
-	__umul128(lo, 0x604fa6a1c6346a87, &prod1);
+	switch (activationMode) {
+		case 0:
+			__umul128(lo, 0x604FA6A1C6346A87, &prod1);
+			break;
+		case 1:
+		case 2:
+		case 3:
+			__umul128(lo, 0x4FA8E4A40CDAE44A, &prod1);
+			break;
+		case 4:
+			__umul128(lo, 0x2C5C4D3654A594F0, &prod1);
+	}
 	QWORD part1hi;
-	QWORD part1lo = __umul128(lo, 0x2d351c6d04f8b, &part1hi);
+	QWORD part1lo;
+        switch (activationMode) {
+		case 0:
+			part1lo = __umul128(lo, 0x2D351C6D04F8B, &part1hi);
+			break;
+		case 1:
+		case 2:
+		case 3:
+			part1lo = __umul128(lo, 0x2CBAF12A59BBE, &part1hi);
+			break;
+		case 4:
+			part1lo = __umul128(lo, 0x2D36C691A4EA5, &part1hi);
+	}
 	QWORD part2hi;
-	QWORD part2lo = __umul128(hi, 0x604fa6a1c6346a87, &part2hi);
+	QWORD part2lo;
+	switch (activationMode) {
+		case 0:
+			part2lo = __umul128(hi, 0x604FA6A1C6346A87, &part2hi);
+			break;
+		case 1:
+		case 2:
+		case 3:
+			part2lo = __umul128(hi, 0x4FA8E4A40CDAE44A, &part2hi);
+			break;
+		case 4:
+			part2lo = __umul128(hi, 0x2C5C4D3654A594F0, &part2hi);
+	}
 	QWORD sum1 = part1lo + part2lo;
 	unsigned sum1carry = (sum1 < part1lo);
 	sum1 += prod1;
 	sum1carry += (sum1 < prod1);
 	QWORD prod2 = part1hi + part2hi + sum1carry;
 	QWORD prod3hi;
-	QWORD prod3lo = __umul128(hi, 0x2d351c6d04f8b, &prod3hi);
+	QWORD prod3lo;
+        switch (activationMode) {
+		case 0:
+			prod3lo = __umul128(hi, 0x2D351C6D04F8B, &prod3hi);
+			break;
+		case 1:
+		case 2:
+		case 3:
+			prod3lo = __umul128(hi, 0x2CBAF12A59BBE, &prod3hi);
+			break;
+		case 4:
+			prod3lo = __umul128(hi, 0x2D36C691A4EA5, &prod3hi);
+	}
 	prod3lo += prod2;
 	prod3hi += (prod3lo < prod2);
 	return (prod3lo >> 42) | (prod3hi << 22);
@ -619,6 +679,20 @@ void ConfirmationID::sha1_single_block(unsigned char input[64], unsigned char ou
 	output[16] = e >> 24; output[17] = e >> 16; output[18] = e >> 8; output[19] = e;
 }

+void ConfirmationID::decode_iid_new_version(unsigned char* iid, unsigned char* hwid, int* version)
+{
+    QWORD buffer[5];
+    int i;
+    for (i = 0; i < 5; i++)
+        memcpy(&buffer[i], (iid + (4 * i)), 4);
+    DWORD v1 = (buffer[3] & 0xFFFFFFF8) | 2;
+    DWORD v2 = ((buffer[3] & 7) << 29) | (buffer[2] >> 3);
+    QWORD hardwareIDVal = ((QWORD)v1 << 32) | v2;
+    for (i = 0; i < 8; ++i)
+        hwid[i] = (hardwareIDVal >> (8 * i)) & 0xFF;
+    *version = buffer[0] & 7;
+}
+
 void ConfirmationID::Mix(unsigned char* buffer, size_t bufSize, const unsigned char* key, size_t keySize)
 {
 	unsigned char sha1_input[64];
@ -628,12 +702,26 @@ void ConfirmationID::Mix(unsigned char* buffer, size_t bufSize, const unsigned c
 	int external_counter;
 	for (external_counter = 0; external_counter < 4; external_counter++) {
 		memset(sha1_input, 0, sizeof(sha1_input));
-		memcpy(sha1_input, buffer + half, half);
-		memcpy(sha1_input + half, key, keySize);
-		sha1_input[half + keySize] = 0x80;
-		sha1_input[sizeof(sha1_input) - 1] = (half + keySize) * 8;
-		sha1_input[sizeof(sha1_input) - 2] = (half + keySize) * 8 / 0x100;
-        sha1_single_block(sha1_input, sha1_result);
+		switch (activationMode) {
+			case 0:
+			case 1:
+			case 4:
+				memcpy(sha1_input, buffer + half, half);
+				memcpy(sha1_input + half, key, keySize);
+				sha1_input[half + keySize] = 0x80;
+				sha1_input[sizeof(sha1_input) - 1] = (half + keySize) * 8;
+				sha1_input[sizeof(sha1_input) - 2] = (half + keySize) * 8 / 0x100;
+				break;
+			case 2:
+			case 3:
+				sha1_input[0] = 0x79;
+				memcpy(sha1_input + 1, buffer + half, half);
+				memcpy(sha1_input + 1 + half, key, keySize);
+				sha1_input[1 + half + keySize] = 0x80;
+				sha1_input[sizeof(sha1_input) - 1] = (1 + half + keySize) * 8;
+				sha1_input[sizeof(sha1_input) - 2] = (1 + half + keySize) * 8 / 0x100;
+		}
+		sha1_single_block(sha1_input, sha1_result);
 		size_t i;
 		for (i = half & ~3; i < half; i++)
 			sha1_result[i] = sha1_result[i + 4 - (half & 3)];
@ -654,12 +742,26 @@ void ConfirmationID::Unmix(unsigned char* buffer, size_t bufSize, const unsigned
 	int external_counter;
 	for (external_counter = 0; external_counter < 4; external_counter++) {
 		memset(sha1_input, 0, sizeof(sha1_input));
-		memcpy(sha1_input, buffer, half);
-		memcpy(sha1_input + half, key, keySize);
-		sha1_input[half + keySize] = 0x80;
-		sha1_input[sizeof(sha1_input) - 1] = (half + keySize) * 8;
-		sha1_input[sizeof(sha1_input) - 2] = (half + keySize) * 8 / 0x100;
-        sha1_single_block(sha1_input, sha1_result);
+		switch (activationMode) {
+			case 0:
+			case 1:
+			case 4:
+				memcpy(sha1_input, buffer, half);
+				memcpy(sha1_input + half, key, keySize);
+				sha1_input[half + keySize] = 0x80;
+				sha1_input[sizeof(sha1_input) - 1] = (half + keySize) * 8;
+				sha1_input[sizeof(sha1_input) - 2] = (half + keySize) * 8 / 0x100;
+				break;
+			case 2:
+			case 3:
+				sha1_input[0] = 0x79;
+				memcpy(sha1_input + 1, buffer, half);
+				memcpy(sha1_input + 1 + half, key, keySize);
+				sha1_input[1 + half + keySize] = 0x80;
+				sha1_input[sizeof(sha1_input) - 1] = (1 + half + keySize) * 8;
+				sha1_input[sizeof(sha1_input) - 2] = (1 + half + keySize) * 8 / 0x100;
+		}
+		sha1_single_block(sha1_input, sha1_result);
 		size_t i;
 		for (i = half & ~3; i < half; i++)
 			sha1_result[i] = sha1_result[i + 4 - (half & 3)];
@ -671,8 +773,44 @@ void ConfirmationID::Unmix(unsigned char* buffer, size_t bufSize, const unsigned
 	}
 }

-int ConfirmationID::Generate(const char* installation_id_str, char confirmation_id[49])
+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];
+	activationMode = mode;
+	switch (activationMode) {
+		case 0:
+			MOD = 0x16A6B036D7F2A79;
+			NON_RESIDUE = 43;
+			f[0] = 0x0;
+			f[1] = 0x21840136C85381;
+			f[2] = 0x44197B83892AD0;
+			f[3] = 0x1400606322B3B04;
+			f[4] = 0x1400606322B3B04;
+			f[5] = 0x1;
+			break;
+		case 1:
+		case 2:
+		case 3:
+			MOD = 0x16E48DD18451FE9;
+			NON_RESIDUE = 3;
+			f[0] = 0x0;
+			f[1] = 0xE5F5ECD95C8FD2;
+			f[2] = 0xFF28276F11F61;
+			f[3] = 0xFB2BD9132627E6;
+			f[4] = 0xE5F5ECD95C8FD2;
+			f[5] = 0x1;
+			break;
+		case 4:
+			MOD = 0x16A5DABA0605983;
+			NON_RESIDUE = 2;
+			f[0] = 0x334F24F75CAA0E;
+			f[1] = 0x1392FF62889BD7B;
+			f[2] = 0x135131863BA2DB8;
+			f[3] = 0x153208E78006010;
+			f[4] = 0x163694F26056DB;
+			f[5] = 0x1;
+	}
 	unsigned char installation_id[19]; // 10**45 < 256**19
 	size_t installation_id_len = 0;
 	const char* p = installation_id_str;
@ -714,9 +852,25 @@ int ConfirmationID::Generate(const char* installation_id_str, char confirmation_
 		return ERR_TOO_SHORT;
 	for (; installation_id_len < sizeof(installation_id); installation_id_len++)
 		installation_id[installation_id_len] = 0;
-	static const unsigned char iid_key[4] = {0x6A, 0xC8, 0x5E, 0xD4};
+	unsigned char iid_key[4] = { 0x0, 0x0, 0x0, 0x0 };
+	switch (activationMode) {
+		case 0:
+		case 4:
+			iid_key[0] = 0x6A;
+			iid_key[1] = 0xC8;
+			iid_key[2] = 0x5E;
+			iid_key[3] = 0xD4;
+			break;
+		case 1:
+		case 2:
+		case 3:
+			iid_key[0] = 0x5A;
+			iid_key[1] = 0x30;
+			iid_key[2] = 0xB9;
+			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)
@ -727,19 +881,71 @@ int ConfirmationID::Generate(const char* installation_id_str, char confirmation_
 		unsigned short KeySHA1;
 	} parsed;
 #pragma pack(pop)
-	memcpy(&parsed, installation_id, sizeof(parsed));
-	unsigned productId1 = parsed.ProductIDLow & ((1 << 17) - 1);
-	unsigned productId2 = (parsed.ProductIDLow >> 17) & ((1 << 10) - 1);
-	unsigned productId3 = (parsed.ProductIDLow >> 27) & ((1 << 25) - 1);
-	unsigned version = (parsed.ProductIDLow >> 52) & 7;
-	unsigned productId4 = (parsed.ProductIDLow >> 55) | (parsed.ProductIDHigh << 9);
-	if (version != (totalCount == 41 ? 4 : 5))
-		return ERR_UNKNOWN_VERSION;
-	//printf("Product ID: %05u-%03u-%07u-%05u\n", productId1, productId2, productId3, productId4);
+	switch (activationMode) {
+		case 0:
+		case 1:
+		case 4:
+			memcpy(&parsed, installation_id, sizeof(parsed));
+			productID[0] = parsed.ProductIDLow & ((1 << 17) - 1);
+			productID[1] = (parsed.ProductIDLow >> 17) & ((1 << 10) - 1);
+			productID[2] = (parsed.ProductIDLow >> 27) & ((1 << 24) - 1);
+			version    = (parsed.ProductIDLow >> 51) & 15;
+			productID[3] = (parsed.ProductIDLow >> 55) | (parsed.ProductIDHigh << 9);
+			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);
+			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));
+			std::string channelid = productid.substr(6,3);
+			char *p = &channelid[0];
+			for (; *p; p++) {
+				*p = toupper((unsigned char)*p);
+			}
+			if (strcmp(&channelid[0], "OEM") == 0) {
+				productID[1] = stoi(productid.substr(12,3));
+				productID[2] = (stoi(productid.substr(15,1)) * 100000) + stoi(productid.substr(18,5));
+				productID[2] = calculateCheckDigit(productID[2]);
+				productID[3] = ((stoi(productid.substr(10,2))) * 1000) + productID[3];
+			} else {
+				productID[1] = stoi(productid.substr(6,3));
+				productID[2] = stoi(productid.substr(10,7));
+				productID[3] = stoi(productid.substr(18,5));
+			}
+		//fmt::print("ProductID: {}-{}-{}-{} \n", productID[0], productID[1], productID[2], productID[3]);
+	}
+	
 	unsigned char keybuf[16];
 	memcpy(keybuf, &parsed.HardwareID, 8);
-	QWORD productIdMixed = (QWORD)productId1 << 41 | (QWORD)productId2 << 58 | (QWORD)productId3 << 17 | productId4;
+	QWORD productIdMixed = (QWORD)productID[0] << 41 | (QWORD)productID[1] << 58 | (QWORD)productID[2] << 17 | productID[3];
 	memcpy(keybuf + 8, &productIdMixed, 8);

 	TDivisor d;
@ -754,7 +960,16 @@ int ConfirmationID::Generate(const char* installation_id_str, char confirmation_
 		} u;
 		u.lo = 0;
 		u.hi = 0;
-		u.buffer[7] = attempt;
+		switch (activationMode) {
+			case 0:
+			case 1:
+			case 4:
+				u.buffer[7] = attempt;
+				break;
+			case 2:
+			case 3:
+				u.buffer[6] = attempt;
+		}
 		Mix(u.buffer, 14, keybuf, 16);
 		QWORD x2 = ui128_quotient_mod(u.lo, u.hi);
 		QWORD x1 = u.lo - x2 * MOD;
@ -766,7 +981,18 @@ int ConfirmationID::Generate(const char* installation_id_str, char confirmation_
 	}
 	if (attempt > 0x80)
 		return ERR_UNLUCKY;
-	divisor_mul128(&d, 0x04e21b9d10f127c1, 0x40da7c36d44c, &d);
+	switch (activationMode) {
+		case 0:
+			divisor_mul128(&d, 0x04E21B9D10F127C1, 0x40DA7C36D44C, &d);
+			break;
+		case 1:
+		case 2:
+		case 3:
+			divisor_mul128(&d, 0xEFE0302A1F7A5341, 0x01FB8CF48A70DF, &d);
+			break;
+		case 4:
+			divisor_mul128(&d, 0x7C4254C43A5D1181, 0x01C61212ECE610, &d);
+	}
 	union {
 		struct {
 			QWORD encoded_lo, encoded_hi;
--- a/src/libumskt/confid/confid.h
+++ b/src/libumskt/confid/confid.h
@ -41,6 +41,7 @@ typedef struct {
 } TDivisor;

 EXPORT class ConfirmationID {
+    static int calculateCheckDigit(int pid);
    static QWORD residue_add(QWORD x, QWORD y);
    static QWORD residue_sub(QWORD x, QWORD y);
    static QWORD __umul128(QWORD a, QWORD b, QWORD* hi);
@ -60,11 +61,12 @@ EXPORT class ConfirmationID {
    static void divisor_mul128(const TDivisor* src, QWORD mult_lo, QWORD mult_hi, TDivisor* dst);
    static unsigned rol(unsigned x, int shift);
    static void sha1_single_block(unsigned char input[64], unsigned char output[20]);
+    static void decode_iid_new_version(unsigned char* iid, unsigned char* hwid, int* version);
    static void Mix(unsigned char* buffer, size_t bufSize, const unsigned char* key, size_t keySize);
    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]);
+    static int Generate(const char* installation_id_str, char confirmation_id[49], int mode, std::string productid, bool overrideVersion);
    //EXPORT static int CLIRun();
 };

--- a/src/libumskt/libumskt.cpp
+++ b/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]) {
-    return ConfirmationID::Generate(installation_id_str, confirmation_id);
+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) {
@ -57,4 +57,4 @@ FNEXPORT int PIDGEN2_GenerateRetail(char* channelID, char* &keyout) {

 FNEXPORT int PIDGEN2_GenerateOEM(char* year, char* day, char* oem, char* keyout) {
    return PIDGEN2::GenerateOEM(year, day, oem, keyout);
-}
+}
--- a/src/libumskt/pidgen3/util.cpp
+++ b/src/libumskt/pidgen3/util.cpp
@ -100,6 +100,13 @@ EC_GROUP* PIDGEN3::initializeEllipticCurve(

    // Cleanup
    BN_CTX_free(context);
+    BN_free(p);
+    BN_free(a);
+    BN_free(b);
+    BN_free(generatorX);
+    BN_free(generatorY);
+    BN_free(publicKeyX);
+    BN_free(publicKeyY);

    return eCurve;
 }
--- a/src/main.cpp
+++ b/src/main.cpp
@ -39,23 +39,23 @@ int main(int argc, char *argv[]) {
        return status;
    }

-    CLI* run = new CLI(options, keys);
+    CLI run(options, keys);

    switch(options.applicationMode) {
        case MODE_BINK1998_GENERATE:
-            return run->BINK1998Generate();
+            return run.BINK1998Generate();

        case MODE_BINK2002_GENERATE:
-            return run->BINK2002Generate();
+            return run.BINK2002Generate();

        case MODE_BINK1998_VALIDATE:
-            return run->BINK1998Validate();
+            return run.BINK1998Validate();

        case MODE_BINK2002_VALIDATE:
-            return run->BINK2002Validate();
+            return run.BINK2002Validate();

        case MODE_CONFIRMATION_ID:
-            return run->ConfirmationID();
+            return run.ConfirmationID();

        default:
            return 1;
Author	SHA1	Message	Date
TheTank20	8368b6a6c7	Merge pull request #116 from UMSKT/disable-freebsd Disable automatic FreeBSD GH action	2025-04-13 21:14:58 -04:00
TheTank20	2415d1374f	Disable FreeBSD GH action	2025-04-13 19:52:53 -04:00
TheTank20	d1024950da	Fix GH actions	2025-04-13 19:09:02 -04:00
TheTank20	1ca5114b21	Update dos-djgpp.yml	2025-04-13 17:50:24 -04:00
TheTank20	da10583fdf	Update freebsd.yml	2025-04-13 17:50:14 -04:00
TheTank20	034c00a5b8	Update linux.yml	2025-04-13 17:50:02 -04:00
TheTank20	cd050c65d6	Update macos.yml	2025-04-13 17:49:44 -04:00
TheTank20	02434e935d	Update windows.yml	2025-04-13 17:49:00 -04:00
TheTank20	09f1300afc	Update windows.yml	2025-04-13 17:47:43 -04:00
WitherOrNot	a3de0e845f	Update keys.json	2025-04-13 17:42:09 -04:00
pottzman	6287b4c773	Bink Data Update (#113 ) * Update keys.json Added BINK ID10 * Update keys.json added/updated some missing BINKID data BINKID 0x0B BINKID 0x42 BINKID 0x43 BINKID 0x44 BINKID 0x45	2025-03-12 10:35:47 -07:00
TheTank20	a5ce3abe13	the end of updating openssl manually	2024-07-25 23:47:07 -05:00
TheTank20	27344f6d4b	begone strikethrough	2024-07-25 23:32:38 -05:00
TheTank20	01b216dbc4	let it end	2024-06-22 00:01:28 -05:00
Neo	c29db1d30a	Update keys.json	2024-04-15 08:02:38 -07:00
ljcool2006	1c1e26012f	add "2007 Microsoft Office system" bink (#91 )	2024-04-15 07:38:26 -07:00
TheTank20	75f22215b1	Merge pull request #92 from thepwrtank18/version-check-bypass Override version check for confirmation ID's	2024-04-13 16:02:18 -04:00
TheTank20	be99f6b8e9	Update cli.cpp	2024-04-13 19:12:57 +00:00
TheTank20	e830f97e7e	Update cli.cpp	2024-04-13 19:01:34 +00:00
TheTank20	0251546d0d	Update libumskt.cpp	2024-04-13 18:59:34 +00:00
TheTank20	a12afcd601	Update confid.h	2024-04-13 18:46:31 +00:00
TheTank20	c7a555abe4	Update cli.cpp	2024-04-13 18:44:41 +00:00
TheTank20	74ff4bf144	Update cli.h	2024-04-13 18:43:59 +00:00
TheTank20	2b408913c4	Update cli.cpp	2024-04-13 18:43:50 +00:00
TheTank20	c965b88113	Update confid.cpp	2024-04-13 18:43:32 +00:00
TheTank20	2bc3503fd8	Update cli.h	2024-04-13 18:40:03 +00:00
TheTank20	3fbd1cffea	Update cli.cpp	2024-04-13 18:39:58 +00:00
TheTank20	4bf3800281	Comment out ERR_UNKNOWN_VERSION checks Temporary fix for Office 2007 not generating confid's.	2024-04-13 18:00:07 +00:00
TheTank20	8ec60bf396	Update windows.yml	2024-04-13 14:45:46 +00:00
TheTank20	5fbbd5e6eb	changing the openssl links every update isn't sustainable	2024-04-13 14:34:13 +00:00
WitherOrNot	d378c6499e	Update README.md	2024-01-05 06:52:47 -05:00
TheTank20	3ea8731271	Merge pull request #80 from Neilpang/patch-1 Upgrade to freebsd-vm@v1	2023-12-19 17:03:52 +00:00
neil	018f9f533c	add trigger for pull_request	2023-12-17 20:38:37 +01:00
neil	f1f1e0e6ea	Upgrade to freebsd-vm@v1 The v0 is not working.	2023-12-17 20:26:24 +01:00
pottzman	c4b63c15b2	Update keys.json (#79 ) Added BINK ID10	2023-12-15 13:32:09 -08:00
TheTank20	1548e14169	Update OpenSSL to 3.1.4 Please see GIF attached for what we'll eventually do to OpenSSL.	2023-12-14 00:24:33 +00:00
WitherOrNot	72d48dd38b	Merge pull request #74 from whatdoineed2do/build-static-normal-fixes cleanup CMakeLists.txt	2023-09-30 17:51:45 -04:00
whatdoineed2do/Ray	00d4906b28	djgpp: drop forced shared	2023-09-29 22:43:52 +01:00
whatdoineed2do/Ray	88f60630c1	gh: window - upgrade from 404'd 3.1.2 resource to openssl 3.1.3	2023-09-29 22:16:33 +01:00
whatdoineed2do/Ray	2ac6920e2c	cleanup CMakeLists.txt to build normal with statically linked internal lib without need for full static linkage	2023-09-29 22:16:33 +01:00
WitherOrNot	8f843ad4c3	Merge pull request #72 from whatdoineed2do/usage-validation-memleaks Usage validation and memleaks fixes	2023-09-27 04:42:08 -04:00
WitherOrNot	2753bf2a40	Update README.md	2023-09-26 23:05:22 -04:00
WitherOrNot	d17ada2e64	Merge pull request #73 from techguy16/master Add Discord Invite	2023-09-26 14:28:13 -04:00
techguy16	6685b38aac	Update README.md	2023-09-27 07:26:10 +13:00
techguy16	884d8c9703	Update README.md	2023-09-27 07:24:56 +13:00
whatdoineed2do/Ray	5ba2dbddd4	EC/BN memleak	2023-09-25 12:13:53 +01:00
whatdoineed2do/Ray	bf40bb6402	CLI moved to stack object	2023-09-25 12:13:43 +01:00
whatdoineed2do/Ray	12a041c380	BN_free() memleaks	2023-09-25 12:04:52 +01:00
whatdoineed2do/Ray	ecd9cd8dd2	office 2k7 enterprise must be given inst id	2023-09-25 11:26:28 +01:00
whatdoineed2do/Ray	6989ae6c94	ensure arg for -p	2023-09-25 11:21:42 +01:00
WitherOrNot	ac510f8253	Update README.md	2023-09-17 19:05:16 -04:00
WitherOrNot	72c42f66c9	Merge pull request #70 from pottzman/master Universal ConfirmationID	2023-09-07 13:34:10 -04:00
pottzman	759c4009ef	Merge pull request #16 from UMSKT/master test merge	2023-09-07 19:21:48 +10:00
pottzman	78c358c933	Merge pull request #15 from pottzman/ConfirmationID Universal ConfirmationID	2023-09-07 19:17:53 +10:00
pottzman	1d5e233c19	Update confid.cpp	2023-09-07 18:44:47 +10:00
pottzman	6c06732331	Update confid.cpp	2023-09-07 18:05:58 +10:00
pottzman	f347231362	Update confid.cpp	2023-09-07 17:29:07 +10:00
pottzman	a7e97e45ee	Update confid.cpp	2023-09-07 17:16:00 +10:00
pottzman	bf57c32eae	Merge pull request #12 from pottzman/ConfirmationID Universal ConfirmationID	2023-09-06 23:16:38 +10:00
pottzman	25db955b61	Update confid.cpp	2023-09-06 22:56:28 +10:00
pottzman	1aeceb28f1	Update confid.cpp	2023-09-06 21:56:53 +10:00
pottzman	b451a04f3c	Update confid.cpp	2023-09-06 21:32:12 +10:00
pottzman	3e5e03df4d	Update confid.cpp	2023-09-06 20:54:34 +10:00
pottzman	e3bdc93249	Update confid.cpp	2023-09-06 20:49:09 +10:00
pottzman	36b2eb3e7d	Update confid.cpp	2023-09-06 20:46:36 +10:00
TheTank20	49fefca596	Fix DOS compilation (Attempt 2)	2023-09-02 13:44:35 -04:00
TheTank20	178c9e0689	Fix DOS compilation (Attempt 1)	2023-09-02 13:43:03 -04:00
TheTank20	214d2d38a5	Merge pull request #68 from UMSKT/newline-fix	2023-09-02 13:16:56 -04:00
TheTank20	3ae078e3c5	update arg from nonewline to nonewlines	2023-09-02 11:53:09 -04:00
TheTank20	12e511b3a5	Update cli.cpp	2023-09-02 11:39:22 -04:00
TheTank20	21bac3b66c	Update cli.cpp	2023-09-02 11:37:41 -04:00
TheTank20	09842ace12	Update cli.h	2023-09-02 11:37:38 -04:00
TheTank20	0d016b8872	Update cli.cpp	2023-09-02 11:31:25 -04:00
TheTank20	b1743f4bff	fix name for FreeBSD	2023-09-02 11:17:52 -04:00
TheTank20	cc765edb4f	Merge pull request #61 from UMSKT/workflow-update	2023-09-02 11:11:47 -04:00
TheTank20	4d1b5d6681	Update README.md	2023-09-02 11:11:16 -04:00
TheTank20	f59d77bdd1	Merge branch 'master' into workflow-update	2023-09-02 10:43:12 -04:00
TheTank20	71cbd19017	Add universal Confirmation ID	2023-09-02 10:42:26 -04:00
TheTank20	974f400cfc	Revert "TEMP -- use -v"	2023-09-02 09:56:36 -04:00
TheTank20	a2d521c230	Update CMakeLists.txt	2023-09-02 09:55:20 -04:00
TheTank20	d53409f5bd	TEMP -- use -v	2023-09-02 09:51:35 -04:00
pottzman	2703e17f69	Update cli.cpp	2023-09-02 23:51:08 +10:00
TheTank20	680239bdb7	Merge branch 'cmake-fix' into master	2023-09-02 09:44:57 -04:00
pottzman	104bdb19e3	Update confid.cpp	2023-09-02 23:33:47 +10:00
pottzman	f2f859faeb	Update confid.h	2023-09-02 23:27:02 +10:00
pottzman	a2d9c46a4b	Update libumskt.cpp	2023-09-02 23:25:14 +10:00
TheTank20	f65533bbb3	macOS build is not static	2023-09-02 09:24:04 -04:00
pottzman	90e31b667a	Update cli.h	2023-09-02 23:23:59 +10:00
pottzman	492d245f86	Update cli.cpp added CLI options for confirmation ID generation	2023-09-02 23:22:53 +10:00
TheTank20	361a39e204	Fix macOS compilation (Attempt 1)	2023-09-02 09:20:54 -04:00
pottzman	31993afb62	Merge pull request #3 from UMSKT/master FE and FF BINK exclusions	2023-09-02 23:03:17 +10:00
WitherOrNot	b3f64e6330	fix typo	2023-09-02 00:59:34 -04:00
WitherOrNot	ccf93a0089	Merge pull request #51 from UMSKT/fe-ff-fix Add exclusions for FE and FF BINKs	2023-09-01 23:17:58 -04:00
WitherOrNot	ae391a5e50	Update cli.cpp	2023-09-01 22:43:32 -04:00
TheTank20	3620cf5af6	Update README.md	2023-09-01 19:54:08 -04:00
TheTank20	b7965f19e8	Delete test.md	2023-08-14 22:20:59 -04:00
TheTank20	52c9a57ea2	Create test.md	2023-08-14 22:16:07 -04:00
TheTank20	283df1c1fe	Update linux.yml	2023-08-14 22:01:07 -04:00
TheTank20	c1eb81490b	Update freebsd.yml	2023-08-14 22:01:01 -04:00
TheTank20	2ee6a99acd	Update macos.yml	2023-08-14 22:00:58 -04:00
TheTank20	1370a6ecff	Update windows.yml	2023-08-14 22:00:56 -04:00
TheTank20	e3a6b78407	Update dos-djgpp.yml	2023-08-14 21:59:25 -04:00
TheTank20	6ae5c9e435	Update windows.yml	2023-08-14 15:12:24 -04:00
TheTank20	a6bfaed6e8	Update macos.yml	2023-08-14 15:12:13 -04:00
TheTank20	f7b41a9810	Update linux.yml	2023-08-14 15:11:53 -04:00
TheTank20	e76eb7ac33	Update freebsd.yml	2023-08-14 15:11:35 -04:00
TheTank20	c91bbad69a	Update dos-djgpp.yml	2023-08-14 15:11:17 -04:00
TheTank20	75e81e7049	Update dos-djgpp.yml	2023-08-14 15:09:41 -04:00
TheTank20	e9131e45c8	Update freebsd.yml	2023-08-14 15:09:16 -04:00
TheTank20	c664ea7f9c	Update linux.yml	2023-08-14 15:08:52 -04:00
TheTank20	f95501b789	Update macos.yml	2023-08-14 15:08:24 -04:00
TheTank20	444f8c45c7	Allow manual workflows and auto workflows on all branches This lets workflows work on all branches without changing anything, and allows workflows to be activated manually.	2023-08-14 15:07:24 -04:00
Neo	45004623be	Why does the Github web editor commit tabs???	2023-07-28 16:17:57 -07:00
Neo	a4cb524fed	re-add removed comment	2023-07-28 16:16:31 -07:00
Neo	03ae90163a	cleaner cli.cpp fix	2023-07-28 16:15:37 -07:00
TheTank20	c1e9a0f021	add exclusions for FE and FF	2023-07-28 18:10:25 -05:00