feat: port CrypTool 1 to macOS and Linux

.github/workflows/linux.yml

@@ -0,0 +1,43 @@
+name: Linux
+
+on:
+  push:
+    branches: [main]
+  pull_request:
+  workflow_dispatch:
+
+concurrency:
+  group: linux-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  build:
+    runs-on: ubuntu-24.04
+    steps:
+      - uses: actions/checkout@v5
+      - name: Install dependencies
+        run: |
+          sudo apt-get update -qq
+          sudo apt-get install -y -qq ninja-build libwxgtk3.2-dev libssl-dev libgmp-dev libglu1-mesa-dev xvfb xauth
+      - name: Configure
+        run: cmake -S . -B build -G Ninja -DMFCWX_TESTS=ON -DCRYPTOOL_THIRDPARTY_TESTS=ON
+      - name: Build
+        run: ninja -C build
+      - name: Test
+        run: xvfb-run -a ctest --test-dir build --output-on-failure --timeout 300
+      - name: Start CrypTool
+        env:
+          MFCWX_SNAPSHOT_DIR: ${{ runner.temp }}/snapshots
+          MFCWX_SNAPSHOT_COUNT: 3
+          MFCWX_SNAPSHOT_DISMISS: 1
+          MFCWX_SNAPSHOT_INTERVAL: 3000
+        run: |
+          mkdir -p "$MFCWX_SNAPSHOT_DIR"
+          timeout 120 xvfb-run -a -s "-screen 0 1600x1000x24" build/port/app/CrypTool
+          ls "$MFCWX_SNAPSHOT_DIR"/*.png
+      - uses: actions/upload-artifact@v7
+        if: always()
+        with:
+          name: linux-snapshots
+          path: ${{ runner.temp }}/snapshots
+          if-no-files-found: ignore

.github/workflows/port-status.yml

@@ -0,0 +1,43 @@
+name: Port status
+
+on:
+  push:
+    branches: [xplat-port]
+  workflow_dispatch:
+
+permissions:
+  contents: write
+
+concurrency:
+  group: port-status
+  cancel-in-progress: true
+
+jobs:
+  status:
+    runs-on: macos-latest
+    steps:
+      - uses: actions/checkout@v5
+      - name: Install dependencies
+        run: brew install wxwidgets@3.2 openssl@3 gmp ninja cmake
+      - name: Measure
+        run: python3 port/tools/port_status.py
+      - name: Publish to the port-status branch
+        run: |
+          pub="$RUNNER_TEMP/port-status"
+          git init -q "$pub"
+          cd "$pub"
+          git config user.name "port-status-bot"
+          git config user.email "port-status-bot@users.noreply.github.com"
+          git remote add origin "$(git -C "$GITHUB_WORKSPACE" config --get remote.origin.url)"
+          git -C "$GITHUB_WORKSPACE" config --get-regexp '^http\..*\.extraheader$' | while read -r key value; do
+            git config "$key" "$value"
+          done
+          if git fetch -q --depth 1 origin port-status; then
+            git checkout -q -b port-status FETCH_HEAD
+          else
+            git checkout -q --orphan port-status
+          fi
+          cp "$GITHUB_WORKSPACE"/port/status/* .
+          git add badge.json status.json STATUS.md
+          git diff --cached --quiet || git commit -m "chore(status): update port status for ${GITHUB_SHA::8}"
+          git push origin port-status

.github/workflows/release.yml

@@ -0,0 +1,88 @@
+name: Release
+
+on:
+  push:
+    branches: [main]
+  pull_request:
+  workflow_dispatch:
+
+permissions:
+  contents: write
+
+jobs:
+  macos:
+    runs-on: macos-latest
+    steps:
+      - uses: actions/checkout@v5
+      - name: Install dependencies
+        run: brew install wxwidgets@3.2 openssl@3 gmp ninja cmake
+      - name: Build
+        run: |
+          cmake -S . -B build -G Ninja -DCMAKE_BUILD_TYPE=Release
+          ninja -C build
+      - name: Package
+        run: cd build && cpack -G DragNDrop
+      - uses: actions/upload-artifact@v7
+        with:
+          name: macos
+          path: build/CrypTool-*.dmg
+          if-no-files-found: error
+
+  linux:
+    strategy:
+      matrix:
+        runner: [ubuntu-24.04, ubuntu-24.04-arm]
+    runs-on: ${{ matrix.runner }}
+    steps:
+      - uses: actions/checkout@v5
+      - name: Install dependencies
+        run: |
+          sudo apt-get update -qq
+          sudo apt-get install -y -qq ninja-build libwxgtk3.2-dev libssl-dev libgmp-dev libglu1-mesa-dev xvfb xauth
+      - name: Build
+        run: |
+          cmake -S . -B build -G Ninja -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr
+          ninja -C build
+      - name: Start CrypTool
+        env:
+          MFCWX_SNAPSHOT_DIR: ${{ runner.temp }}/snapshots
+          MFCWX_SNAPSHOT_COUNT: 2
+          MFCWX_SNAPSHOT_DISMISS: 1
+          MFCWX_SNAPSHOT_INTERVAL: 3000
+        run: |
+          mkdir -p "$MFCWX_SNAPSHOT_DIR"
+          timeout 120 xvfb-run -a build/port/app/CrypTool
+          ls "$MFCWX_SNAPSHOT_DIR"/*.png
+      - name: Package
+        run: cd build && cpack -G "DEB;TGZ"
+      - uses: actions/upload-artifact@v7
+        with:
+          name: linux-${{ matrix.runner }}
+          path: |
+            build/CrypTool-*.deb
+            build/CrypTool-*.tar.gz
+          if-no-files-found: error
+
+  release:
+    needs: [macos, linux]
+    if: github.event_name != 'pull_request'
+    runs-on: ubuntu-24.04
+    steps:
+      - uses: actions/download-artifact@v8
+        with:
+          path: dist
+          merge-multiple: true
+      - uses: actions/checkout@v5
+        with:
+          sparse-checkout: CMakeLists.txt
+          sparse-checkout-cone-mode: false
+          path: src
+      - name: Create the release
+        env:
+          GH_TOKEN: ${{ github.token }}
+        run: |
+          version=$(sed -n 's/^project([^ ]* VERSION \([0-9.]*\).*/\1/p' src/CMakeLists.txt)
+          tag="v${version}-build.${GITHUB_RUN_NUMBER}"
+          ls -la dist
+          gh release create "$tag" dist/* --repo "$GITHUB_REPOSITORY" --target "$GITHUB_SHA" \
+            --title "CrypTool ${version} (build ${GITHUB_RUN_NUMBER})" --generate-notes

.gitignore

@@ -0,0 +1,8 @@
+build/
+build-*/
+port/secude/build*/
+port/thirdparty/build*/
+port/rc/test/build*/
+__pycache__/
+port/status/
+.DS_Store

