Merge branch 'master' into bruteforce-smart-mode

2026-05-12 11:18:11 -07:00 · 2024-01-13 16:53:05 +00:00
parent 4003ad72fe 261760e903
commit 8e0e8e2240
1273 changed files with 74746 additions and 17013 deletions
@@ -9,7 +9,6 @@ assignees: doegox, iceman1001

 # Checklist

- [ ] CHANGELOG.md: add title: `## [releasename][YYYY-MM-DD]`
 - [ ] `make style`
 - [ ] `make miscchecks`
 - [ ] `make clean; make client CC=clang CXX=clang++ LD=clang++` on recent Debian or Ubuntu
@@ -44,14 +43,24 @@ Run `tools/release_tests.sh` on:

 # creating release

- [ ] `make release RELEASE_NAME="ice awesome"`
-  - last line of output,  gives you next command to run.
+- [ ] CHANGELOG.md: add title: `## [myreleasename][YYYY-MM-DD]`
+- [ ] `make release RELEASE_NAME="myreleasename"`
+  - last line of output gives you next command to run.
  - Sample:  `git push && git push origin v4.12345`
- [ ] CHANGELOG.md: edit title to add version info: `## [releasename.4.12345][YYYY-MM-DD]`
+- [ ] CHANGELOG.md: edit title to add version info: `## [myreleasename.4.12345][YYYY-MM-DD]`

 ## Step Github releases

 - [ ] Go to Github releases,  create release based on the new created tag and publish
+  - Choose a tag: v4.12345
+  - Target: master
+  - Set as the latest release
+  - Title: `proxmark3-v4.12345`
+  - Description:
+```
+Release v4.12345
+Nickname "myreleasename"
+```

 ## Step Homebrew updates

@@ -41,7 +41,7 @@ jobs:
      run: sudo apt-get update

    - name: Install dependencies
-      run: sudo apt-get install -yqq make autoconf build-essential ca-certificates pkg-config libreadline-dev gcc-arm-none-eabi libnewlib-dev qtbase5-dev libbz2-dev libbluetooth-dev libpython3-dev python3 python3-dev libpython3-all-dev liblua5.2-dev liblua5.2-0 lua5.2 sed libssl-dev
+      run: sudo apt-get install -yqq make autoconf build-essential ca-certificates pkg-config libreadline-dev gcc-arm-none-eabi libnewlib-dev qtbase5-dev libbz2-dev liblz4-dev libbluetooth-dev libpython3-dev python3 python3-dev libpython3-all-dev liblua5.2-dev liblua5.2-0 lua5.2 sed libssl-dev

    - name: Install Python dependencies
      run: |
@@ -70,7 +70,7 @@ jobs:
      env:
        V: 1
        PLATFORM_EXTRAS: BTADDON
-      run: make
+      run: make -j$((`nproc` + 1))

    - name: Perform CodeQL Analysis
      uses: github/codeql-action/analyze@v2
@@ -35,7 +35,7 @@ jobs:
        run: brew tap RfidResearchGroup/proxmark3

      - name: Install dependencies
-        run: brew install readline coreutils qt5 RfidResearchGroup/proxmark3/arm-none-eabi-gcc openssl
+        run: brew install readline coreutils qt5 RfidResearchGroup/proxmark3/arm-none-eabi-gcc openssl gd
        continue-on-error: true

      - name: Install Python dependencies
@@ -50,14 +50,12 @@ jobs:
      - name: Build
        env:
          V: 1
-        run: make
+        run: make -j$((`sysctl -n hw.ncpu` + 1))

      - name: Test
        run: make check

  macos-make-btaddon:
-    if: always()
-    needs: [macos-make]
    runs-on: macos-latest

    steps:
@@ -77,7 +75,7 @@ jobs:
        run: brew tap RfidResearchGroup/proxmark3

      - name: Install dependencies
-        run: brew install readline coreutils qt5 RfidResearchGroup/proxmark3/arm-none-eabi-gcc openssl
+        run: brew install readline coreutils qt5 RfidResearchGroup/proxmark3/arm-none-eabi-gcc openssl gd
        continue-on-error: true

      - name: Install Python dependencies
@@ -93,14 +91,12 @@ jobs:
        env:
          V: 1
          PLATFORM_EXTRAS: BTADDON
-        run: make
+        run: make -j$((`sysctl -n hw.ncpu` + 1))

      - name: Test
        run: make check

  macos-cmake:
-    if: always()
-    needs: [macos-make, macos-make-btaddon]
    runs-on: macos-latest

    steps:
@@ -120,7 +116,7 @@ jobs:
        run: brew tap RfidResearchGroup/proxmark3

      - name: Install dependencies
-        run: brew install readline coreutils qt5 RfidResearchGroup/proxmark3/arm-none-eabi-gcc openssl
+        run: brew install readline coreutils qt5 RfidResearchGroup/proxmark3/arm-none-eabi-gcc openssl gd
        continue-on-error: true

      - name: Install Python dependencies
@@ -144,7 +140,7 @@ jobs:
      - name: Build
        env:
          VERBOSE: 1
-        run: make
+        run: make -j$((`sysctl -n hw.ncpu` + 1))
        working-directory: client/build/

      - name: Test
@@ -26,7 +26,7 @@ jobs:
        run: sudo apt-get update

      - name: Install dependencies
-        run: sudo apt-get install -yqq make autoconf build-essential ca-certificates pkg-config libreadline-dev gcc-arm-none-eabi libnewlib-dev qtbase5-dev libbz2-dev libbluetooth-dev libpython3-dev python3 python3-dev libpython3-all-dev liblua5.2-dev liblua5.2-0 lua5.2 sed libssl-dev
+        run: sudo apt-get install -yqq make autoconf build-essential ca-certificates pkg-config libreadline-dev gcc-arm-none-eabi libnewlib-dev qtbase5-dev libbz2-dev liblz4-dev libbluetooth-dev libpython3-dev python3 python3-dev libpython3-all-dev liblua5.2-dev liblua5.2-0 lua5.2 sed libssl-dev libgd-dev

      - name: Install Python dependencies
        run: |
@@ -41,14 +41,12 @@ jobs:
      - name: Build
        env:
          V: 1
-        run: make
+        run: make -j$((`nproc` + 1))

      - name: Test
        run: make check

  ubuntu-make-btaddon:
-    if: always()
-    needs: [ubuntu-make]
    runs-on: ubuntu-latest

    steps:
@@ -58,7 +56,7 @@ jobs:
        run: sudo apt-get update

      - name: Install dependencies
-        run: sudo apt-get install -yqq make autoconf build-essential ca-certificates pkg-config libreadline-dev gcc-arm-none-eabi libnewlib-dev qtbase5-dev libbz2-dev libbluetooth-dev libpython3-dev python3 python3-dev libpython3-all-dev liblua5.2-dev liblua5.2-0 lua5.2 sed libssl-dev
+        run: sudo apt-get install -yqq make autoconf build-essential ca-certificates pkg-config libreadline-dev gcc-arm-none-eabi libnewlib-dev qtbase5-dev libbz2-dev liblz4-dev libbluetooth-dev libpython3-dev python3 python3-dev libpython3-all-dev liblua5.2-dev liblua5.2-0 lua5.2 sed libssl-dev libgd-dev

      - name: Install Python dependencies
        run: |
@@ -74,14 +72,12 @@ jobs:
        env:
          V: 1
          PLATFORM_EXTRAS: BTADDON
-        run: make
+        run: make -j$((`nproc` + 1))

      - name: Test
        run: make check

  ubuntu-cmake:
-    if: always()
-    needs: [ubuntu-make, ubuntu-make-btaddon]
    runs-on: ubuntu-latest

    steps:
@@ -91,7 +87,7 @@ jobs:
        run: sudo apt-get update

      - name: Install dependencies
-        run: sudo apt-get install -yqq make autoconf build-essential ca-certificates pkg-config libreadline-dev gcc-arm-none-eabi libnewlib-dev qtbase5-dev libbz2-dev libbluetooth-dev libpython3-dev python3 python3-dev libpython3-all-dev liblua5.2-dev liblua5.2-0 lua5.2 sed libssl-dev
+        run: sudo apt-get install -yqq make autoconf build-essential ca-certificates pkg-config libreadline-dev gcc-arm-none-eabi libnewlib-dev qtbase5-dev libbz2-dev liblz4-dev libbluetooth-dev libpython3-dev python3 python3-dev libpython3-all-dev liblua5.2-dev liblua5.2-0 lua5.2 sed libssl-dev libgd-dev

      - name: Install Python dependencies
        run: |
@@ -115,7 +111,7 @@ jobs:
      - name: Build
        env:
          VERBOSE: 1
