Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 into fix-ci-macos-proxspace
# Conflicts: # CHANGELOG.md
This commit is contained in:
2 files changed
+2
-1
No files matched your search
@@ -5,6 +5,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 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
|
||||
- Fixed client build with `-march=x86-64-v3` (CentOS/RHEL 10 default) - false `-Wstringop-overflow` in the EMV AID list table (@r3wretrhy)
|
||||
|
||||
+1
-1
@@ -41,7 +41,7 @@ ifeq ($(PLATFORM),PM5)
|
||||
$(Q)$(CROSS_OBJCOPY) --gap-fill=0xff --pad-to 0x08004000 -O binary $^ $@
|
||||
else
|
||||
$(info [=] GENB $@)
|
||||
$(Q)$(CROSS_OBJCOPY) --gap-fill=0xff --pad-to 0x00104000 -O binary $^ $@
|
||||
$(Q)$(CROSS_OBJCOPY) --gap-fill=0xff --pad-to 0x00102000 -O binary $^ $@
|
||||
endif
|
||||
|
||||
fullimage.bin: ../armsrc/obj/fullimage.elf
|
||||
|
||||
Reference in new issue
Block a user