CMakeLists.txt

@@ -0,0 +1,41 @@
+cmake_minimum_required(VERSION 3.20)
+
+project(CrypTool1 VERSION 1.4.43 LANGUAGES C CXX)
+
+set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
+if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
+    set(CMAKE_BUILD_TYPE RelWithDebInfo CACHE STRING "Build type" FORCE)
+endif()
+
+set(REPO_ROOT ${CMAKE_CURRENT_SOURCE_DIR})
+enable_testing()
+
+if(APPLE)
+    foreach(prefix /opt/homebrew/opt /usr/local/opt)
+        if(EXISTS ${prefix}/wxwidgets@3.2/bin/wx-config-3.2 AND NOT wxWidgets_CONFIG_EXECUTABLE)
+            set(wxWidgets_CONFIG_EXECUTABLE ${prefix}/wxwidgets@3.2/bin/wx-config-3.2)
+        endif()
+        if(EXISTS ${prefix}/openssl@3 AND NOT OPENSSL_ROOT_DIR)
+            set(OPENSSL_ROOT_DIR ${prefix}/openssl@3)
+        endif()
+    endforeach()
+endif()
+
+find_package(wxWidgets 3.2 REQUIRED COMPONENTS stc aui html gl adv xml core base)
+find_package(OpenSSL 3 REQUIRED)
+find_package(OpenGL REQUIRED)
+find_package(Threads REQUIRED)
+
+add_subdirectory(port/thirdparty)
+add_subdirectory(port/secude)
+if(TARGET secude_compat)
+    # The application is C++14; the library may use a newer standard internally.
+    set_property(TARGET secude_compat PROPERTY INTERFACE_COMPILE_FEATURES "")
+endif()
+add_subdirectory(port/mfcwx)
+add_subdirectory(port/app)
+
+option(CRYPTOOL_DIALOG_GALLERY "Build the dialog snapshot tool" OFF)
+if(CRYPTOOL_DIALOG_GALLERY)
+    add_subdirectory(port/tools/gallery)
+endif()

