Merge pull request #1 from RfidResearchGroup/master

Sync Master to fork
2026-05-12 11:18:11 -07:00 · 2019-07-17 21:00:49 +10:00
parent f11500f60f 2bd1be9aba
commit 9a1c0ff8a8
154 changed files with 2197 additions and 2234 deletions
@@ -3,6 +3,11 @@

 .history
 .bash_history
+.bash_profile
+.bash_logout
+.bashrc
+.inputrc
+.profile
 *.log
 *.eml
 *.o
@@ -3,8 +3,35 @@ 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]
+ - Add 'hw standalone' to jump to standalone mode from command line or script (@doegox)
+ - Add to 'hf 14a apdu' print apdu and compose apdu (@merlokk)
+ - Change: buggy 'mem read' removed, 'mem save' renamed 'mem dump', can now display too (@doegox)
+ - Fix: timeout for mem wipe was too short, thanks @cjbrigato (@doegox)
+ - Fix 'hf mf sim' - Mifare Classic simulation more flexible anti-collision check (@McEloff)
+ - Change: 'hf mf sim' - Mifare Classic simulation not respond NACK on invalid authentication request (@McEloff)
+ - Change: 'read_pwd_mem.lua' now handles Mifare Classic dictionaries large than 4096 bytes (@iceman)
+ - Change: Don't clear trace log during 'hf mf chk', to save whole process history (@McEloff)
+ - Add 'msleep' command, for pauses in scripts (@doegox)
+ - Add support for WSL in proxmark.sh (@doegox)
+ - Add documentation for usage of Proxmark3 under WSL (@doegox)
+ - Change: replace aes.c with mbedtls version (@slurdge)
+ - Change: replace ukbhit by kbd_enter_pressed, not requiring tcgetattr (@xianglin1998/@doegox)
+ - Add config for RaspberryPi in JTAG tools (@doegox)
+ - Add config for FTDI C232HM-DDHSL-0 in JTAG tools (@doegox)
+ - Fix compilation under MacOSX with binutils (@matrix)
+ - Add dynamic report of the chipID for flashing purposes (@slurdge)
+ - Fix Clang warnings (@matrix)
+ - Fix EMVGPO bug (@matrix)
+ - Add hitag2 write password auth (@ViRb3)
+ - Add check if bootloader segment is within bounds (@slurdge)
+ - Add 'hf 15 csetuid' - set UID on ISO-15693 Magic tags (@t0m4-null)
+ - Change: Print help if unknown arg for hitag reader/writer (@ViRb3)
+ - Fix clock deadlock in hitag sniff (@ViRb3)
+ - Add compiler info in client & ARM sections (@slurdge)
+ - Add support for automatic COM detection on Windows (@slurdge)
+ - Add support for compilation on RaspberryPiZero (armv6) (@doegox)
 - Change: updates to README (@iceman)
- - Change: hf mf/mfu dbg => hw dbg (@doegox)
+ - Change: 'hf mf/mfu dbg' => 'hw dbg' (@doegox)
 - Change: replace usb_poll_validate_length() by data_available() that supports USART too (@doegox)
 - Make sure standalone modes can be launched when connected on USB without client (@doegox)
 - Change: cleaner makefile execution, use 'make V=1' if you want to see full lines (@doegox)
@@ -145,12 +145,12 @@ style:
 	# Make sure astyle is installed
 	@which astyle >/dev/null || ( echo "Please install 'astyle' package first" ; exit 1 )
 	# Remove spaces & tabs at EOL, add LF at EOF if needed on *.c, *.h, *.cpp. *.lua, *.py, *.pl, Makefile
-	find . \( -name "*.[ch]" -or -name "*.cpp" -or -name "*.lua" -or -name "*.py" -or -name "*.pl" -or -name "Makefile" \) \
+	find . \( -name "*.[ch]" -or \( -name "*.cpp" -and -not -name "*.moc.cpp" \) -or -name "*.lua" -or -name "*.py" -or -name "*.pl" -or -name "Makefile" \) \
 	    -exec perl -pi -e 's/[ \t]+$$//' {} \; \
 	    -exec sh -c "tail -c1 {} | xxd -p | tail -1 | grep -q -v 0a$$" \; \
 	    -exec sh -c "echo >> {}" \;
 	# Apply astyle on *.c, *.h, *.cpp
