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}"