Merge upstream master into em4x50-liw-sync-fix-pr
Resolve CHANGELOG.md: keep both the EM4x50 entries and the CI and mfulc_des_brute entries from #3747. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
commit
2e0deeb160
10 files changed
+69
-43
No files matched your search
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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: |
|
||||
|
||||
@@ -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'
|
||||
|
||||
|
||||
@@ -21,14 +21,18 @@ 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'
|
||||
|
||||
# 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
|
||||
@@ -51,14 +55,18 @@ 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'
|
||||
|
||||
# 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
|
||||
@@ -82,14 +90,18 @@ 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'
|
||||
|
||||
# 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
|
||||
@@ -124,14 +136,18 @@ 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'
|
||||
|
||||
# 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
|
||||
|
||||
@@ -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: |
|
||||
|
||||
@@ -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
|
||||
@@ -99,12 +98,17 @@ 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
|
||||
|
||||
- uses: actions/checkout@v6
|
||||
- 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
|
||||
@@ -202,31 +206,36 @@ 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
|
||||
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 +243,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"
|
||||
@@ -5,6 +5,8 @@ This project uses the changelog in accordance with [keepchangelog](http://keepac
|
||||
## [unreleased][unreleased]
|
||||
- Fixed `lf em 4x50 rdbl/info/dump`, `lf search` - RM was sent into the tag data instead of the second listen window on strong, AC-coupled signals, so every command failed; reads now retry within 1 s (@abou28)
|
||||
- Added `lf em 4x50 config` - runtime EM4x50 reader timings, and `lf_em4x50_tune.lua` to sweep them; extended debug level captures the raw exchange for `data samples` (@abou28)
|
||||
- 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 CI - ProxSpace installs its packages again, WSL builds in its own file system, Ubuntu skips the slow Azure apt mirror (@matrix)
|
||||
- Fixed `recovery.bin` on the AT91 platforms - the bootrom is padded to 0x102000 again, so the OS image is at its load address (@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
|
||||
|
||||
@@ -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)
|
||||
|
||||
+1
-1
@@ -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}"
|
||||
|
||||
Reference in new issue
Block a user