-        run: make
+        run: make -j$((`nproc` + 1))
        working-directory: client/build/

      - name: Test
@@ -18,6 +18,5 @@ jobs:
      - name: check unique keys in dic files
        shell: bash
        run: |
-          find . -type f -name "*.dic" | xargs -I {} sh -c "echo {} && cat {} | grep -v '#' | sort | uniq -i -d -c | sort -n -r "
-          if [[ $(find . -type f -name "*.dic" | xargs -I {} sh -c "echo {} && cat {} | grep -v '#' | sort | uniq -i -d -c | sort -n -r " | grep -v "./" | wc -l) -gt 0 ]]; then exit 1; fi
-          
+          find . -type f -name "*.dic" | xargs -I {} sh -c "echo {} && cat {} | sed 's/ *#.*//;/^$/d' | sort | uniq -i -d -c | sort -n -r "
+          if [[ $(find . -type f -name "*.dic" | xargs -I {} sh -c "echo {} && cat {} | sed 's/ *#.*//;/^$/d' | sort | uniq -i -d -c | sort -n -r " | grep -v '^\./' | wc -l) -gt 0 ]]; then exit 1; fi
@@ -54,7 +54,7 @@ jobs:
        run: make clean

      - name: Build
-        run: make V=1
+        run: make -j $([System.Environment]::ProcessorCount + 1) V=1

      - name: Test
        run: make check
@@ -63,7 +63,7 @@ jobs:
        run: make clean

      - name: Build btaddon
-        run: make V=1 PLATFORM_EXTRAS=BTADDON
+        run: make -j $([System.Environment]::ProcessorCount + 1) V=1 PLATFORM_EXTRAS=BTADDON

      - name: Test btaddon
        run: make check
@@ -84,7 +84,7 @@ jobs:
        working-directory: client/build/

      - name: Build cmake
-        run: make VERBOSE=1
+        run: make -j $([System.Environment]::ProcessorCount + 1) VERBOSE=1
        working-directory: client/build/

      - name: Test cmake
@@ -110,6 +110,7 @@ jobs:
            gcc-arm-none-eabi
            libnewlib-dev
            libbz2-dev
+            liblz4-dev
            qtbase5-dev
            cmake
            libpython3-dev
@@ -118,6 +119,7 @@ jobs:
            python3-dev
            libpython3-all-dev
            libssl-dev
+            libgd-dev

      - name: Install Python dependencies
        run: |
@@ -140,7 +142,7 @@ jobs:
        run: make clean

      - name: Build
-        run: make V=1
+        run: make -j$((`nproc` + 1)) V=1

      - name: Test
        run: make check
@@ -149,7 +151,7 @@ jobs:
        run: make clean

      - name: Build btaddon
-        run: make V=1 PLATFORM_EXTRAS=BTADDON
+        run: make -j$((`nproc` + 1)) V=1 PLATFORM_EXTRAS=BTADDON

      - name: Test btaddon
        run: make check
@@ -170,7 +172,7 @@ jobs:
        working-directory: client/build/

      - name: Build cmake
-        run: make VERBOSE=1
+        run: make -j$((`nproc` + 1)) VERBOSE=1
        working-directory: client/build/

      - name: Test cmake
@@ -68,6 +68,7 @@ luac
 tools/fpga_compress/fpga_compress
 tools/mfkey/mfkey32
 tools/mfkey/mfkey64
+tools/mfkey/staticnested
 tools/nonce2key/nonce2key
 tools/cryptorf/cm
 tools/cryptorf/sm
@@ -79,18 +80,9 @@ tools/jtag_openocd/openocd_configuration
 tools/mfd_aes_brute/mfd_aes_brute
 tools/mfd_aes_brute/mfd_multi_brute
 tools/mfd_aes_brute/brute_key
+!tools/lena.bmp