ChallengeResponse/ChallengeResponseDlg.cpp

@@ -72,30 +72,30 @@ BEGIN_MESSAGE_MAP(CChallengeResponseDlg, CDialog)
 	ON_WM_PAINT()
 	ON_WM_QUERYDRAGICON()
 	ON_WM_CREATE()
-	ON_BN_CLICKED(IDC_EXIT_BUTTON, OnExitButton)
-	ON_BN_CLICKED(IDC_START_RADIO, OnModeRadioButtons)
+	ON_BN_CLICKED(IDC_EXIT_BUTTON, &CChallengeResponseDlg::OnExitButton)
+	ON_BN_CLICKED(IDC_START_RADIO, &CChallengeResponseDlg::OnModeRadioButtons)
 	ON_WM_MOUSEMOVE()
-	ON_BN_CLICKED(IDC_ACTION_ATTACK_RADIO, OnChangeAction)
+	ON_BN_CLICKED(IDC_ACTION_ATTACK_RADIO, &CChallengeResponseDlg::OnChangeAction)
 	ON_WM_LBUTTONDOWN()
 	ON_WM_LBUTTONUP()
-	ON_BN_CLICKED(IDC_AUTHENTICATE_CLIENT_BUTTON, OnAuthenticateClientButton)
+	ON_BN_CLICKED(IDC_AUTHENTICATE_CLIENT_BUTTON, &CChallengeResponseDlg::OnAuthenticateClientButton)
 	ON_WM_DESTROY()
 	ON_WM_TIMER()
