From 8953c8d88d20cfc8591676ecce8f7a058bef2b04 Mon Sep 17 00:00:00 2001 From: Gabriele Gristina Date: Fri, 6 Nov 2026 20:44:38 +0100 Subject: [PATCH 1/3] CI: fix the macOS and ProxSpace builds, build in the WSL file system mfulc_des_brute added the Homebrew openssl@3.6 include directory, which the macOS runners no longer have, and -Wmissing-include-dirs under -Werror stopped the build. It now uses brew --prefix openssl, as #3734 did for mfd_aes_brute. Since MSYS2 filesystem 2026.10.18 /etc/profile runs post-install scripts on the first start only, so ProxSpace never installed its packages and the build found no arm-none-eabi-gcc. The workflow now runs ProxSpace's setup script when setup\installed is missing. The third mfulc_des_brute test in pm3_tests.sh is now labelled 3/3. Co-Authored-By: Claude Opus 5.5 --- .github/workflows/windows.yml | 34 +++++++++++++++++++++------------- CHANGELOG.md | 3 +++ tools/mfulc_des_brute/Makefile | 5 +++-- tools/pm3_tests.sh | 2 +- 4 files changed, 28 insertions(+), 16 deletions(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 6cb9823c2..cf42ed83b 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -99,7 +99,12 @@ jobs: for ($i = 1; $i -le $maxAttempts; $i++) { Write-Host "Attempt $i..." ./runme64.bat -c "exit" - if ($LASTEXITCODE -eq 0) { exit 0 } + # MSYS2 runs post-install scripts on its first start only since filesystem 2026.10.18, + # so ProxSpace's package setup (it writes setup\installed) is sourced here + if ($LASTEXITCODE -eq 0 -and -not (Test-Path setup\installed)) { + ./runme64.bat -c ". /etc/post-install/09-proxspace_setup.post" + } + if ($LASTEXITCODE -eq 0 -and (Test-Path setup\installed)) { exit 0 } if ($i -lt $maxAttempts) { Start-Sleep -Seconds $delay } } exit 1 @@ -204,29 +209,34 @@ jobs: - uses: actions/checkout@v6 + # builds on the Windows drive (/mnt/d) are slow from WSL 2 + - name: Copy the sources into the WSL file system + run: cp -a . ~/proxmark3 + - name: make clean - run: make clean + run: cd ~/proxmark3 && make clean - name: Build - run: make -j$((`nproc` + 1)) V=1 + run: cd ~/proxmark3 && make -j$((`nproc` + 1)) V=1 - name: Test - run: make check + run: cd ~/proxmark3 && make check - name: make clean - run: make clean + run: cd ~/proxmark3 && make clean - name: Build btaddon - run: make -j$((`nproc` + 1)) V=1 PLATFORM_EXTRAS=BTADDON + run: cd ~/proxmark3 && make -j$((`nproc` + 1)) V=1 PLATFORM_EXTRAS=BTADDON - name: Test btaddon - run: make check + run: cd ~/proxmark3 && make check - name: make clean - run: make clean + run: cd ~/proxmark3 && make clean - name: Prepare cmake build folders run: | + cd ~/proxmark3 mkdir -p client/build ln -s ../cmdscripts client/build/ ln -s ../luascripts client/build/ @@ -234,12 +244,10 @@ jobs: ln -s ../lualibs client/build/ - name: Initiate cmake environment - run: cmake .. - working-directory: client/build/ + run: cd ~/proxmark3/client/build && cmake .. - name: Build cmake - run: make -j$((`nproc` + 1)) VERBOSE=1 - working-directory: client/build/ + run: cd ~/proxmark3/client/build && make -j$((`nproc` + 1)) VERBOSE=1 - name: Test cmake - run: make client/check CHECKARGS="--clientbin ./client/build/proxmark3" + run: cd ~/proxmark3 && make client/check CHECKARGS="--clientbin ./client/build/proxmark3" diff --git a/CHANGELOG.md b/CHANGELOG.md index 2f1d1f1b6..f75f2d130 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,9 @@ All notable changes to this project will be documented in this file. This project uses the changelog in accordance with [keepchangelog](http://keepachangelog.com/). Please use this to write notable changes, which is not the same as git commit log... ## [unreleased][unreleased] +- Fixed `mfulc_des_brute` build on macOS without `openssl@3.6` - OpenSSL is found with `brew --prefix openssl` as in `mfd_aes_brute` (@matrix) +- Fixed Windows ProxSpace CI - its package setup is sourced by the workflow, MSYS2 runs post-install scripts on the first start only (@matrix) +- Changed Windows WSL CI to build in the WSL file system (@matrix) - Updated `/Getting_Started_With_PM5.md` (@innocentbystanderproxmark) - Fixed `hf seos pacs`/`write` - 2K3DES GET/UPDATE DATA no longer fails silently with exit 236; print APDU exchange errors, check DES-CMAC, decode SELECT `85` at its real length, and use short-form `85` when the cryptogram is under 128 bytes - Fixed client build with `-march=x86-64-v3` (CentOS/RHEL 10 default) - false `-Wstringop-overflow` in the EMV AID list table (@r3wretrhy) diff --git a/tools/mfulc_des_brute/Makefile b/tools/mfulc_des_brute/Makefile index 0009385be..2b97d6c55 100644 --- a/tools/mfulc_des_brute/Makefile +++ b/tools/mfulc_des_brute/Makefile @@ -15,8 +15,9 @@ endif # OS X needs linking to openssl ifeq ($(USE_BREW),1) - MYCFLAGS += -I$(BREW_PREFIX)/opt/openssl@3/include -I$(BREW_PREFIX)/opt/openssl@3.6/include - MYLDFLAGS += -L$(BREW_PREFIX)/opt/openssl@3/lib -L$(BREW_PREFIX)/opt/openssl@3.6/lib + OPENSSL_PREFIX := $(shell brew --prefix openssl) + MYCFLAGS += -I$(OPENSSL_PREFIX)/include + MYLDFLAGS += -L$(OPENSSL_PREFIX)/lib endif ifeq ($(USE_MACPORTS),1) diff --git a/tools/pm3_tests.sh b/tools/pm3_tests.sh index 36f8a102b..6999c87d5 100755 --- a/tools/pm3_tests.sh +++ b/tools/pm3_tests.sh @@ -371,7 +371,7 @@ while true; do # ULCG if ! CheckExecute "mfulc_des_brute test 2/3" "$MFULCDESBRUTEBIN -c 49C1603621CCAA72 8122262EF5FA8DEB 48444C4A4044524200000000544E5846 3 4" "48444C4A40445242204E4042544E5846"; then break; fi # Reader RndB nonce key recovery - if ! CheckExecute "mfulc_des_brute test 2/3" "$MFULCDESBRUTEBIN -r EC9C5CF763244367 2283BFE8DEBE1780922327794D0706EF 48444C4A4044524200000000544E5846 3 4" "48444C4A40445242204E4042544E5846"; then break; fi + if ! CheckExecute "mfulc_des_brute test 3/3" "$MFULCDESBRUTEBIN -r EC9C5CF763244367 2283BFE8DEBE1780922327794D0706EF 48444C4A4044524200000000544E5846 3 4" "48444C4A40445242204E4042544E5846"; then break; fi fi if $TESTALL || $TESTCRYPTORF; then echo -e "\n${C_BLUE}Testing CryptoRF sma:${C_NC} ${CRYPTRFBRUTEBIN:=./tools/cryptorf/sma} ${CRYPTRF_MULTI_BRUTEBIN:=./tools/cryptorf/sma_multi}" From e9689307c89d63fb675f4020003cb4ce94dc3d36 Mon Sep 17 00:00:00 2001 From: Gabriele Gristina Date: Fri, 6 Nov 2026 21:28:47 +0100 Subject: [PATCH 2/3] CI: skip the slow Azure apt mirror, tidy the ProxSpace job The Ubuntu jobs drop azure.archive.ubuntu.com from the runner's mirror list. It sometimes serves at tens of kB/s, held apt-get install for up to 50 minutes and apt never fails over (actions/runner-images#14823). The ProxSpace job no longer asks for arm-none-eabi-gdb, which MSYS2 replaced with gdb-multiarch in 2023, and no longer persists the checkout credentials, whose cleanup failed with MSYS2's git on PATH. Co-Authored-By: Claude Opus 5.5 --- .github/workflows/ubuntu.yml | 24 ++++++++++++++++++++---- .github/workflows/windows.yml | 4 +++- CHANGELOG.md | 3 +-- 3 files changed, 24 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index ed93c0a5e..7c1dc9a91 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -27,8 +27,12 @@ jobs: with: python-version: '3.12' + # azure.archive.ubuntu.com can serve at tens of kB/s and apt does not fail + # over on slowness (actions/runner-images#14823): use the Ubuntu archive - name: Update apt repos - run: sudo apt-get update + run: | + sudo sed -i '/azure\.archive\.ubuntu\.com/d' /etc/apt/apt-mirrors.txt + sudo apt-get update - name: Install dependencies run: sudo apt-get install -yqq make build-essential ca-certificates pkg-config libreadline-dev gcc-arm-none-eabi libnewlib-dev qt6-base-dev libbz2-dev liblz4-dev libbluetooth-dev libpython3-dev python3 python3-dev libpython3-all-dev liblua5.4-dev liblua5.4-0 lua5.4 sed libssl-dev libgd-dev @@ -57,8 +61,12 @@ jobs: with: python-version: '3.12' + # azure.archive.ubuntu.com can serve at tens of kB/s and apt does not fail + # over on slowness (actions/runner-images#14823): use the Ubuntu archive - name: Update apt repos - run: sudo apt-get update + run: | + sudo sed -i '/azure\.archive\.ubuntu\.com/d' /etc/apt/apt-mirrors.txt + sudo apt-get update - name: Install dependencies run: sudo apt-get install -yqq make build-essential ca-certificates pkg-config libreadline-dev gcc-arm-none-eabi libnewlib-dev qt6-base-dev libbz2-dev liblz4-dev libbluetooth-dev libpython3-dev python3 python3-dev libpython3-all-dev liblua5.4-dev liblua5.4-0 lua5.4 sed libssl-dev libgd-dev @@ -88,8 +96,12 @@ jobs: with: python-version: '3.12' + # azure.archive.ubuntu.com can serve at tens of kB/s and apt does not fail + # over on slowness (actions/runner-images#14823): use the Ubuntu archive - name: Update apt repos - run: sudo apt-get update + run: | + sudo sed -i '/azure\.archive\.ubuntu\.com/d' /etc/apt/apt-mirrors.txt + sudo apt-get update - name: Install dependencies run: sudo apt-get install -yqq make build-essential ca-certificates pkg-config libreadline-dev gcc-arm-none-eabi libnewlib-dev qt6-base-dev libbz2-dev liblz4-dev libbluetooth-dev libpython3-dev python3 python3-dev libpython3-all-dev liblua5.4-dev liblua5.4-0 lua5.4 sed libssl-dev libgd-dev @@ -130,8 +142,12 @@ jobs: with: python-version: '3.12' + # azure.archive.ubuntu.com can serve at tens of kB/s and apt does not fail + # over on slowness (actions/runner-images#14823): use the Ubuntu archive - name: Update apt repos - run: sudo apt-get update + run: | + sudo sed -i '/azure\.archive\.ubuntu\.com/d' /etc/apt/apt-mirrors.txt + sudo apt-get update - name: Install dependencies run: sudo apt-get install -yqq make build-essential ca-certificates pkg-config libreadline-dev gcc-arm-none-eabi libnewlib-dev qt6-base-dev libbz2-dev liblz4-dev libbluetooth-dev libpython3-dev python3 python3-dev libpython3-all-dev liblua5.4-dev liblua5.4-0 lua5.4 sed libssl-dev libgd-dev diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index cf42ed83b..58a01d22c 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -56,7 +56,6 @@ jobs: ############################## mingw-w64-ucrt-x86_64-gcc mingw-w64-ucrt-x86_64-arm-none-eabi-gcc - mingw-w64-ucrt-x86_64-arm-none-eabi-gdb mingw-w64-ucrt-x86_64-arm-none-eabi-binutils mingw-w64-ucrt-x86_64-arm-none-eabi-newlib mingw-w64-ucrt-x86_64-readline @@ -109,7 +108,10 @@ jobs: } exit 1 + # no credentials to clean up after the job, when MSYS2's git is first on PATH - uses: actions/checkout@v6 + with: + persist-credentials: false # Prepend MSYS2 tools to PATH only for steps after checkout, so actions/checkout # keeps using the runner's native git (MSYS2's git.exe mangles refs like diff --git a/CHANGELOG.md b/CHANGELOG.md index f75f2d130..ae78e2576 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,8 +4,7 @@ This project uses the changelog in accordance with [keepchangelog](http://keepac ## [unreleased][unreleased] - Fixed `mfulc_des_brute` build on macOS without `openssl@3.6` - OpenSSL is found with `brew --prefix openssl` as in `mfd_aes_brute` (@matrix) -- Fixed Windows ProxSpace CI - its package setup is sourced by the workflow, MSYS2 runs post-install scripts on the first start only (@matrix) -- Changed Windows WSL CI to build in the WSL file system (@matrix) +- Fixed CI - ProxSpace installs its packages again, WSL builds in its own file system, Ubuntu skips the slow Azure apt mirror (@matrix) - Updated `/Getting_Started_With_PM5.md` (@innocentbystanderproxmark) - Fixed `hf seos pacs`/`write` - 2K3DES GET/UPDATE DATA no longer fails silently with exit 236; print APDU exchange errors, check DES-CMAC, decode SELECT `85` at its real length, and use short-form `85` when the cryptogram is under 128 bytes - Fixed client build with `-march=x86-64-v3` (CentOS/RHEL 10 default) - false `-Wstringop-overflow` in the EMV AID list table (@r3wretrhy) From 1e645dfd0a8ebb7373716066d23d85b002d36dd0 Mon Sep 17 00:00:00 2001 From: Gabriele Gristina Date: Fri, 6 Nov 2026 22:04:55 +0100 Subject: [PATCH 3/3] CI: update checkout, setup-python and upload-artifact to v7 actions/checkout v6 hands the Windows path of its credentials config to git config --unset as a regex, which MSYS2's git rejects in the ProxSpace job (actions/checkout#2528, fixed in v7.0.1). The persist-credentials: false added for it did not help and is dropped. Co-Authored-By: Claude Opus 5.5 --- .github/workflows/codeql-analysis.yml | 2 +- .github/workflows/fpga-pm3.yml | 4 ++-- .github/workflows/fpga-pm5.yml | 4 ++-- .github/workflows/macos.yml | 12 ++++++------ .github/workflows/ubuntu.yml | 16 ++++++++-------- .github/workflows/uniq.yaml | 2 +- .github/workflows/windows.yml | 7 ++----- 7 files changed, 22 insertions(+), 25 deletions(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 4f7990610..57a0d7301 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -53,7 +53,7 @@ jobs: if [ -f requirements.txt ]; then python3 -m pip install -r requirements.txt; fi - name: Checkout repository - uses: actions/checkout@v6 + uses: actions/checkout@v7 # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL diff --git a/.github/workflows/fpga-pm3.yml b/.github/workflows/fpga-pm3.yml index afe9a969c..9d122cbd2 100644 --- a/.github/workflows/fpga-pm3.yml +++ b/.github/workflows/fpga-pm3.yml @@ -28,7 +28,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v6 + - uses: actions/checkout@v7 # The image is 8 GB unpacked, so keep an eye on the runner's disk. - name: Pull the ISE image @@ -65,7 +65,7 @@ jobs: test "$size" -gt 1000 done - - uses: actions/upload-artifact@v6 + - uses: actions/upload-artifact@v7 with: name: fpga-pm3-bitstreams path: fpga/*.bit diff --git a/.github/workflows/fpga-pm5.yml b/.github/workflows/fpga-pm5.yml index 00076fff8..3684065fa 100644 --- a/.github/workflows/fpga-pm5.yml +++ b/.github/workflows/fpga-pm5.yml @@ -24,7 +24,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v6 + - uses: actions/checkout@v7 - name: Install oss-cad-suite run: | @@ -80,7 +80,7 @@ jobs: md5sum -c "$RUNNER_TEMP/bitstream.md5" - name: Upload the bitstream - uses: actions/upload-artifact@v6 + uses: actions/upload-artifact@v7 with: name: fpga-pm5-bitstream path: | diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 25daedb8d..3b80c52c4 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -21,9 +21,9 @@ jobs: runs-on: macos-latest steps: - - uses: actions/checkout@v6 + - uses: actions/checkout@v7 - - uses: actions/setup-python@v6 + - uses: actions/setup-python@v7 with: python-version: '3.12' @@ -65,9 +65,9 @@ jobs: runs-on: macos-latest steps: - - uses: actions/checkout@v6 + - uses: actions/checkout@v7 - - uses: actions/setup-python@v6 + - uses: actions/setup-python@v7 with: python-version: '3.12' @@ -110,9 +110,9 @@ jobs: runs-on: macos-latest steps: - - uses: actions/checkout@v6 + - uses: actions/checkout@v7 - - uses: actions/setup-python@v6 + - uses: actions/setup-python@v7 with: python-version: '3.12' diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index 7c1dc9a91..b197dc90e 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -21,9 +21,9 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v6 + - uses: actions/checkout@v7 - - uses: actions/setup-python@v6 + - uses: actions/setup-python@v7 with: python-version: '3.12' @@ -55,9 +55,9 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v6 + - uses: actions/checkout@v7 - - uses: actions/setup-python@v6 + - uses: actions/setup-python@v7 with: python-version: '3.12' @@ -90,9 +90,9 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v6 + - uses: actions/checkout@v7 - - uses: actions/setup-python@v6 + - uses: actions/setup-python@v7 with: python-version: '3.12' @@ -136,9 +136,9 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v6 + - uses: actions/checkout@v7 - - uses: actions/setup-python@v6 + - uses: actions/setup-python@v7 with: python-version: '3.12' diff --git a/.github/workflows/uniq.yaml b/.github/workflows/uniq.yaml index 210f6adf1..87b6dade8 100644 --- a/.github/workflows/uniq.yaml +++ b/.github/workflows/uniq.yaml @@ -18,7 +18,7 @@ jobs: check-unique: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@v6 + - uses: actions/checkout@v7 - name: check unique keys in dic files shell: bash run: | diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 58a01d22c..a13e583aa 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -108,10 +108,7 @@ jobs: } exit 1 - # no credentials to clean up after the job, when MSYS2's git is first on PATH - - uses: actions/checkout@v6 - with: - persist-credentials: false + - uses: actions/checkout@v7 # Prepend MSYS2 tools to PATH only for steps after checkout, so actions/checkout # keeps using the runner's native git (MSYS2's git.exe mangles refs like @@ -209,7 +206,7 @@ jobs: git config --global core.autocrlf false git config --global core.eol lf - - uses: actions/checkout@v6 + - uses: actions/checkout@v7 # builds on the Windows drive (/mnt/d) are slow from WSL 2 - name: Copy the sources into the WSL file system