-fpga/*
-!fpga/tests
-!fpga/fpga_lf.bit
-!fpga/fpga_hf.bit
-!fpga/*.v
-!fpga/Makefile
-!fpga/fpga.ucf
-!fpga/xst_lf.scr
-!fpga/xst_hf.scr
-!fpga/go.bat
-!fpga/sim.tcl
+fpga/__build*

 # offcial dumps folder
 dumps/*
@@ -39,7 +39,7 @@ function print_config {
 function setup_serial_port {
 	if [ -z "$SerialPort" ]; then
 		pm3list=$($VSCODEPATH/../pm3 --list 2>/dev/null)
-		#Use first port listed 
+		#Use first port listed
 		export SerialPort=$(echo $pm3list | head -n 1 | cut -c 4-)
 		if [ -z "$SerialPort" ]; then
 			echo >&2 "[!!] No serial port found, please set SerialPort manually"
@@ -129,17 +129,17 @@ fi

 HOSTOS=$(uname | awk '{print toupper($0)}')
 if [ "$HOSTOS" = "LINUX" ]; then
-    if uname -a|grep -q Microsoft; then
+	if uname -a|grep -q Microsoft; then
 		setup_wsl
-    else
+	else
 		setup_linux
-    fi
+	fi
 elif [ "$HOSTOS" = "DARWIN" ]; then
 	echo >&2 "[!!] MacOS not supported, sorry!"
 	exit 1
 elif [[ "$HOSTOS" =~ MINGW(32|64)_NT* ]]; then
 	setup_ps
 else
-    echo >&2 "[!!] Host OS not recognized, abort: $HOSTOS"
-    exit 1
+	echo >&2 "[!!] Host OS not recognized, abort: $HOSTOS"
+	exit 1
 fi
@@ -6,7 +6,7 @@ Copyright (C) 2005-2007 Jonathan Westhues

 Since then, each contribution is under the copyright of its respective author.

-A few releases were done by the Proxmark community between 2007 and March 2009 before using version control.  
+A few releases were done by the Proxmark3 community between 2007 and March 2009 before using version control.  
 The last release which served as basis for version control, under SVN then migrated to Git, was the `20090306_ela` release by Edouard Lafargue. See the first commit of this repository.

 Therefore, only the following copyright notices are left untouched in the corresponding files:
@@ -1,8 +1,191 @@
-# Change Log
+ Change Log
 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]
+ - Changed `prefs set client.debug` - now also toggles the client side APDU logging (@iceman1001)
+ - Changed `hf 14b sriwrbl` - now supports --force to override block checks. Thanks @gentilkiwi for the idea! (@iceman1001)
+ - Changed `hf 14b sriwrbl` - now tries to verify the write (@iceman1001)
+ - Changed `hf 14b apdu` - now supports tearoff (@iceman1001)
+ - Fixed `hf 14b raw` - fixed a potential write out of bounds. (@iceman1001)
+ - Fixed `hf 14b` commands got some serious overhaul and love. Better return values and packet handling (@iceman1001)
+ - Changed `hf waveshare` - image is automatically scaled and cropped to match panel size (@socram8888)
+ - Changed `hf waveshare` - image loading and processing is now done using [GDlib](https://github.com/libgd/libgd) (@socram8888)
+ - Added trace of sniffed SEOS traffic between reader and card (@iceman1001)
+ - Change `hf seos list` - print crc and annotate better (@iceman1001) 
+ - Added troubleshooting entry - ARM architecture error (@francis2054)
+ - Fixed `lf pyramid sim` - wrong parameter handling (@iceman1001)
+ - Fixed bootloader - Ignore jitters when pressing the button (@wh201906)
+
+## [Steamboat Willie.4.17768][2024-01-03]
+ - Changed `mem spiffs dump -t` - now supports downloading direct into trace buffer (@hazardousvoltage)
+ - Changed `hf search` - added hints for all HF protocols we search for (@iceman1001)
+ - Changed `hf search` - added hint for iClass (@bettse)
+ - Changed `hf 14a apdu` - It now uses the FWI and SGFI values from the ATS to determine an appropriate timeout (@nvx)
+ - Added a thread to check when device comes online again. It will connect and update prompt (@iceman1001)
+ - Changed CLI offline prompt - replaces the old prompt when offline is detected (@iceman100)
+ - Changed `hf mf info` - it now uses found keys to try identify Gen2 cards (@iceman1001)
+ - Changed `hf 14a info` - disabled debug logging while performing the magic tests (@iceman1001)
+ - Changed `hf 14a info` - magic detection to better detect different GDM/USCUID configurations and improved Gen2/CUID detection when default keys are used (@nvx)
+ - Changed `hf_cardhopper` - standalone mode to allow running over the internal Proxmark3 USB-CDC serial port (@nvx)
+ - Fixed CLI prompt - Update connection type prompt after running `hw connect` (@wh201906)
+ - Changed `uart_receive()` - Check if TCP connection is lost (@wh201906)
+ - Change `data detectclock` - now tries all clocks if called w/o any params (@iceman1001)
+ - Changed `lf search -1u` - improved the autocorrelation detection for unknown signals (@iceman1001)
+ - Fixed `hf emrtd dump` stack smashing on device side (@iceman1001)
+ - Changed `dbprint` on device side to use max 200 chars strings. (@iceman1001)
+ - Fixed bootloader to correctly clear bss segment on start. Fixes USB serial number sometimes not working in the bootloader (@nvx)
+ - Changed `notes on downgrade attacks` - reworked the original text follow repo style (@iceman1001)
+ - Added `hf mf info` command and static encrypted nonce detection (@merlokk)
+ - Added Saflok KDF - generate MFC keys (@h1kari)
+ - Changed `lf fdx demod` - now raw bytes shows all data (@iceman1001)
+ - Changed `data num` - now can print reversed and inverse (@iceman1001)
+ - Fixed `hf mf sim -ix` never returning console (@datatags)
+ - Added standalone mode `hf_unisniff` combining 14a/14b/15 sniffing with extra flash save options (@hazardousvoltage)
+ - Added encryption and other SL3 functions for Mifare Plus - more to come (@team-orangeBlue)
+ - Fixed the corrupted data in real-time sampling (@wh201906)
+ - Added a slider in the plot window for navigation (@wh201906)
+ - Fixed client build bug with Python 3.12 (@wh201906)
+ - Fixed `ExchangeAPDUSC()` in `cmdsmartcard.c` to prevent client crash (@wh201906)
+ - Added real-time LF sampling support (@wh201906)
+ - Changed `hf 14a info` - now reads and prints QL88 sigantures (@iceman1001)
+ - Fixed `hf iclass dump` truncating AA2 blocks and improve reliability (@nvx)
+ - Added some info about UMC in "doc/magic_cards_notes.md" (@temskiy)
+ - Added `hw bootloader` to reboot to the bootloader mode (@wh201906)
+
+## [Faraday.4.17511][2023-11-13]
+ - Fixed Python support of `experimental_client_with_swig` (@doegox)
+ - Use proxmark3 as a generic smartcard reader with other software with `smart relay` (@gm3197)
+ - Added `tools\mfkeys\staticnested` - program to recover static nested keys (@iceman1001)
+ - Added `pm3_gen_dictionary.py` - python script to extract and save all keys from MFC dump files. (@iceman1001)
+ - Changed `hf mfu info` - now detect MIFARE Ultralight AES (@iceman1001)
+ - Changed `hf mf autopwn` - now supports multiple user supplied keys (@iceman1001)
+ - Added `hf mf gchpwd` command for change Gen4 GTU card access password (@merlokk)
+ - Added `--ms` option in `hw status` to specify the timeout of connection speed test (@wh201906)
+ - Added `hf mf ginfo` command for get info about Gen4 GTU configuration (@merlokk)
+ - Added support for loading Flipper PICOPASS dump files (@iceman1001)
+ - Fixed unknown chip identification (@jmichelp)
+ - Fixed `nfc decode` - now properly handles MFU dump files (@iceman1001)
+ - Added support for loading Flipper MCT/MFU dump files (@iceman1001)
+ - Changed `data bmap` - now default `-m` is 8 (@iceman1001)
+ - Added support for NTAG424 cards. (@dankar)
+ - Additional fixes to configcard code for keyroll mode based on nfc-iclass output (@Antiklesys)
+ - Changed lf sampling - improved the performance (@yah01)
+ - Added `bind` option for network connections to specify the outbound address and port (@wh201906)
+ - Changed `lf em 4x05 dump` - now supports the `--ns` nosave parameter (@iceman1001)
+ - Fixed some wrong synchronization waits in usb_write() to increase the communication speed (@wh201906)
+ - Added new command `data bmap` - breaks down a hexvalue to a binary template (@iceman1001)
+ - Changed aid_desfire.json - added entreis from the Metrodroid project (@iceman1001)
+ - Changed mad.json - added entries from the Metrodroid project (@iceman1001)
+ - Changed `hf iclass dump` - now allow no save of dumped data (@iceman1001)
+ - Changed `hf iclass calcnewkey` - Added calculations for old key elite and new key non elite (@Antiklesys)
+ - Changed the CLI prompt to show tcp/udp if used (@iceman1001)
+ - Changed `hw ping` - now shows transfer time (@doegox)
+ - Added `hf mf encodehid` - writes HID legacy credential to a empty MFC (@iceman1001)
+ - Added `hf iclass sam` - Added support for HID SAM Picopass communications (@iceman1001)
+ - Add support for quoted arguments in the CLI, allowing spaces in them which
+   are removed automatically (@jmichelp)
+ - Added UDP support on Windows (@wh201906)
+ - Added client communication timeout to preferences (@iceman1001)
+ - Added IPv6 support (@wh201906)
+ - Fixed `lf hid clone --bin` - now correctly handles sentinel bits (@iceman1001)
+ - Experimental UDP support in linux (@iceman1001, @wh201906)
+ - Changed CI scripts to speed up the builds (@wh201906)
+ - Changed the timeout of local TCP connections (@wh201906)
+ - Finalized implementation of configcard generation for keyroll when cardhelper is not present (@Antiklesys)
+ - Added documentation for compiling on iOS (@The-SamminAter)
+ - Fixed `hf iclass wrbl` - pagemap bit map for secured is now handled better (@iceman1001)
+ - Changed `hf iclass view/decrypt` to detect SIO lengths better and show if legacy credentials are encrypted (@nvx)
+ - Changed the json file formats for mfc, 14b, 15, legic, cryptorf, ndef (@iceman1001)
+ - Deprecated the EML file format when saving dump files. (@iceman1001)
+ - Added `sim014.bin` - new sim module firmware v4.42 with improved ISO7816 Protocol T0 support (@gentilkiwi)
+ - Added datasheet for sim module (@iceman1001)
+ - Changed `smart raw --timeout` - allows for a custom timeout (@iceman1001)
+ - Changed `lf t55 detectp1` - now also accepts 0xE039 Silicon Craft Tech as valid card (@iceman1001)
+ - Fixed `utils.lua` library function "convertdectohex" wasn't working (@iceman1001)
+ - Added `hf iclass creditepurse` command to allow crediting the epurse debit value (@nvx)
+ - Modified `hf iclass configcard` to only support online mode (@Antiklesys)
+ - Modified `hf iclass configcard` command to generate config cards without a cardhelper module by porting the contents of blocks 6 & 7 from nfc-iclass (@Antiklesys)
+ - Fixed `hf iclass info` command showing incorrectly in offline mode (@Antiklesys)
+ - The "doc/magic_cards_notes.md" file has been rebuilt, filled up, and so on. (@team-orangeBlue)
+
+## [Raccoon.4.17140][2023-09-09]
+ - Changed text and adjust pm3_test case for mf_aes_brute (@doegox)
+ - Fix CPPChecker warnings (@doegox)
+ - Fix TubmleWeed docker setup (@doegox)
+ - Added default keys (@ernestask) (@craftbyte)
+ - Fixed MFU authentication to send PACK correctly (@shallax)
+ - Fixed list output when line has 16 bytes (@piru)
+ - Changed AIDlist w new entries (@kormax)
+ - Swapped to OE1 for Shallow modulation on RDV4. Thanks to @gentilkiwi for testing (@d18c7db)
+ - Changed iClass SIO and Legacy credential detection to be more reliable (@nvx)
+ - Add hf_cardhopper standalone mode for long-distance relay attacks (@startrekdude)
+ - Added `hf iclass esetblk` - set iClass emulator memory block data (@nvx)
+ - Added cryptorf regressiontests (@iceman1001)
+ - Fixed `cryptorf/sma_multi` - local state used in multithread (@iceman1001)
+ - Changed `fpga_compress` - better deallocation of memory and closing of file handles (@iceman1001)
+ - Changed `hf search` - less swaps of fpga images on device side (@iceman1001)
+ - Changed `mkversion.sh` - now regenerates version_pm3.c (and consequently the binaries) only when needed (@doegox)
+ - Added `data atr` - a command to lookup ATR (@iceman1001)
+ - Fixed bug in ATR lookup fct, thanks @DidierA  (@iceman1001)
+ - Updated ATR list (@iceman1001)
+ - Changed `mem load -m` - now correctly erase all allocated flash memory (@iceman1001)
+ - Fixed emulator quick dump to handle MFC Ev1 extra sectors (@iceman100)
+ - Removed some empty dump files (@iceman1001)
+ - Added a fct to choose fpga mode (@iceman1001)
+ - Changed `hf mf eload/gsave` - fast uploading to emulator memory (@iceman1001)
+ - Added empty dump files with keys for easy simulation (@iceman1001)
+ - Added `hf 15 view` - view ISO15693 dump files (@iceman1001)
+ - Fixed `hf iclass config` - now loops correct in keyroll generation (@iceman1001)
+ - Added `hf iclass sam` - skeleton command (@iceman1001)
+ - Changed `lf cotag demo` - a new decoder (@iceman1001)
+ - Changed `hf legic view/eview/info` - now in verbose mode will print raw hex dump (@iceman1001)
+ - Added new test for cotag demod using data commands in pm3_test.sh (@iceman1001)
+ - Added new sample trace file for cotag w fc/272. Thanks s1acky! (@iceman1001)
+ - Fixed `hf legic eload` - now it doesn't crash client (@doegox)
+ - Changed `lf hitag *` - rework client side (@doegox)
+ - Changed data commands to handle ask/nrz clocks above 256 (@iceman1001)
+ - Added `data envelope` - almost acts like data askedgedetect (@iceman1001)
+ - Added `data cthreshold` - acts like an inverted dirtythreshold command. Remove center values (@iceman1001)
+ - Added `hf mfp list` - interprets MIFARE Plus commands in traces (@DidierA)
+ - Changed `hf legic sim` - loop and return codes on deviceside updated to DEFINES (@iceman1001)
+ - Changed `hf legic einfo` - now accepts the three different cardsizes as params (@iceman1001)
+ - Fixed `lf cotag reader -1` - now doesn't fail (@iceman1001)
+ - Added support for LZ4 compressed hardnested tables (@doegox)
+ - Changed `emv reader -v` - now tries to print found transactions logs (@iceman1001)
+ - Added ISO4217 currency lookup (@iceman1001)
+ - Fixed bad free in loadfilebinarykey fct.  Thanks to @gentilkiwi
+ - Changed `emv reader -v` - now can decode track1/2 data if found (@iceman1001)
+ - Added `emv reader` - act as a EMV reader (@iceman1001)
+ - Added support for Apple Wallet NFC Passes with the Value Added Services protocol implementation (@gm3197)
+ - Fixed compiling liblua on iOS (@The-SamminAter)
+ - Changed `hf_mf_luxeo_dump.lua` - now have list of keys to iterate (@iceman1001)
+ - Fixed the timeout of TCP connections (@wh201906)
+ - Added `hw timeout` - make the connection timeout configurable (@wh201906)
+
+## [Seven.4.16717][2023-06-25]
+ - Change `hf 14a info` - now identifes QL88 tags (@iceman1001)
+ - Added support for compiling on iOS (@The-SamminAter)
+ - Fixed viewing MFC dump - border char is now white (@iceman1001)
+ - Changed `data diff` - to print filenames in header if it fits (@iceman1001)
+ - Changed viewing MFC dump files - it now colors ACL + GPB bytes (@iceman1001)
+ - Added `hf mf supercard --furui` - now supports key recovery from Furui detection card. Thanks foxushka! (@iceman1001)
+ - Added `hf topaz dump --ns` - now supports nosave param (@iceman1001)
+ - Changed `hf topaz rdbl` - unified output (@iceman1001)
+ - Fixed `hf topaz wrbl` - now supports tear off and write_nonerase command (@iceman1001)
+ - Fixed `hf mf` commands (@iceman1001)
+ - Fixed `hf mfp` commands (@iceman1001)
+ - Added more default keys (@iceman1001)  Thanks anon!
+ - Fixed `pm3-flash-all` shell script now correctly identify the if running on outdated bootloader (@iceman1001)
+ - Fixed `hf 15693/iclass sniff` trace timings (@nvx)
+ - Fixed LegicCash segment handling in `hf_legic.lua` script (@jmichelp)
+ - Fixed `trace list` - now handles marking of crc bytes w color a bit better (@iceman1001)
+ - Changed `hf mfu pwdgen -r` - now generates pwd/pack for Philips Sonicare, thanks @ckuenzi, @atc1441 (@iceman1001)
+ - Changed `hf mfu info` - now detects Philips Sonicare devices (@iceman1001)
+ - Fixed truncated FPGA upload due to incorrect integer size variable (@d18c7db)
+ - Changed `usart btfactory` - handles the new BT board with version "BT SPP V3.0" (@iceman1001)
+ - Changed `hf mf eview --sk` - now can extract keys and save to file (@iceman1001)
+ - Changed `hf mf view --sk` - now can extract keys and save to file (@iceman1001)
 - Changed `hf mf sim` - reduce 6ms threshold to 4ms for reset to idle #1974 (@net147)
 - Rebuilt the Spartan-2 `fpga_*.bit` files to include the `hi_iso14443a.v` update (@d18c7db)
 - Added minor orphaned change from `hi_iso14443a.v` in `fpga-xc3s100e` to `hi_iso14443a.v` in `fpga-xc2s30` (@d18c7db)
@@ -22,12 +205,12 @@ This project uses the changelog in accordance with [keepchangelog](http://keepac
 - Changed `hf mf supercard` - Support editing UID and recovery of keys from second generation card (@AloneLiberty)
 - Added iClass credit key to default iClass key table and reorganized key order (@GuruSteve)
 - Changed `hf mf value` - ability to use transfer on different block (@AloneLiberty)
- - Change `hf mf dump --ns` - dump command now supports `no save` of MFC card memory (@iceman1001)
+ - Changed `hf mf dump --ns` - dump command now supports `no save` of MFC card memory (@iceman1001)
 - Added `hf mf gdmsetcfg` - Supprt Gen4 GDM write configuration block (@iceman1001)
 - Added `hf mf gdmcfg` - Support Gen4 GDM read configuration block (@iceman1001)
 - Changed magic note to include a section about GDM tags (@iceman1001)
 - Added `hf mf gdmsetblk` - Support Gen4 GDM write block (@iceman1001)
- - Changed `hf 14a info` - detect Gen GDM magic tags (@iceman1001) 
+ - Changed `hf 14a info` - detect Gen GDM magic tags (@iceman1001)
 - Changed CLI max string argument length limit from 512 to 4096 (@iceman1001)
 - Fixed `data asn1` - now handles bad input better (@iceman1001)
 - Added new public key for signature MIFARE Plus Troika (@iceman100)
@@ -62,11 +245,13 @@ This project uses the changelog in accordance with [keepchangelog](http://keepac
 - Added `hf legic info` command for other sources (@0xdeb)
 - Added `hf legic einfo` - views emulator menory (@0xdeb)
 - Changed `hf legic view` - now also print the decoded info of the dump file (@0xdeb)
- - Now `script run hf_mf_ultimatecard.lua -u` supports 10bytes UID (@alejandro12120)
- - Update documentation for installation on macOS with MacPorts (@linuxgemini)
+ - Changed `script run hf_mf_ultimatecard.lua -u` to support 10bytes UID (@alejandro12120)
+ - Updated documentation for installation on macOS with MacPorts (@linuxgemini)
 - Added possible Paxton id to hitag2 tag info output
 - Changed `hf mf sim` - reduce 50ms threshold to 6ms for reset to idle #1974 (@net147)
 - Update `amiibo_tools.lua` with new identifiers and create a python script `update_amiibo_tools_lua.py` to automate the process in the future. (@CorySolovewicz)
+ - Added `lf paradox sim --fc --cn` - Simulates Paradox fob from facility code and card number (jerji)
+

 ## [Nitride.4.16191][2023-01-29]
 - Changed `build_all_firmwares.sh` to fit GENERIC 256kb firmware images (@doegox)
@@ -83,11 +268,11 @@ This project uses the changelog in accordance with [keepchangelog](http://keepac
 - Changed `hf mfu info` - now also does a simple OTP fingerprinting (@iceman1001)
 - Changed `hf mf wrbl` - now checks for strict readonly ACL's in the data to write (@iceman1001)
 - Changed `hf mf view` - verbose printing if strict readonly ACL's exists in dump file (@iceman1001)
- - Add command `piv authsign` to get a buffer signed by the selected key (@jmichelp)
- - Add command `piv scan` which tries to read all known containers on PIV (@jmichelp)
- - Add support for PIV commands, over wired and contactless interfaces (@jmichelp)
- - Add `--shallow` option to `hf iclass` reader commands to do shallow (ASK) reader modulation instead of OOK (@nvx)
- - Improved NXP SLI/SLIX series tag identification (@nvx)
+ - Added command `piv authsign` to get a buffer signed by the selected key (@jmichelp)
+ - Added command `piv scan` which tries to read all known containers on PIV (@jmichelp)
+ - Added support for PIV commands, over wired and contactless interfaces (@jmichelp)
+ - Added `--shallow` option to `hf iclass` reader commands to do shallow (ASK) reader modulation instead of OOK (@nvx)
+ - Change and improved NXP SLI/SLIX series tag identification (@nvx)
 - Fixed buffer overflow in "lf em 4x05 sniff" (@HeinrichsH)
 - Fixed potential NULL array printing (@jmichelp)
 - Added PIV aid to resource file (@jmichelp)
@@ -95,14 +280,14 @@ This project uses the changelog in accordance with [keepchangelog](http://keepac
 - Fixed length check in sim module communications (@jmichelp)
 - Changed timings in i2c.c when communicating with sim module (@iceman1001)
 - Moved to non-deprecated API to initialize Python interpreter (@jmichelp)
- - Changed `sc upgrade` updated firmware v4.13 (RDV40) - frame buffer is now 384 bytes (@sentiprox) 
+ - Changed `sc upgrade` updated firmware v4.13 (RDV40) - frame buffer is now 384 bytes (@sentiprox)
 - Fixed contact interface / smartcard APDU chaining logic and allow 256 bytes ADPU payload. Need SIM firmware 4.13 to work (@jmichelp)
 - Fixed `lf hitag dump` - Should now work as described in the command help (@natmchugh)
 - Fixed SPI flash overflow when loading dictionnaries into flash. Breaking change: added 1 more sector for Mifare - dictionnaries should be loaded again (@jmichelp)
 - Added `hf mf gload, gsave, ggetblk, gsetblk` for Gen4 GTU in mifare classic mode (@DidierA)
 - Fixed `trace list -r` (relative times) not working unless `-u` (microseconds) was specified, and made `--frame` respect `-u` and `-r` options (@nvx)
 - Added detection of magic Gen4 GTU (@DidierA)
- - Added luascript `hf_i2c_plus_2k_utils` - Script for dumping/modifying user memory of sectors 0 and 1 (@flamebarke) 
+ - Added luascript `hf_i2c_plus_2k_utils` - Script for dumping/modifying user memory of sectors 0 and 1 (@flamebarke)
 - Added `hf mfu esave` - saves emulator memory to mfu dump file (@DidierA)
 - Added luascript `hf_mfu_ntag` - Script for configuring NTAG216 configuration pages (@flamebarke)
 - Changed `hf mf hardnested` - a detection for static encrypted nonces (@iceman1001)
@@ -216,6 +401,8 @@ This project uses the changelog in accordance with [keepchangelog](http://keepac
 - Added new standalone mode `lf_em4100rsww` (@zabszk)
 - Fixed `hf 15 slixdisable` wrong pass id (@r1ddl3rz)
 - Added `script run hf_mf_hid_sim.lua` (@micsen)
+ - Added flashmem support in `HF_14BSNIFF` standalone mode (@wh201906)
+ - Changed `HF_14ASNIFF` standalone mode - now supports Proxmark3 without flashmem (@wh201906)

 ## [Frostbit.4.14831][2022-01-11]
 - Changed Wiegand format lookup - now case-insensitive (@iceman1001)
@@ -29,17 +29,17 @@ ifneq (,$(DESTDIR))
    endif
 endif

-all clean install uninstall check: %: client/% bootrom/% armsrc/% recovery/% mfkey/% nonce2key/% mf_nonce_brute/% mfd_aes_brute/% fpga_compress/%
+all clean install uninstall check: %: client/% bootrom/% armsrc/% recovery/% mfkey/% nonce2key/% mf_nonce_brute/% mfd_aes_brute/% fpga_compress/% cryptorf/%
 # hitag2crack toolsuite is not yet integrated in "all", it must be called explicitly: "make hitag2crack"
 #all clean install uninstall check: %: hitag2crack/%

 INSTALLTOOLS=pm3_eml2lower.sh pm3_eml2upper.sh pm3_mfdread.py pm3_mfd2eml.py pm3_eml2mfd.py pm3_amii_bin2eml.pl pm3_reblay-emulating.py pm3_reblay-reading.py
-INSTALLSIMFW=sim011.bin sim011.sha512.txt sim013.bin sim013.sha512.txt
+INSTALLSIMFW=sim011.bin sim011.sha512.txt sim013.bin sim013.sha512.txt sim014.bin sim014.sha512.txt
 INSTALLSCRIPTS=pm3 pm3-flash pm3-flash-all pm3-flash-bootrom pm3-flash-fullimage
 INSTALLSHARES=tools/jtag_openocd traces
 INSTALLDOCS=doc/*.md doc/md

-install: all common/install
+install: common/install

 common/install:
 	$(info [@] Installing common resources to $(MYDESTDIR)$(PREFIX)...)
@@ -109,6 +109,9 @@ endif
 	$(Q)-$(INSTALLSUDO) $(RMDIR_SOFT) $(DESTDIR)$(PREFIX)$(PATHSEP)$(INSTALLSHARERELPATH)

 # tests
+cryptorf/check: FORCE
+	$(info [*] CHECK $(patsubst %/check,%,$@))
+	$(Q)$(BASH) tools/pm3_tests.sh $(CHECKARGS) $(patsubst %/check,%,$@)
 mfkey/check: FORCE
 	$(info [*] CHECK $(patsubst %/check,%,$@))
 	$(Q)$(BASH) tools/pm3_tests.sh $(CHECKARGS) $(patsubst %/check,%,$@)
@@ -145,6 +148,9 @@ common/check: FORCE
 check: common/check
 	$(info [*] ALL CHECKS DONE)

+cryptorf/%: FORCE
+	$(info [*] MAKE $@)
+	$(Q)$(MAKE) --no-print-directory -C tools/cryptorf $(patsubst cryptorf/%,%,$@) DESTDIR=$(MYDESTDIR)
 mfkey/%: FORCE
 	$(info [*] MAKE $@)
 	$(Q)$(MAKE) --no-print-directory -C tools/mfkey $(patsubst mfkey/%,%,$@) DESTDIR=$(MYDESTDIR)
@@ -170,7 +176,7 @@ client/%: FORCE cleanifplatformchanged
 	$(info [*] MAKE $@)
 	$(Q)$(MAKE) --no-print-directory -C client $(patsubst client/%,%,$@) DESTDIR=$(MYDESTDIR)
 recovery/all: bootrom/all armsrc/all
-recovery/install: bootrom/all armsrc/all
+recovery/install: bootrom/install armsrc/install
 recovery/%: FORCE cleanifplatformchanged
 	$(info [*] MAKE $@)
 	$(Q)$(MAKE) --no-print-directory -C recovery $(patsubst recovery/%,%,$@) DESTDIR=$(MYDESTDIR)
@@ -196,6 +202,7 @@ help:
 	@echo "+ recovery        - Make bootrom and fullimage files for JTAG flashing"
 	@echo
 	@echo "+ client          - Make only the OS-specific host client"
+	@echo "+ cryptorf        - Make tools/cryptorf"
 	@echo "+ mfkey           - Make tools/mfkey"
 	@echo "+ nonce2key       - Make tools/nonce2key"
 	@echo "+ mf_nonce_brute  - Make tools/mf_nonce_brute"
@@ -232,6 +239,8 @@ fullimage/uninstall: armsrc/uninstall

 recovery: recovery/all

+cryptorf: cryptorf/all
+
 mfkey: mfkey/all

 nonce2key: nonce2key/all
@@ -318,10 +327,10 @@ style:
 	# Make sure python3 is installed
 	@command -v python3 >/dev/null || ( echo "Please install 'python3' package first" ; exit 1 )
 	# Update commands.json, patch port in case it was run under Windows
-	[ -x client/proxmark3 ] && client/proxmark3 --fulltext | sed 's#com[0-9]#/dev/ttyacm0#'|python3 client/pyscripts/pm3_help2json.py - doc/commands.json
+	[ -x client/proxmark3 ] && client/proxmark3 --fulltext | sed 's#com[0-9]#/dev/ttyACM0#'|python3 client/pyscripts/pm3_help2json.py - doc/commands.json

 	# Update the readline autocomplete autogenerated code
-	[ -x client/proxmark3 ] && client/proxmark3 --fulltext | python3 client/pyscripts/pm3_help2list.py - client/src/pm3line_vocabulory.h
+	[ -x client/proxmark3 ] && client/proxmark3 --fulltext | python3 client/pyscripts/pm3_help2list.py - client/src/pm3line_vocabulary.h


 # Detecting weird codepages and tabs.
@@ -370,10 +379,10 @@ release:
 	# - Tagging temporarily...
 	@git tag -a -m "Release $(VERSION) - $(RELEASE_NAME)" $(VERSION)
 	# - Changing default version information based on new tag
-	@$(SH) tools/mkversion.sh > common/default_version_pm3.c.tmp && $(MV) common/default_version_pm3.c.tmp common/default_version_pm3.c
+	@$(SH) tools/mkversion.sh --force common/default_version_pm3.c
 	# - Removing mkversion calls
 	@sed -i 's#^.*\.\./tools/mkversion.sh.*|| #\t$$(Q)#' client/Makefile bootrom/Makefile armsrc/Makefile
-	@sed -i '/COMMAND/s/sh .*|| //' client/CMakeLists.txt
+	@sed -i '/COMMAND/s/sh .*|| //' client/CMakeLists.txt client/experimental_lib/CMakeLists.txt
 	# - Deleting tag...
 	@git tag -d $(VERSION)
 	# - Amending commit...
@@ -75,7 +75,15 @@ else
 endif

 ifeq ($(platform),Darwin)
-  USE_BREW ?= 1
+    ifeq ($(shell uname -p),arm64)
+        # The platform is iOS
+        USE_BREW ?= 0
+        # iOS refuses to compile unless this is set
+        export IPHONEOS_DEPLOYMENT_TARGET=11.0
+    else
+        # M* macOS devices return arm
+        USE_BREW ?= 1
+    endif
  USE_MACPORTS ?= 0
  AR= /usr/bin/ar rcs
  RANLIB= /usr/bin/ranlib
@@ -132,6 +140,10 @@ ifeq ($(shell expr $(CC_VERSION) \>= 10), 1)
  endif
 endif
 ifeq ($(platform),Darwin)
+  ifeq ($(shell uname -p),arm64)
+    # iOS will refuse to compile without the minimum target of iOS 11.0
+    DEFCFLAGS += -mios-version-min=11.0
+  endif
  # their readline has strict-prototype issues
  DEFCFLAGS += -Wno-strict-prototypes
  # some warnings about braced initializers on structs we want to ignore
@@ -158,6 +170,8 @@ GCCEXTRACFLAGS += -Wold-style-declaration -Wno-error=old-style-declaration
 GCCEXTRACFLAGS += -Woverride-init
 GCCEXTRACFLAGS += -Wshift-negative-value
 GCCEXTRACFLAGS += -Wunused-but-set-parameter -Wno-error=unused-but-set-parameter
+# enable gcc static analysis
+GCCEXTRACFLAGS += -fanalyzer
 ifeq ($(GCCEXTRA),1)
  DEFCFLAGS += $(GCCEXTRACFLAGS) $(EXTRACFLAGS)
 endif
@@ -6,6 +6,7 @@ PLATFORM=PM3RDV4
 # If you want more than one PLATFORM_EXTRAS option, separate them by spaces:
 #PLATFORM_EXTRAS=BTADDON
 #PLATFORM_EXTRAS=FLASH
+#PLATFORM_EXTRAS=SMARTCARD
 #PLATFORM_EXTRAS=BTADDON FLASH
 #STANDALONE=LF_SAMYRUN

@@ -1,4 +1,4 @@
-# Iceman Fork - Proxmark3 a RFID / NFC project.
+# Iceman Fork - Proxmark3

 The Proxmark3 is the swiss-army tool of RFID, allowing for interactions with the vast majority of RFID tags on a global scale. Originally built by Jonathan Westhues, the device is now the goto tool for RFID Analysis for the enthusiast. Iceman repository is considered to be the pinnacle of features and functionality, enabling a huge range of extremely useful and convenient commands and LUA scripts to automate chip identification, penetration testing, and programming

@@ -10,24 +10,25 @@ The Proxmark3 is the swiss-army tool of RFID, allowing for interactions with the

 | Actions OSX CI |  Actions Ubuntu CI | Actions Windows CI |
 |:--------------:|:------------------:|:------------------:|
-| ![MacOS Build and Test](https://github.com/RfidResearchGroup/proxmark3/workflows/MacOS%20Build%20and%20Test/badge.svg?branch=master) | ![Ubuntu Build and Test](https://github.com/RfidResearchGroup/proxmark3/workflows/Ubuntu%20Build%20and%20Test/badge.svg?branch=master) | [![Windows Build and Test](https://github.com/RfidResearchGroup/proxmark3/actions/workflows/windows.yml/badge.svg?branch=master)](https://github.com/RfidResearchGroup/proxmark3/actions/workflows/windows.yml) |
-
+| [![MacOS Build and Test](https://github.com/RfidResearchGroup/proxmark3/actions/workflows/macos.yml/badge.svg?branch=master)](https://github.com/RfidResearchGroup/proxmark3/actions/workflows/macos.yml) | [![Ubuntu Build and Test](https://github.com/RfidResearchGroup/proxmark3/actions/workflows/ubuntu.yml/badge.svg?branch=master)](https://github.com/RfidResearchGroup/proxmark3/actions/workflows/ubuntu.yml) | [![Windows Build and Test](https://github.com/RfidResearchGroup/proxmark3/actions/workflows/windows.yml/badge.svg?branch=master)](https://github.com/RfidResearchGroup/proxmark3/actions/workflows/windows.yml) |

 # Table of Contents
- 1. [PROXMARK3 INSTALLATION AND OVERVIEW](#proxmark3-installation-and-overview)
- 2. [Notes / helpful documents](#notes--helpful-documents)
- 3. [How to build?](#how-to-build)
-     1. [Proxmark3 RDV4](#proxmark3-rdv4)
-     2. [Generic Proxmark3 platforms](#generic-proxmark3-platforms)
- 4. [What has changed?](#what-has-changed)
- 5. [Development](#development)
- 6. [Supported operative systems](#supported-operative-systems)
- 7. [Precompiled binaries](#precompiled-binaries)
- 8. [Proxmark3 GUI](#proxmark3-gui)
- 9. [Official channels](#official-channels)
-10. [Maintainers](#maintainers)
-11. [Citation](#citation)
-12. [Copyright and licensing terms](#copyright-and-licensing-terms)
+- [Iceman Fork - Proxmark3](#iceman-fork---proxmark3)
+- [Table of Contents](#table-of-contents)
+- [PROXMARK3 INSTALLATION AND OVERVIEW](#proxmark3-installation-and-overview)
+  - [Notes / helpful documents](#notes--helpful-documents)
+- [How to build?](#how-to-build)
+  - [Proxmark3 RDV4](#proxmark3-rdv4)
+  - [Generic Proxmark3 platforms](#generic-proxmark3-platforms)
+- [What has changed?](#what-has-changed)
+- [Development](#development)
+  - [Supported operative systems](#supported-operative-systems)
+  - [Precompiled binaries](#precompiled-binaries)
+  - [Proxmark3 GUI](#proxmark3-gui)
+  - [Official channels](#official-channels)
+  - [Maintainers](#maintainers)
+  - [Citation](#citation)
+  - [Copyright and licensing terms](#copyright-and-licensing-terms)

 # PROXMARK3 INSTALLATION AND OVERVIEW

@@ -35,11 +36,12 @@ The Proxmark3 is the swiss-army tool of RFID, allowing for interactions with the
 | :------------------: | :------------------: |
 | [Linux - Setup and Build](/doc/md/Installation_Instructions/Linux-Installation-Instructions.md) | [Compilation Instructions](/doc/md/Use_of_Proxmark/0_Compilation-Instructions.md)|
 | [Linux - Important notes on ModemManager](/doc/md/Installation_Instructions/ModemManager-Must-Be-Discarded.md) | [Validating Proxmark3 Client Functionality](/doc/md/Use_of_Proxmark/1_Validation.md)|
-| [Mac OS X - Homebrew & Upgrading HomeBrew Tap Formula](/doc/md/Installation_Instructions/Mac-OS-X-Homebrew-Installation-Instructions.md) | [First Use and Verification](/doc/md/Use_of_Proxmark/2_Configuration-and-Verification.md)|
-| [Mac OS X - MacPorts](/doc/md/Installation_Instructions/Mac-OS-X-MacPorts-Installation-Instructions.md) | [Commands & Features](/doc/md/Use_of_Proxmark/3_Commands-and-Features.md)|
-| [Mac OS X - Setup and Build](/doc/md/Installation_Instructions/Mac-OS-X-Compile-From-Source-Instructions.md) ||
+| [macOS - Homebrew & Upgrading HomeBrew Tap Formula](/doc/md/Installation_Instructions/macOS-Homebrew-Installation-Instructions.md) | [First Use and Verification](/doc/md/Use_of_Proxmark/2_Configuration-and-Verification.md)|
+| [macOS - MacPorts](/doc/md/Installation_Instructions/macOS-MacPorts-Installation-Instructions.md) | [Commands & Features](/doc/md/Use_of_Proxmark/3_Commands-and-Features.md)|
+| [macOS - Setup and Build](/doc/md/Installation_Instructions/macOS-Compile-From-Source-Instructions.md) ||
 | [Windows - Setup and Build](/doc/md/Installation_Instructions/Windows-Installation-Instructions.md) ||
 | [Termux / Android - Setup and Build](/doc/termux_notes.md) ||
+| [iOS - Setup and Build](/doc/md/Installation_Instructions/iOS-Installation-Instructions.md)
 | [Blue Shark Manual](/doc/bt_manual_v10.md) | [Command Cheat Sheet](/doc/cheatsheet.md)|
 | [Advanced Compilation Parameters](/doc/md/Use_of_Proxmark/4_Advanced-compilation-parameters.md) | [More Cheat Sheets](https://github.com/RfidResearchGroup/proxmark3/wiki/More-cheat-sheets)|
 | [Troubleshooting](/doc/md/Installation_Instructions/Troubleshooting.md) | [Complete Client Command Set](/doc/commands.md) |
@@ -58,7 +60,7 @@ The Proxmark3 is the swiss-army tool of RFID, allowing for interactions with the
 |[Developing standalone mode](/armsrc/Standalone/readme.md)|[Wiki about standalone mode](https://github.com/RfidResearchGroup/proxmark3/wiki/Standalone-mode)|[Notes on Magic UID cards](/doc/magic_cards_notes.md)|
 |[Notes on Color usage](/doc/colors_notes.md)|[Makefile vs CMake](/doc/md/Development/Makefile-vs-CMake.md)|[Notes on Cloner guns](/doc/cloner_notes.md)|
 |[Notes on cliparser usage](/doc/cliparser.md)|[Notes on clocks](/doc/clocks.md)|[Notes on MIFARE DESFire](/doc/desfire.md)|
-|[Notes on CIPURSE](/doc/cipurse.md)|[Notes on NDEF type4a](/doc/ndef_type4a.md)||
+|[Notes on CIPURSE](/doc/cipurse.md)|[Notes on NDEF type4a](/doc/ndef_type4a.md)|[Notes on downgrade attacks](/doc/hid_downgrade.md)|

 # How to build?

@@ -77,6 +79,7 @@ We define generic Proxmark3 platforms as following devices.
  - Ryscorp green PCB version
  - Radiowar black PCB version
  - numerous Chinese adapted versions of the RDV3 easy (kkmoon, PiSwords etc)
+  - Proxmark3 SE  (Second edition)  (BLE enabled)

 **Not supported**
 - ⚠  Proxmark Evolution (EVO) 
@@ -96,8 +99,6 @@ We define generic Proxmark3 platforms as following devices.
   - **Note**: unknown device hw
 -  ⚠ Proxmark3 Ultimate
   - **Note**: unknown device hw
-  ⚠ Proxmark3 SE
-   - **Note**: unknown device hw

 When it comes to these new unknown models we are depending on the community to report in if this repo works and what they did to make it work.

@@ -184,7 +185,8 @@ This repo compiles nicely on
   - Windows/MinGW environment
   - Ubuntu, ParrotOS, Gentoo, Pentoo, Kali, NetHunter, Arch Linux, Fedora, Debian, Raspbian
   - Android / Termux
-   - Mac OS X / Homebrew (or MacPorts, experimental) / Apple Silicon M1
+   - macOS / Homebrew (or MacPorts, experimental) / Apple Silicon M1
+   - iOS (Jailbroken, rootful)
   - Docker container
      - [ Iceman repo based ubuntu 18.04 container ](https://hub.docker.com/r/secopsconsult/proxmark3)
      - [ Iceman fork based container v1.7 ](https://hub.docker.com/r/iceman1001/proxmark3/)
@@ -69,8 +69,6 @@ static dmabuf8_t dma_8 = {
    .buf = NULL
 };

-
-
 // trace related variables
 static uint32_t trace_len = 0;
 static bool tracing = true;
@@ -99,6 +97,11 @@ uint8_t *BigBuf_get_EM_addr(void) {

    return emulator_memory;
 }
+
+uint32_t BigBuf_get_hi(void) {
+    return s_bigbuf_hi;
+}
+
 /*
 uint32_t BigBuf_get_EM_size(void) {
    return CARD_MEMORY_SIZE;
@@ -129,7 +132,7 @@ void BigBuf_Clear_keep_EM(void) {
 // allocate a chunk of memory from BigBuf. We allocate high memory first. The unallocated memory
 // at the beginning of BigBuf is always for traces/samples
 uint8_t *BigBuf_malloc(uint16_t chunksize) {
-    if (s_bigbuf_hi < chunksize)
+    if (s_bigbuf_hi < (chunksize + 3))
        return NULL; // no memory left

    chunksize = (chunksize + 3) & 0xfffc; // round to next multiple of 4
@@ -142,7 +145,7 @@ uint8_t *BigBuf_malloc(uint16_t chunksize) {
 uint8_t *BigBuf_calloc(uint16_t chunksize) {
    uint8_t *mem = BigBuf_malloc(chunksize);
    if (mem != NULL) {
-        memset(mem, 0x00, chunksize);
+        memset(mem, 0x00, ((chunksize + 3) & 0xfffc)); // round to next multiple of 4
    }
    return mem;
 }
@@ -233,7 +236,7 @@ uint32_t BigBuf_get_traceLen(void) {
  by 'hf list -t raw', alternatively 'hf list -t <proto>' for protocol-specific
  annotation of commands/responses.
 **/