-	ON_BN_CLICKED(IDC_AUTHENTICATE_ATTACKER_BUTTON, OnAuthenticateAttackerButton)
-	ON_BN_CLICKED(IDC_CHECK_MASK, OnCheckMask)
-	ON_BN_CLICKED(IDC_SCENARIO_HELP_BUTTON, OnScenarioHelpButton)
-	ON_BN_CLICKED(IDC_RESET_BUTTON, OnResetButton)
-	ON_BN_CLICKED(IDC_HELP, OnHelp)
-	ON_BN_CLICKED(IDC_EINFUEHRUNG_RADIO, OnModeRadioButtons)
-	ON_BN_CLICKED(IDC_PASSWORT_RADIO, OnModeRadioButtons)
-	ON_BN_CLICKED(IDC_EINMALPASSWOERTER, OnModeRadioButtons)
-	ON_BN_CLICKED(IDC_CHALLENGERESPONSE1_RADIO, OnModeRadioButtons)
-	ON_BN_CLICKED(IDC_CHALLENGERESPONSE2_RADIO, OnModeRadioButtons)
-	ON_BN_CLICKED(IDC_WECHSELSEITIG_RADIO, OnModeRadioButtons)
-	ON_BN_CLICKED(IDC_ACTION_CONNECT_RADIO, OnChangeAction)
-	ON_BN_CLICKED(IDC_ACTION_DISCONNECT_RADIO, OnChangeAction)
-	ON_BN_CLICKED(IDC_ACTION_NOTHING_RADIO, OnChangeAction)
-	ON_BN_CLICKED(IDC_ACTION_REMOVE_ATTACK_RADIO, OnChangeAction)
+	ON_BN_CLICKED(IDC_AUTHENTICATE_ATTACKER_BUTTON, &CChallengeResponseDlg::OnAuthenticateAttackerButton)
+	ON_BN_CLICKED(IDC_CHECK_MASK, &CChallengeResponseDlg::OnCheckMask)
+	ON_BN_CLICKED(IDC_SCENARIO_HELP_BUTTON, &CChallengeResponseDlg::OnScenarioHelpButton)
+	ON_BN_CLICKED(IDC_RESET_BUTTON, &CChallengeResponseDlg::OnResetButton)
+	ON_BN_CLICKED((UINT)(UINT_PTR)IDC_HELP, &CChallengeResponseDlg::OnHelp)
+	ON_BN_CLICKED(IDC_EINFUEHRUNG_RADIO, &CChallengeResponseDlg::OnModeRadioButtons)
+	ON_BN_CLICKED(IDC_PASSWORT_RADIO, &CChallengeResponseDlg::OnModeRadioButtons)
+	ON_BN_CLICKED(IDC_EINMALPASSWOERTER, &CChallengeResponseDlg::OnModeRadioButtons)
+	ON_BN_CLICKED(IDC_CHALLENGERESPONSE1_RADIO, &CChallengeResponseDlg::OnModeRadioButtons)
+	ON_BN_CLICKED(IDC_CHALLENGERESPONSE2_RADIO, &CChallengeResponseDlg::OnModeRadioButtons)
+	ON_BN_CLICKED(IDC_WECHSELSEITIG_RADIO, &CChallengeResponseDlg::OnModeRadioButtons)
+	ON_BN_CLICKED(IDC_ACTION_CONNECT_RADIO, &CChallengeResponseDlg::OnChangeAction)
+	ON_BN_CLICKED(IDC_ACTION_DISCONNECT_RADIO, &CChallengeResponseDlg::OnChangeAction)
+	ON_BN_CLICKED(IDC_ACTION_NOTHING_RADIO, &CChallengeResponseDlg::OnChangeAction)
+	ON_BN_CLICKED(IDC_ACTION_REMOVE_ATTACK_RADIO, &CChallengeResponseDlg::OnChangeAction)
 	//}}AFX_MSG_MAP
 END_MESSAGE_MAP()
 
@@ -234,9 +234,9 @@ void CChallengeResponseDlg::OnMouseMove(UINT nFlags, CPoint point)
 
 	if (scenario.isMouseOverObject(m_action,point)){	
 
-		::SetClassLong(m_hWnd,GCL_HCURSOR,(LONG)hCmark);
+		::SetClassLongPtr(m_hWnd,GCLP_HCURSOR,(LONG_PTR)hCmark);
 	}else{
-		::SetClassLong(m_hWnd,GCL_HCURSOR,(LONG)hCstandard);
+		::SetClassLongPtr(m_hWnd,GCLP_HCURSOR,(LONG_PTR)hCstandard);
 	}
 	CDialog::OnMouseMove(nFlags, point);
 }

ChallengeResponse/Computer.cpp

@@ -58,7 +58,7 @@ bool CComputer::isMouseOverObject(CPoint &point)
 }
 
 
-void CComputer::setParameters(int x1, int y1, int x2, int y2, int borderWidth, CString &name, int textPosition, int dataPosition, bool isAttacker)
+void CComputer::setParameters(int x1, int y1, int x2, int y2, int borderWidth, const CString &name, int textPosition, int dataPosition, bool isAttacker)
 {
 	setParametersSO(x1,y1,x2,y2,borderWidth);
 	this->name=name;
@@ -95,8 +95,8 @@ void CComputer::draw(CClientDC &dc)
 
 	drawDataText(dc);
 
-	dc.SelectObject(&originalFont);
-	dc.SelectObject(&originalPen);
+	dc.SelectObject(originalFont);
+	dc.SelectObject(originalPen);
 }
 
 void CComputer::drawDataText(CClientDC &dc)
@@ -123,7 +123,7 @@ void CComputer::eraseDataText(CClientDC &dc)
 	dc.SetTextColor(white);
 	originalFont = dc.SelectObject(&dataFont);
 	drawDataText(dc);
-	dc.SelectObject(&originalFont);
+	dc.SelectObject(originalFont);
 }
 
 int CComputer::getX1()

ChallengeResponse/Computer.h

