From 0fe80c4a2d2ed0681a4e1f13513efa986db44734 Mon Sep 17 00:00:00 2001 From: Philippe Teuwen Date: Fri, 24 Apr 2020 18:20:37 +0200 Subject: [PATCH] sorting modes --- armsrc/Standalone/Makefile.hal | 64 +++++++++---------- armsrc/Standalone/readme.md | 2 +- .../4_Advanced-compilation-parameters.md | 2 +- 3 files changed, 34 insertions(+), 34 deletions(-) diff --git a/armsrc/Standalone/Makefile.hal b/armsrc/Standalone/Makefile.hal index d0786dc76..5c462053b 100644 --- a/armsrc/Standalone/Makefile.hal +++ b/armsrc/Standalone/Makefile.hal @@ -1,6 +1,6 @@ # Default standalone if no standalone specified DEFAULT_STANDALONE=HF_MSDSAL -HELP_EXAMPLE_STANDALONE=HF_YOUNG +HELP_EXAMPLE_STANDALONE=LF_SAMYRUN # (you can set explicitly STANDALONE= to disable standalone modes) STANDALONE?=$(DEFAULT_STANDALONE) STANDALONE_REQ_DEFS= @@ -11,54 +11,54 @@ define KNOWN_STANDALONE_DEFINITIONS +==========================================================+ | (empty) | No standalone mode | +----------------------------------------------------------+ -| LF_SAMYRUN | HID26 read/clone/sim | -| (default) | - Samy Kamkar | -+----------------------------------------------------------+ | LF_SKELETON | 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 | -| (RDV4 only) | - Colin Brigato | -+----------------------------------------------------------+ -| HF_BOG | 14a sniff with ULC/ULEV1/NTAG auth | -| (RDV4 only) | storing in flashmem - Bogito | -+----------------------------------------------------------+ -| HF_14ASNIFF | 14a sniff to flashmem | -| (RDV4 only) | | -+----------------------------------------------------------+ -| LF_ICEHID | LF HID collector to flashmem | -| (RDV4 only) | | -+----------------------------------------------------------+ | LF_EM4100EMUL | Simulate predefined em4100 tags only | | | | +----------------------------------------------------------+ | LF_EM4100RWC | Read/simulate em4100 tags & clone it | | | to T555x tags | +----------------------------------------------------------+ +| LF_HIDBRUTE | HID corporate 1000 bruteforce | +| | - Federico dotta & Maurizio Agazzini | ++----------------------------------------------------------+ +| LF_ICEHID | LF HID collector to flashmem | +| (RDV4 only) | | ++----------------------------------------------------------+ +| LF_PROXBRUTE | HID ProxII bruteforce | +| | - Brad Antoniewicz | ++----------------------------------------------------------+ +| LF_SAMYRUN | HID26 read/clone/sim | +| | - Samy Kamkar | ++----------------------------------------------------------+ +| HF_14ASNIFF | 14a sniff to flashmem | +| (RDV4 only) | | ++----------------------------------------------------------+ +| HF_BOG | 14a sniff with ULC/ULEV1/NTAG auth | +| (RDV4 only) | storing in flashmem - Bogito | ++----------------------------------------------------------+ +| HF_COLIN | Mifare ultra fast sniff/sim/clone | +| (RDV4 only) | - Colin Brigato | ++----------------------------------------------------------+ | HF_LEGIC | Read/simulate Legic Prime tags | | | storing in flashmem | +----------------------------------------------------------+ +| HF_MATTYRUN | Mifare sniff/clone | +| | - Matías A. Ré Medina | ++----------------------------------------------------------+ | HF_MSDSAL | Read and emulate MSD Visa cards | -| | - Salvador Mendoza | +| (default) | - Salvador Mendoza | ++----------------------------------------------------------+ +| HF_YOUNG | Mifare sniff/simulation | +| | - Craig Young | +----------------------------------------------------------+ endef -STANDALONE_MODES := LF_SAMYRUN LF_SKELETON LF_PROXBRUTE LF_HIDBRUTE LF_ICEHID LF_EM4100EMUL LF_EM4100RWC -STANDALONE_MODES += HF_YOUNG HF_MATTYRUN HF_COLIN HF_BOG HF_14ASNIFF HF_LEGIC HF_MSDSAL +STANDALONE_MODES := LF_SKELETON LF_EM4100EMUL LF_EM4100RWC LF_HIDBRUTE LF_ICEHID LF_PROXBRUTE LF_SAMYRUN +STANDALONE_MODES += HF_14ASNIFF HF_BOG HF_COLIN HF_LEGIC HF_MATTYRUN HF_MSDSAL HF_YOUNG STANDALONE_MODES_REQ_SMARTCARD := -STANDALONE_MODES_REQ_FLASH := HF_COLIN HF_BOG HF_14ASNIFF LF_ICEHID +STANDALONE_MODES_REQ_FLASH := LF_ICEHID HF_14ASNIFF HF_BOG HF_COLIN ifneq ($(filter $(STANDALONE),$(STANDALONE_MODES)),) STANDALONE_PLATFORM_DEFS += -DWITH_STANDALONE_$(STANDALONE) ifneq ($(filter $(STANDALONE),$(STANDALONE_MODES_REQ_SMARTCARD)),) diff --git a/armsrc/Standalone/readme.md b/armsrc/Standalone/readme.md index df8661de6..d46943778 100644 --- a/armsrc/Standalone/readme.md +++ b/armsrc/Standalone/readme.md @@ -58,7 +58,7 @@ This leads to your next step, your DEFINE name needed in Makefile. ## Update MAKEFILE.HAL -Add your mode to the `Makefile.hal` help and modes list: +Add your mode to the `Makefile.hal` help and modes list (alphabetically): ``` +==========================================================+ | STANDALONE | DESCRIPTION | diff --git a/doc/md/Use_of_Proxmark/4_Advanced-compilation-parameters.md b/doc/md/Use_of_Proxmark/4_Advanced-compilation-parameters.md index e6bbb3a67..5e953883a 100644 --- a/doc/md/Use_of_Proxmark/4_Advanced-compilation-parameters.md +++ b/doc/md/Use_of_Proxmark/4_Advanced-compilation-parameters.md @@ -77,8 +77,8 @@ Here are the supported values you can assign to `STANDALONE` in `Makefile.platfo | LF_EM4100RWC | LF EM4100 read/write/clone mode - temskiy | LF_HIDBRUTE | HID corporate 1000 bruteforce - Federico dotta & Maurizio Agazzini | LF_ICEHID | LF HID collector to flashmem - Iceman -| LF_SAMYRUN | HID26 read/clone/sim - Samy Kamkar | LF_PROXBRUTE | HID ProxII bruteforce - Brad Antoniewicz +| LF_SAMYRUN | HID26 read/clone/sim - Samy Kamkar | HF_14ASNIFF | 14a sniff storing to flashmem - Micolous | HF_BOG | 14a sniff with ULC/ULEV1/NTAG auth storing in flashmem - Bogito | HF_COLIN | Mifare ultra fast sniff/sim/clone - Colin Brigato