-bool RAMFUNC LogTrace(const uint8_t *btBytes, uint16_t iLen, uint32_t timestamp_start, uint32_t timestamp_end, uint8_t *parity, bool reader2tag) {
+bool RAMFUNC LogTrace(const uint8_t *btBytes, uint16_t iLen, uint32_t timestamp_start, uint32_t timestamp_end, const uint8_t *parity, bool reader2tag) {
    if (tracing == false) {
        return false;
    }
@@ -290,7 +293,7 @@ bool RAMFUNC LogTrace(const uint8_t *btBytes, uint16_t iLen, uint32_t timestamp_
 }

 // specific LogTrace function for ISO15693: the duration needs to be scaled because otherwise it won't fit into a uint16_t
-bool LogTrace_ISO15693(const uint8_t *bytes, uint16_t len, uint32_t ts_start, uint32_t ts_end, uint8_t *parity, bool reader2tag) {
+bool LogTrace_ISO15693(const uint8_t *bytes, uint16_t len, uint32_t ts_start, uint32_t ts_end, const uint8_t *parity, bool reader2tag) {
    uint32_t duration = ts_end - ts_start;
    duration /= 32;
    ts_end = ts_start + duration;
@@ -306,24 +309,31 @@ bool RAMFUNC LogTraceBits(const uint8_t *btBytes, uint16_t bitLen, uint32_t time
 }

 // Emulator memory
-uint8_t emlSet(uint8_t *data, uint32_t offset, uint32_t length) {
+uint8_t emlSet(const uint8_t *data, uint32_t offset, uint32_t length) {
    uint8_t *mem = BigBuf_get_EM_addr();
-    if (offset + length < CARD_MEMORY_SIZE) {
+    if (offset + length <= CARD_MEMORY_SIZE) {
        memcpy(mem + offset, data, length);
        return 0;
    }
-    Dbprintf("Error, trying to set memory outside of bounds! %d  > %d", (offset + length), CARD_MEMORY_SIZE);
+    Dbprintf("Error, trying to set memory outside of bounds! " _RED_("%d") " > %d", (offset + length), CARD_MEMORY_SIZE);
+    return 1;
+}
+uint8_t emlGet(uint8_t *out, uint32_t offset, uint32_t length) {
+    uint8_t *mem = BigBuf_get_EM_addr();
+    if (offset + length <= CARD_MEMORY_SIZE) {
+        memcpy(out, mem + offset, length);
+        return 0;
+    }
+    Dbprintf("Error, trying to read memory outside of bounds! " _RED_("%d") " > %d", (offset + length), CARD_MEMORY_SIZE);
    return 1;
 }
-
-

 // get the address of the ToSend buffer. Allocate part of Bigbuf for it, if not yet done
 tosend_t *get_tosend(void) {

-    if (toSend.buf == NULL)
+    if (toSend.buf == NULL) {
        toSend.buf = BigBuf_malloc(TOSEND_BUFFER_SIZE);
-
+    }
    return &toSend;
 }

@@ -35,6 +35,8 @@ uint8_t *BigBuf_get_addr(void);
 uint32_t BigBuf_get_size(void);
 uint8_t *BigBuf_get_EM_addr(void);
 uint16_t BigBuf_max_traceLen(void);
+uint32_t BigBuf_get_hi(void);
+
 void BigBuf_initialize(void);
 void BigBuf_Clear(void);
 void BigBuf_Clear_ext(bool verbose);
@@ -51,11 +53,12 @@ void set_tracing(bool enable);
 void set_tracelen(uint32_t value);
 bool get_tracing(void);

-bool RAMFUNC LogTrace(const uint8_t *btBytes, uint16_t iLen, uint32_t timestamp_start, uint32_t timestamp_end, uint8_t *parity, bool reader2tag);
+bool RAMFUNC LogTrace(const uint8_t *btBytes, uint16_t iLen, uint32_t timestamp_start, uint32_t timestamp_end, const uint8_t *parity, bool reader2tag);
 bool RAMFUNC LogTraceBits(const uint8_t *btBytes, uint16_t bitLen, uint32_t timestamp_start, uint32_t timestamp_end, bool reader2tag);
-bool LogTrace_ISO15693(const uint8_t *bytes, uint16_t len, uint32_t ts_start, uint32_t ts_end, uint8_t *parity, bool reader2tag);
+bool LogTrace_ISO15693(const uint8_t *bytes, uint16_t len, uint32_t ts_start, uint32_t ts_end, const uint8_t *parity, bool reader2tag);

-uint8_t emlSet(uint8_t *data, uint32_t offset, uint32_t length);
+uint8_t emlSet(const uint8_t *data, uint32_t offset, uint32_t length);
+uint8_t emlGet(uint8_t *out, uint32_t offset, uint32_t length);

 typedef struct {
    int max;
@@ -53,7 +53,7 @@ void LCDFill(unsigned char xs, unsigned char ys, unsigned char width, unsigned c
    }
 }

-void LCDString(char *lcd_string, const char *font_style, unsigned char x, unsigned char y, unsigned char fcolor, unsigned char bcolor) {
+void LCDString(const char *lcd_string, const char *font_style, unsigned char x, unsigned char y, unsigned char fcolor, unsigned char bcolor) {
    unsigned int  i;
    unsigned char mask = 0, px, py, xme, yme, offset;
    const char *data;
@@ -130,7 +130,7 @@ void LCDInit(void);
 void LCDReset(void);
 void LCDSetXY(unsigned char x, unsigned char y);
 void LCDSetPixel(unsigned char x, unsigned char y, unsigned char color);
-void LCDString(char *lcd_string, const char *font_style, unsigned char x, unsigned char y, unsigned char fcolor, unsigned char bcolor);
+void LCDString(const char *lcd_string, const char *font_style, unsigned char x, unsigned char y, unsigned char fcolor, unsigned char bcolor);
 void LCDFill(unsigned char xs, unsigned char ys, unsigned char width, unsigned char height, unsigned char color);

 #endif
@@ -37,13 +37,13 @@ APP_CFLAGS = $(PLATFORM_DEFS) \
 SRC_LF = lfops.c lfsampling.c pcf7931.c lfdemod.c lfadc.c
 SRC_HF = hfops.c
 SRC_ISO15693 = iso15693.c iso15693tools.c
-SRC_ISO14443a = iso14443a.c mifareutil.c mifarecmd.c epa.c mifaresim.c
+SRC_ISO14443a = iso14443a.c mifareutil.c mifarecmd.c epa.c mifaresim.c sam_mfc.c sam_seos.c
 #UNUSED: mifaresniff.c
 SRC_ISO14443b = iso14443b.c
 SRC_FELICA = felica.c
 SRC_CRAPTO1 = crypto1.c des.c desfire_crypto.c mifaredesfire.c aes.c platform_util.c
 SRC_CRC = crc.c crc16.c crc32.c
-SRC_ICLASS = iclass.c optimized_cipherutils.c optimized_ikeys.c optimized_elite.c optimized_cipher.c
+SRC_ICLASS = iclass.c optimized_cipherutils.c optimized_ikeys.c optimized_elite.c optimized_cipher.c sam_picopass.c
 SRC_LEGIC = legicrf.c legicrfsim.c legic_prng.c
 SRC_NFCBARCODE = thinfilm.c

@@ -103,9 +103,6 @@ endif
 # Generic standalone Mode injection of source code
 include Standalone/Makefile.inc

-#the FPGA bitstream files. Note: order matters!
-FPGA_BITSTREAMS = fpga_lf.bit fpga_hf.bit fpga_felica.bit fpga_hf_15.bit
-
 #the lz4 source files required for decompressing the fpga config at run time
 SRC_LZ4 = lz4.c
 #additional defines required to compile lz4
@@ -130,7 +127,7 @@ THUMBSRC = start.c \
    $(SRC_SMARTCARD) \
    $(SRC_FPC) \
    $(SRC_HITAG) \
-	$(SRC_EM4x50) \
+    $(SRC_EM4x50) \
    $(SRC_EM4x70) \
    $(SRC_SPIFFS) \
    $(SRC_HF) \
@@ -184,10 +181,10 @@ showinfo:

 .DELETE_ON_ERROR:

-# version_pm3.c should be remade on every time fullimage.stage1.elf should be remade
+# version_pm3.c should be checked on every time fullimage.stage1.elf should be remade
 version_pm3.c: default_version_pm3.c $(OBJDIR)/fpga_version_info.o $(OBJDIR)/fpga_all.o $(THUMBOBJ) $(ARMOBJ) .FORCE
-	$(info [-] GEN $@)
-	$(Q)$(SH) ../tools/mkversion.sh > $@ || $(CP) $< $@
+	$(info [-] CHECK $@)
+	$(Q)$(SH) ../tools/mkversion.sh $@ || $(CP) $< $@

 fpga_version_info.c: $(FPGA_BITSTREAMS) $(FPGA_COMPRESSOR)
 	$(info [-] GEN $@)
@@ -86,6 +86,9 @@ define KNOWN_STANDALONE_DEFINITIONS
 | HF_BOG          | 14a sniff with ULC/ULEV1/NTAG auth     |
 | (RDV4 only)     | storing in flashmem - Bogito           |
 +----------------------------------------------------------+
+| HF_CARDHOPPER   | Relay 14a protocols over long distances|
+| (RDV4 only)     | (w/ IP backbone) - Sam Haskins         |
+----------------------------------------------------------+
 | HF_COLIN        | Mifare ultra fast sniff/sim/clone      |
 | (RDV4 only)     | - Colin Brigato                        |
 +----------------------------------------------------------+
@@ -119,6 +122,9 @@ define KNOWN_STANDALONE_DEFINITIONS
 | HF_TMUDFORD     | Read and emulate 15 tags               |
 |                 | - Tim Mudford                          |
 +----------------------------------------------------------+
+| HF_UNISNIFF     | Sniff 14a/14b/15 (optionally to flash) |
+|                 | - hazardousvoltage                     |
+----------------------------------------------------------+
 | HF_YOUNG        | Mifare sniff/simulation                |
 |                 | - Craig Young                          |
 +----------------------------------------------------------+
@@ -130,9 +136,9 @@ endef

 STANDALONE_MODES := LF_SKELETON
 STANDALONE_MODES += LF_EM4100EMUL LF_EM4100RSWB LF_EM4100RSWW LF_EM4100RWC LF_HIDBRUTE LF_HIDFCBRUTE LF_ICEHID LF_MULTIHID LF_NEDAP_SIM LF_NEXID LF_PROXBRUTE LF_PROX2BRUTE LF_SAMYRUN LF_THAREXDE
-STANDALONE_MODES += HF_14ASNIFF HF_14BSNIFF HF_15SNIFF HF_AVEFUL HF_BOG HF_COLIN HF_CRAFTBYTE HF_ICECLASS HF_LEGIC HF_LEGICSIM HF_MATTYRUN HF_MFCSIM HF_MSDSAL HF_REBLAY HF_TCPRST HF_TMUDFORD HF_YOUNG
+STANDALONE_MODES += HF_14ASNIFF HF_14BSNIFF HF_15SNIFF HF_AVEFUL HF_BOG HF_CARDHOPPER HF_COLIN HF_CRAFTBYTE HF_ICECLASS HF_LEGIC HF_LEGICSIM HF_MATTYRUN HF_MFCSIM HF_MSDSAL HF_REBLAY HF_TCPRST HF_TMUDFORD HF_UNISNIFF HF_YOUNG
 STANDALONE_MODES += DANKARMULTI
-STANDALONE_MODES_REQ_BT := HF_REBLAY
+STANDALONE_MODES_REQ_BT := HF_CARDHOPPER HF_REBLAY
 STANDALONE_MODES_REQ_SMARTCARD :=
 STANDALONE_MODES_REQ_FLASH := LF_HIDFCBRUTE LF_ICEHID LF_NEXID LF_THAREXDE HF_BOG HF_COLIN HF_ICECLASS HF_LEGICSIM HF_MFCSIM
 ifneq ($(filter $(STANDALONE),$(STANDALONE_MODES)),)
--- a/Show More
+++ b/Show More