@@ -43,7 +43,7 @@ class CComputer : CScenarioObject
 
 
 	void draw(CClientDC& dc);
-	void setParameters(int x1,int y1, int x2, int y2, int borderwidth, CString& name, int textposition, int dataposition, bool isAttacker);
+	void setParameters(int x1,int y1, int x2, int y2, int borderwidth, const CString& name, int textposition, int dataposition, bool isAttacker);
 	bool isMouseOverObject(CPoint &point);
 
 	// eigene Variablen & Methoden

ChallengeResponse/Packet.cpp

@@ -59,7 +59,7 @@ void CPacket::draw(CClientDC &dc)
 	dc.MoveTo(x1+1,y2-1);
 	dc.LineTo(x2-1,y1+1);
 
-	dc.SelectObject(&originalPen);
+	dc.SelectObject(originalPen);
 }
 
 void CPacket::erase(CClientDC &dc)
@@ -73,7 +73,7 @@ void CPacket::erase(CClientDC &dc)
 	dc.MoveTo(x1,y2);
 	dc.LineTo(x2,y1);
 
-	dc.SelectObject(&originalPen);
+	dc.SelectObject(originalPen);
 }
 
 

ChallengeResponse/Scenario.cpp

@@ -25,7 +25,7 @@
 #include "stdafx.h"
 #include "Scenario.h"
 #include "ScenarioObject.h"
-#include "wire.h" 
+#include "Wire.h" 
 #include "resource.h" 
 
 #ifdef _DEBUG

ChallengeResponse/Wire.cpp

@@ -137,7 +137,7 @@ void CWire::draw(CClientDC& dc)
 		}
 	}
 
-	dc.SelectObject(&originalPen);
+	dc.SelectObject(originalPen);
 
 }
 

CrypTool/3DVisOpt.cpp

@@ -81,13 +81,13 @@ void C3DVisOpt::DoDataExchange(CDataExchange* pDX)
 
 BEGIN_MESSAGE_MAP(C3DVisOpt, CDialog)
 	//{{AFX_MSG_MAP(C3DVisOpt)
-	ON_NOTIFY(NM_RELEASEDCAPTURE, IDC_SLIDER_RESOLUTION, OnReleasedcaptureSliderResolution)
-	ON_NOTIFY(NM_RELEASEDCAPTURE, IDC_SLIDER_DENSITY, OnReleasedcaptureSliderDensity)
-	ON_NOTIFY(NM_RELEASEDCAPTURE, IDC_SLIDER_SHIFT, OnReleasedcaptureSliderShift)
-	ON_BN_CLICKED(IDC_RADIO_WORDSIZE_1, OnRadioWordsize1)
-	ON_BN_CLICKED(IDC_RADIO_WORDSIZE_2, OnRadioWordsize2)
-	ON_BN_CLICKED(IDC_RADIO_WORDSIZE_4, OnRadioWordsize4)
-	ON_BN_CLICKED(IDC_BUTTON_RESET, OnButtonReset)
+	ON_NOTIFY(NM_RELEASEDCAPTURE, IDC_SLIDER_RESOLUTION, &C3DVisOpt::OnReleasedcaptureSliderResolution)
+	ON_NOTIFY(NM_RELEASEDCAPTURE, IDC_SLIDER_DENSITY, &C3DVisOpt::OnReleasedcaptureSliderDensity)
+	ON_NOTIFY(NM_RELEASEDCAPTURE, IDC_SLIDER_SHIFT, &C3DVisOpt::OnReleasedcaptureSliderShift)
+	ON_BN_CLICKED(IDC_RADIO_WORDSIZE_1, &C3DVisOpt::OnRadioWordsize1)
+	ON_BN_CLICKED(IDC_RADIO_WORDSIZE_2, &C3DVisOpt::OnRadioWordsize2)
+	ON_BN_CLICKED(IDC_RADIO_WORDSIZE_4, &C3DVisOpt::OnRadioWordsize4)
+	ON_BN_CLICKED(IDC_BUTTON_RESET, &C3DVisOpt::OnButtonReset)
 	//}}AFX_MSG_MAP
 END_MESSAGE_MAP()