-	find . \( -name "*.[ch]" -or -name "*.cpp" \) -exec astyle --formatted --mode=c --suffix=none \
+	find . \( -name "*.[ch]" -or \( -name "*.cpp" -and -not -name "*.moc.cpp" \) \) -exec astyle --formatted --mode=c --suffix=none \
 	    --indent=spaces=4 --indent-switches \
 	    --keep-one-line-blocks --max-instatement-indent=60 \
 	    --style=google --pad-oper --unpad-paren --pad-header \
@@ -1,14 +1,11 @@
 # Proxmark3 RDV4.0 Dedicated Github

-This repo is based on iceman fork for proxmark3. It is dedicated to bringing the most out of the new features for proxmark3 RDV4.0 new hardware and design.
+This repo is based on iceman fork for Proxmark3. It is dedicated to bringing the most out of the new features for Proxmark3 RDV4.0 new hardware and design.
+Note that it also supports other Proxmark3 platforms as well!

 [![Build status](https://ci.appveyor.com/api/projects/status/ct5blik2wa96bv0x/branch/master?svg=true)](https://ci.appveyor.com/project/iceman1001/proxmark3-ji4wj/branch/master)
 [![Latest release](https://img.shields.io/github/release/RfidResearchGroup/proxmark3.svg)](https://github.com/RfidResearchGroup/proxmark3/releases/latest)

-<a href="http://www.youtube.com/watch?feature=player_embedded&v=uyJ-y0kSWfc
-" target="_blank"><img src="https://github.com/5w0rdfish/proxmark3/blob/master/prox.png" 
-alt="Yuotube" width="100%" height="auto" border="10" /></a>
-
 ---

 # PROXMARK INSTALLATION AND OVERVIEW
@@ -19,9 +16,11 @@ alt="Yuotube" width="100%" height="auto" border="10" /></a>
 |[Development](#development) | [Important notes on ModemManager for Linux users](/doc/md/Installation_Instructions/ModemManager-Must-Be-Discarded.md) | [Validating proxmark client functionality](/doc/md/Use_of_Proxmark/1_Validation.md) |
 |[Why didn't you base it on official PM3 Master?](#why-didnt-you-base-it-on-official-pm3-master)| [Homebrew (Mac OS X) & 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)|
 |[PM3 GUI](#pm3-gui)|[Setup and build for Windows](/doc/md/Installation_Instructions/Windows-Installation-Instructions.md)|[Commands & Features](/doc/md/Use_of_Proxmark/3_Commands-and-Features.md)|
-|[Issues](#issues)|[Blue shark manual](/doc/bt_manual_v10.md) ||
+|[Issues](#issues)|[Blue shark manual](/doc/bt_manual_v10.md) |[Advanced compilation parameters](/doc/md/Use_of_Proxmark/4_Advanced-compilation-parameters.md)|
 |[Notes on UART](/doc/uart_notes.md)|||
 |[Notes on Frame format](/doc/new_frame_format.md)|||
+|[Notes on Termux / Android](/doc/termux_notes.md)|||
+|[Developing standalone mode](/armsrc/Standalone/readme.md)|[Wiki about standalone mode](https://github.com/RfidResearchGroup/proxmark3/wiki/Standalone-mode) ||
 |[Donations](#Donations)|||

 ## What has changed?
@@ -45,17 +44,20 @@ This fork now compiles just fine on

 If you intend to contribute to the code, please read the [coding style notes](HACKING.md) first.

-Internal notes on [Coverity Scan Config & Run](/doc/md/Development/Coverity-Scan-Config-%26-Run.md).
+- Internal notes on [Coverity Scan Config & Run](/doc/md/Development/Coverity-Scan-Config-%26-Run.md).
+- Internal notes on UART
+- Internal notes on Frame format
+- Internal notes on standalone mode

---

-## Why didn't you base it on official PM3 Master?

-The separation from official pm3 repo gives us a lot of freedom to create a firmware/client that suits the RDV40 features. We don't want to mess up the official pm3 repo with RDV40 specific code.
+## Why didn't you base it on official Proxmark3 Master?

-## PM3 GUI
+The separation from official Proxmark3 repo gives us a lot of freedom to create a firmware/client that suits the RDV40 features. We don't want to mess up the official Proxmark3 repo with RDV40 specific code.
+
+## Proxmark3 GUI
 The official PM3-GUI from Gaucho will not work.
-The new universal GUI will work. [Proxmark3 Universal GUI](https://github.com/burma69/PM3UniversalGUI) 
+The new universal GUI will work. [Proxmark3 Universal GUI](https://github.com/burma69/PM3UniversalGUI) Almost, change needed in order to show helptext when client isn't connected to a device.

 ## Issues

@@ -69,4 +71,8 @@ It's needed to have a good USB cable to connect Proxmark3 to USB. If you have st
 - updated Feb 2019 [@5w0rdfish](https://mobile.twitter.com/5w0rdFish)

 # Donations
-Nothing says thank you as much as a donation,  https://www.patreon.com/iceman1001
+Nothing says thank you as much as a donation. So if you feel the love, do feel free to become a iceman patron. For some tiers it comes with rewards.
+
+https://www.patreon.com/iceman1001
+
+All support is welcome!
@@ -30,7 +30,7 @@ SRC_ISO15693 = iso15693.c iso15693tools.c
 SRC_ISO14443a = iso14443a.c mifareutil.c mifarecmd.c epa.c mifaresim.c
 SRC_ISO14443b = iso14443b.c
 SRC_FELICA = felica.c
-SRC_CRAPTO1 = crypto1.c des.c aes.c desfire_key.c desfire_crypto.c mifaredesfire.c
+SRC_CRAPTO1 = crypto1.c des.c desfire_key.c desfire_crypto.c mifaredesfire.c aes.c platform_util.c
 SRC_CRC = crc.c crc16.c crc32.c
 SRC_ICLASS = iclass.c optimized_cipher.c
 SRC_LEGIC = legicrf.c legicrfsim.c legic_prng.c
@@ -68,41 +68,7 @@ else
 endif

 # Generic standalone Mode injection of source code
-
-
-SRC_STANDALONE = placeholder.c
-# WITH_STANDALONE_LF_ICERUN
-ifneq (,$(findstring WITH_STANDALONE_LF_ICERUN,$(APP_CFLAGS)))
-    SRC_STANDALONE = lf_icerun.c
-endif
-# WITH_STANDALONE_LF_SAMYRUN
-ifneq (,$(findstring WITH_STANDALONE_LF_SAMYRUN,$(APP_CFLAGS)))
-    SRC_STANDALONE = lf_samyrun.c
-endif
-# WITH_STANDALONE_LF_PROXBRUTE
-ifneq (,$(findstring WITH_STANDALONE_LF_PROXBRUTE,$(APP_CFLAGS)))
-    SRC_STANDALONE = lf_proxbrute.c
-endif
-# WITH_STANDALONE_LF_HIDBRUTE
-ifneq (,$(findstring WITH_STANDALONE_LF_HIDBRUTE,$(APP_CFLAGS)))
-    SRC_STANDALONE = lf_hidbrute.c
-endif
-# WITH_STANDALONE_HF_YOUNG
-ifneq (,$(findstring WITH_STANDALONE_HF_YOUNG,$(APP_CFLAGS)))
-    SRC_STANDALONE = hf_young.c
-endif
-# WITH_STANDALONE_HF_MATTYRUN
-ifneq (,$(findstring WITH_STANDALONE_HF_MATTYRUN,$(APP_CFLAGS)))
-    SRC_STANDALONE = hf_mattyrun.c
-endif
-# WITH_STANDALONE_HF_COLIN
-ifneq (,$(findstring WITH_STANDALONE_HF_COLIN,$(APP_CFLAGS)))
-    SRC_STANDALONE = vtsend.c hf_colin.c
-endif
-# WITH_STANDALONE_HF_BOG
-ifneq (,$(findstring WITH_STANDALONE_HF_BOG,$(APP_CFLAGS)))
-    SRC_STANDALONE = hf_bog.c
-endif
+include Standalone/Makefile.inc

 #the FPGA bitstream files. Note: order matters!
 FPGA_BITSTREAMS = fpga_lf.bit fpga_hf.bit
@@ -0,0 +1,46 @@
+# Default standalone if no standalone specified
+DEFAULT_STANDALONE=LF_SAMYRUN
+HELP_EXAMPLE_STANDALONE=HF_COLIN
+# (you can set explicitly STANDALONE= to disable standalone modes)
+STANDALONE?=$(DEFAULT_STANDALONE)
+
+define KNOWN_STANDALONE_DEFINITIONS
+==========================================================+
+| STANDALONE      | DESCRIPTION                            |
+==========================================================+
+|                 | No standalone mode                     |
+----------------------------------------------------------+
+| LF_SAMYRUN (def)| HID26 read/clone/sim                   |
+|                 | - Samy Kamkar                          |
+----------------------------------------------------------+
+| LF_ICERUN       | standalone mode skeleton               |
+|                 | - iceman                               |
+----------------------------------------------------------+
+| LF_PROXBRUTE    | HID ProxII bruteforce                  |
+|                 | - Brad Antoniewicz                     |
+----------------------------------------------------------+
+| LF_HIDBRUTE     | HID corporate 1000 bruteforce          |
+|                 | - Federico dotta & Maurizio Agazzini   |
+----------------------------------------------------------+
+| HF_YOUNG        | Mifare sniff/simulation                |
+|                 | - Craig Young                          |
+----------------------------------------------------------+
+| HF_MATTYRUN     | Mifare sniff/clone                     |
+|                 | - Matías A. Ré Medina                  |
+----------------------------------------------------------+
+| HF_COLIN        | Mifare ultra fast sniff/sim/clone      |
+|                 | - Colin Brigato                        |
+----------------------------------------------------------+
+| HF_BOG          | 14a sniff with ULC/ULEV1/NTAG auth     |
+|                 | storing in flashmem - Bogito           |
+----------------------------------------------------------+
+
+endef
+
+STANDALONE_MODES := LF_SAMYRUN LF_ICERUN LF_PROXBRUTE LF_HIDBRUTE
+STANDALONE_MODES += HF_YOUNG HF_MATTYRUN HF_COLIN HF_BOG
+ifneq ($(filter $(STANDALONE),$(STANDALONE_MODES)),)
+    STANDALONE_PLATFORM_DEFS += -DWITH_STANDALONE_$(STANDALONE)
+else ifneq ($(STANDALONE),)
+    $(error Invalid STANDALONE: $(STANDALONE). $(KNOWN_DEFINITIONS))
+endif
@@ -0,0 +1,36 @@
+# Generic standalone Mode injection of source code
+
+SRC_STANDALONE = placeholder.c
+# WITH_STANDALONE_LF_ICERUN
+ifneq (,$(findstring WITH_STANDALONE_LF_ICERUN,$(APP_CFLAGS)))
+    SRC_STANDALONE = lf_icerun.c
+endif
+# WITH_STANDALONE_LF_SAMYRUN
+ifneq (,$(findstring WITH_STANDALONE_LF_SAMYRUN,$(APP_CFLAGS)))
+    SRC_STANDALONE = lf_samyrun.c
+endif
+# WITH_STANDALONE_LF_PROXBRUTE
+ifneq (,$(findstring WITH_STANDALONE_LF_PROXBRUTE,$(APP_CFLAGS)))
+    SRC_STANDALONE = lf_proxbrute.c
+endif
+# WITH_STANDALONE_LF_HIDBRUTE
+ifneq (,$(findstring WITH_STANDALONE_LF_HIDBRUTE,$(APP_CFLAGS)))
+    SRC_STANDALONE = lf_hidbrute.c
+endif
+# WITH_STANDALONE_HF_YOUNG
+ifneq (,$(findstring WITH_STANDALONE_HF_YOUNG,$(APP_CFLAGS)))
+    SRC_STANDALONE = hf_young.c
+endif
+# WITH_STANDALONE_HF_MATTYRUN
+ifneq (,$(findstring WITH_STANDALONE_HF_MATTYRUN,$(APP_CFLAGS)))
+    SRC_STANDALONE = hf_mattyrun.c
+endif
+# WITH_STANDALONE_HF_COLIN
+ifneq (,$(findstring WITH_STANDALONE_HF_COLIN,$(APP_CFLAGS)))
+    SRC_STANDALONE = vtsend.c hf_colin.c
+endif
+# WITH_STANDALONE_HF_BOG
+ifneq (,$(findstring WITH_STANDALONE_HF_BOG,$(APP_CFLAGS)))
+    SRC_STANDALONE = hf_bog.c
+endif
+
@@ -15,7 +15,7 @@ The retrieved sniffing session can be acquired by connecting the device
 to a client that supports the reconnect capability and issue 'hf 14a list'.

 In order to view the grabbed authentication attempts in the flash mem,
-you can simply run 'script run read_pwd_mem' or just 'mem read l 256'
+you can simply run 'script run read_pwd_mem' or just 'mem dump p l 256'
 from the client to view the stored quadlets.
 */

@@ -282,7 +282,7 @@ void RAMFUNC SniffAndStore(uint8_t param) {
 }

 void ModInfo(void) {
-    DbpString("   HF 14a sniff standalone with ULC/ULEV1/NTAG auth storing in flashmem - aka BogitoRun (Bogito)");
+    DbpString("  HF 14a sniff standalone with ULC/ULEV1/NTAG auth storing in flashmem - aka BogitoRun (Bogito)");
 }

 void RunMod() {
@@ -101,6 +101,8 @@ void ReadLastTagFromFlash() {
    size_t size = len;
    uint8_t *mem = BigBuf_malloc(size);

+    FlashmemSetSpiBaudrate(24000000);
+
    if (!FlashInit()) {
        return;
    }
@@ -148,6 +150,9 @@ void WriteTagToFlash(uint8_t index, size_t size) {

    emlGetMem(data, 0, (size * 64) / 1024);

+
+    FlashmemSetSpiBaudrate(48000000);
+
    if (!FlashInit()) {
        return;
    }
@@ -197,7 +202,7 @@ void WriteTagToFlash(uint8_t index, size_t size) {
 }

 void ModInfo(void) {
-    DbpString("   HF Mifare ultra fast sniff/sim/clone - aka VIGIKPWN (Colin Brigato)");
+    DbpString("  HF Mifare ultra fast sniff/sim/clone - aka VIGIKPWN (Colin Brigato)");
 }

 void RunMod() {
@@ -424,7 +429,7 @@ failtag:
    //-----------------------------------------------------------------------------
    // also we could avoid first UID check for every block

-    // then let’s expose this “optimal case” of “well known vigik schemes” :
+    // then let's expose this “optimal case” of “well known vigik schemes” :
    for (uint8_t type = 0; type < 2 && !err && !trapped; type++) {
        for (int sec = 0; sec < sectorsCnt && !err && !trapped; ++sec) {
            key = cjat91_saMifareChkKeys(sec * 4, type, NULL, size, &keyBlock[0], &key64);
@@ -783,10 +788,18 @@ readysim:
        case 7:
            flags = FLAG_7B_UID_IN_DATA;
            break;
-        default:
+        case 4:
            flags = FLAG_4B_UID_IN_DATA;
            break;
+        default:
+            flags = FLAG_UID_IN_EMUL;
+            break;
    }
+
+    // Use UID, SAK, ATQA from EMUL, if uid not defined
+    //if ((flags & (FLAG_4B_UID_IN_DATA | FLAG_7B_UID_IN_DATA | FLAG_10B_UID_IN_DATA)) == 0) {
+    flags |= FLAG_UID_IN_EMUL;
+    //}
    Mifare1ksim(flags | FLAG_MF_1K, 0, cjuid);
    LED_C_OFF();
    SpinOff(50);
@@ -902,7 +915,7 @@ int e_MifareECardLoad(uint32_t numofsectors, uint8_t keytype) {
    return (isOK) ? PM3_SUCCESS : PM3_EUNDEF;
 }

-/* the chk function is a piwi’ed(tm) check that will try all keys for
+/* the chk function is a piwi'ed(tm) check that will try all keys for
 a particular sector. also no tracing no dbg */
 int cjat91_saMifareChkKeys(uint8_t blockNo, uint8_t keyType, bool clearTrace, uint8_t keyCount, uint8_t *datain, uint64_t *key) {
    DBGLEVEL = DBG_NONE;
@@ -22,6 +22,7 @@
 #include "iso14443a.h"
 #include "protocols.h"
 #include "util.h"
+#include "pmflash.h"
 #include "standalone.h" // standalone definitions
 #include <stdbool.h>    // for bool
 #include <stdio.h>
@@ -193,7 +193,7 @@ static int saMifareChkKeys(uint8_t blockNo, uint8_t keyType, bool clearTrace, ui
 }

 void ModInfo(void) {
-    DbpString("   HF Mifare sniff/clone - aka MattyRun (Matías A. Ré Medina)");
+    DbpString("  HF Mifare sniff/clone - aka MattyRun (Matías A. Ré Medina)");
 }

 void RunMod() {
@@ -223,6 +223,7 @@ void RunMod() {
    */
    bool printKeys = false;         // Prints keys
    bool transferToEml = true;      // Transfer keys to emulator memory
+    bool ecfill = true;             // Fill emulator memory with cards content.
    bool simulation = true;         // Simulates an exact copy of the target tag
    bool fillFromEmulator = false;  // Dump emulator memory.

@@ -8,18 +8,20 @@
 //-----------------------------------------------------------------------------
 // main code for HF standalone mode Mifare /sniff/emulation by Craig Young
 //-----------------------------------------------------------------------------
+
 #include "hf_young.h"
+#include "common.h"

 typedef struct {
    uint8_t uid[10];
    uint8_t uidlen;
    uint8_t atqa[2];
    uint8_t sak;
-} __attribute__((__packed__)) card_clone_t;
+} PACKED card_clone_t;


 void ModInfo(void) {
-    DbpString("   HF Mifare sniff/simulation - (Craig Young)");
+    DbpString("  HF Mifare sniff/simulation - (Craig Young)");
 }

 void RunMod() {
@@ -27,7 +27,7 @@
 #include "lf_hidbrute.h"

 void ModInfo(void) {
-    DbpString("   LF HID corporate 1000 bruteforce - aka Corporatebrute (Federico dotta & Maurizio Agazzini)");
+    DbpString("  LF HID corporate 1000 bruteforce - aka Corporatebrute (Federico dotta & Maurizio Agazzini)");
 }

 // samy's sniff and repeat routine for LF
@@ -10,10 +10,9 @@
 #include "lf_icerun.h"

 void ModInfo(void) {
-    DbpString("   LF skeleton mode -  aka IceRun (iceman)");
+    DbpString("  LF skeleton mode -  aka IceRun (iceman)");
 }

-// samy's sniff and repeat routine for LF
 void RunMod() {
    StandAloneMode();
    Dbprintf("[=] LF skeleton code a.k.a IceRun started");
@@ -12,7 +12,7 @@
 #include "lf_proxbrute.h"

 void ModInfo(void) {
-    DbpString("   LF HID ProxII bruteforce - aka Proxbrute (Brad Antoniewicz)");
+    DbpString("  LF HID ProxII bruteforce - aka Proxbrute (Brad Antoniewicz)");
 }

 // samy's sniff and repeat routine for LF
@@ -11,7 +11,7 @@
 #include "lf_samyrun.h"

 void ModInfo(void) {
-    DbpString("   LF HID26 standalone - aka SamyRun (Samy Kamkar)");
+    DbpString("  LF HID26 standalone - aka SamyRun (Samy Kamkar)");
 }

 // samy's sniff and repeat routine for LF
@@ -2,7 +2,7 @@
 #include "apps.h" // debug statements

 void ModInfo(void) {
-    DbpString("   No standalone mode present");
+    DbpString("  No standalone mode present");
 }

 void RunMod() {
@@ -1,6 +1,6 @@
-# StandAlone Modes
+# Standalone Modes

-This contains functionality for different StandAlone modes. The fullimage will be built given the correct compiler flags used. Build targets for these files are contained in `armsrc/Makefile` and `common/Makefile.hal`
+This contains functionality for different StandAlone modes. The fullimage will be built given the correct compiler flags used. Build targets for these files are contained in `Makefile.inc` and `Makefile.hal`

 If you want to implement a new standalone mode, you need to implement the methods provided in `standalone.h`.
 Have a look at the skeleton standalone mode called IceRun, in the files `lf_icerun.c lf_icerun.h`.
@@ -19,7 +19,7 @@ The RunMod function, which is your "main" function when running.  You need to ch

 ````
 void ModInfo(void) {
-    DbpString("   LF good description of your mode - aka FooRun (your name)");
+    DbpString("  LF good description of your mode - aka FooRun (your name)");
 }

 void RunMod(void) {
@@ -40,8 +40,6 @@ void RunMod(void) {
    }
 ````

-Each standalone mode needs to have its own compiler flag to be added in `armsrc/Makefile`.
-
 ## Naming your standalone mode

 We suggest that you follow these guidelines:
@@ -58,9 +56,9 @@ This leads to your next step, your DEFINE name needed in Makefile.
 `WITH_STANDALONE_LF_FOO`


-## Update COMMON/MAKEFILE.HAL
+## Update MAKEFILE.HAL

-Add your mode to the `common/Makefile.hal` help and modes list:
+Add your mode to the `Makefile.hal` help and modes list:
 ```
 +==========================================================+
 | STANDALONE      | DESCRIPTION                            |
@@ -74,13 +72,13 @@ STANDALONE_MODES := LF_SAMYRUN LF_ICERUN LF_PROXBRUTE LF_HIDBRUTE LF_FOO
 STANDALONE_MODES += HF_YOUNG HF_MATTYRUN HF_COLIN HF_BOG
 ```

-## Update ARMSRC/MAKEFILE
-Add your source code files like the following sample in the `armsrc/Makefile`
+## Update MAKEFILE.INC
+Add your source code files like the following sample in the `Makefile.inc`

 ```
 # WITH_STANDALONE_LF_ICERUN
 ifneq (,$(findstring WITH_STANDALONE_LF_ICERUN,$(APP_CFLAGS)))
-	SRC_STANDALONE = lf_icerun.c
+    SRC_STANDALONE = lf_icerun.c
 endif

 # WITH_STANDALONE_LF_FOO
@@ -95,15 +93,44 @@ This will enable an easy way to detect on client side which standalone mode has

 ````
 void ModInfo(void) {
-    DbpString("   LF good description of your mode - aka FooRun (your name)");
+    DbpString("  LF good description of your mode - aka FooRun (your name)");
 }
 ````

 ## Compiling your standalone mode
-Once all this is done, you and others can now easily compile different standalone modes by just selecting one of the standalone modes in `common/Makefile.hal`, e.g.:
+Once all this is done, you and others can now easily compile different standalone modes by just selecting one of the standalone modes (list in `Makefile.hal` or ) , e.g.:

+- rename  Makefile.platform.sample -> Makefile.platform
+- edit the "STANDALONE" row inside Makefile.platform.  You need to uncomment it and add your standalone mode name
+
+Makefile.platform.sample
 ```
-PLATFORM_DEFS += -DWITH_STANDALONE_LF_FOO
+# If you want to use it, copy this file as Makefile.platform and adjust it to your needs
+PLATFORM=PM3RDV4
+#PLATFORM_EXTRAS=BTADDON
+#STANDALONE=LF_SAMYRUN
+```
+ becomes
+ 
+ Makefile.platform
+ ```
+# If you want to use it, copy this file as Makefile.platform and adjust it to your needs
+PLATFORM=PM3RDV4
+#PLATFORM_EXTRAS=BTADDON
+STANDALONE=LF_FOO
 ```

 Remember only one can be selected at a time for now.
+
+The final steps is to 
+- force recompilation of all code.  ```make clean```
+- compile ```make -j8```
+- flash your device
+- connect to your device
+- press button long time to trigger ledshow and enter your new standalone mode
+- if connected with usb / fpc ,  you can also see debug statements from your device in standalone mode. Useful for debugging :)
+
+When compiling you will see a header showing what configurations your project compiled with.
+Make sure it says your standalone mode name.  
+
+Happy hacking!
@@ -1,34 +0,0 @@
-/*
-* AES Cryptographic Algorithm Header File. Include this header file in
-* your source which uses these given APIs. (This source is kept under
-* public domain)
-*/
-#ifndef __AES_H
-#define __AES_H
-
-// AES context structure
-typedef struct {
-    unsigned int Ek[60];
-    unsigned int Dk[60];
-    unsigned int Iv[4];
-    unsigned char Nr;
-    unsigned char Mode;
-} AesCtx;
-
-// key length in bytes
-#define KEY128 16
-#define KEY192 24
-#define KEY256 32
-// block size in bytes
-#define BLOCKSZ 16
-// mode
-#define EBC 0
-#define CBC 1
-
-// AES API function prototype
-
-int AesCtxIni(AesCtx *pCtx, unsigned char *pIV, unsigned char *pKey, unsigned int KeyLen, unsigned char Mode);
-int AesEncrypt(AesCtx *pCtx, unsigned char *pData, unsigned char *pCipher, unsigned int DataLen);
-int AesDecrypt(AesCtx *pCtx, unsigned char *pCipher, unsigned char *pData, unsigned int CipherLen);
-
-#endif
--- a/Show More
+++ b/Show More