From 43fc71673ac509a940a99b90d92df3fc90cbbec6 Mon Sep 17 00:00:00 2001 From: Nate Glaser Date: Fri, 7 Jan 2022 18:02:08 -0500 Subject: [PATCH 1/9] 15693 sniff - Makefile/hf_15693sniff.c --- armsrc/Standalone/Makefile.hal | 22 ++--- armsrc/Standalone/Makefile.inc | 20 +---- armsrc/Standalone/hf_15693sniff.c | 129 ++++++++++++++++++++++++++++++ 3 files changed, 138 insertions(+), 33 deletions(-) create mode 100644 armsrc/Standalone/hf_15693sniff.c diff --git a/armsrc/Standalone/Makefile.hal b/armsrc/Standalone/Makefile.hal index f8277da97..b7fc6e11b 100644 --- a/armsrc/Standalone/Makefile.hal +++ b/armsrc/Standalone/Makefile.hal @@ -1,18 +1,3 @@ -#----------------------------------------------------------------------------- -# Copyright (C) Proxmark3 contributors. See AUTHORS.md for details. -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# See LICENSE.txt for the text of the license. -#----------------------------------------------------------------------------- # Default standalone if no standalone specified DEFAULT_STANDALONE=LF_SAMYRUN HELP_EXAMPLE_STANDALONE=LF_SAMYRUN @@ -62,6 +47,9 @@ define KNOWN_STANDALONE_DEFINITIONS | HF_14ASNIFF | 14a sniff to flashmem | | (RDV4 only) | | +----------------------------------------------------------+ +| HF_15693SNIFF | 15693 sniff to flashmem | +| (RDV4 only) | | ++----------------------------------------------------------+ | HF_AVEFUL | Mifare ultralight read/simulation | | | - Ave Ozkal | +----------------------------------------------------------+ @@ -107,10 +95,10 @@ define KNOWN_STANDALONE_DEFINITIONS endef STANDALONE_MODES := LF_SKELETON LF_EM4100EMUL LF_EM4100RSWB LF_EM4100RWC LF_HIDBRUTE LF_HIDFCBRUTE LF_ICEHID LF_PROXBRUTE LF_SAMYRUN LF_THAREXDE LF_NEXID -STANDALONE_MODES += HF_14ASNIFF HF_AVEFUL HF_BOG HF_COLIN HF_CRAFTBYTE HF_ICECLASS HF_LEGIC HF_MATTYRUN HF_MFCSIM HF_MSDSAL HF_TCPRST HF_TMUDFORD HF_YOUNG HF_REBLAY DANKARMULTI +STANDALONE_MODES += HF_14ASNIFF HF_15693SNIFF HF_AVEFUL HF_BOG HF_COLIN HF_CRAFTBYTE HF_ICECLASS HF_LEGIC HF_MATTYRUN HF_MFCSIM HF_MSDSAL HF_TCPRST HF_TMUDFORD HF_YOUNG HF_REBLAY DANKARMULTI STANDALONE_MODES_REQ_BT := HF_REBLAY STANDALONE_MODES_REQ_SMARTCARD := -STANDALONE_MODES_REQ_FLASH := LF_HIDFCBRUTE LF_ICEHID LF_NEXID LF_THAREXDE HF_14ASNIFF HF_BOG HF_COLIN HF_ICECLASS HF_MFCSIM +STANDALONE_MODES_REQ_FLASH := LF_HIDFCBRUTE LF_ICEHID LF_NEXID LF_THAREXDE HF_14ASNIFF HF_15693SNIFF HF_BOG HF_COLIN HF_ICECLASS HF_MFCSIM ifneq ($(filter $(STANDALONE),$(STANDALONE_MODES)),) STANDALONE_PLATFORM_DEFS += -DWITH_STANDALONE_$(STANDALONE) ifneq ($(filter $(STANDALONE),$(STANDALONE_MODES_REQ_SMARTCARD)),) diff --git a/armsrc/Standalone/Makefile.inc b/armsrc/Standalone/Makefile.inc index 021d219f4..c65533a57 100644 --- a/armsrc/Standalone/Makefile.inc +++ b/armsrc/Standalone/Makefile.inc @@ -1,20 +1,4 @@ -#----------------------------------------------------------------------------- -# Copyright (C) Proxmark3 contributors. See AUTHORS.md for details. -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# See LICENSE.txt for the text of the license. -#----------------------------------------------------------------------------- # Generic standalone Mode injection of source code -#----------------------------------------------------------------------------- SRC_STANDALONE = placeholder.c # WITH_STANDALONE_LF_SKELETON @@ -57,6 +41,10 @@ endif ifneq (,$(findstring WITH_STANDALONE_HF_14ASNIFF,$(APP_CFLAGS))) SRC_STANDALONE = hf_14asniff.c endif +# WITH_STANDALONE_HF_15693SNIFF +ifneq (,$(findstring WITH_STANDALONE_HF_15693SNIFF,$(APP_CFLAGS))) + SRC_STANDALONE = hf_15693sniff.c +endif # WITH_STANDALONE_HF_AVEFUL ifneq (,$(findstring WITH_STANDALONE_HF_AVEFUL,$(APP_CFLAGS))) SRC_STANDALONE = hf_aveful.c diff --git a/armsrc/Standalone/hf_15693sniff.c b/armsrc/Standalone/hf_15693sniff.c new file mode 100644 index 000000000..cf72bc646 --- /dev/null +++ b/armsrc/Standalone/hf_15693sniff.c @@ -0,0 +1,129 @@ +//----------------------------------------------------------------------------- +// Copyright 2020 Michael Farrell +// +// This code is licensed to you under the terms of the GNU GPL, version 2 or, +// at your option, any later version. See the LICENSE.txt file for the text of +// the license. +//----------------------------------------------------------------------------- +// main code for standalone HF/iso15693 Sniff to flash +//----------------------------------------------------------------------------- + +/* + * `hf_15693sniff` passively sniffs ISO15693 frames, and stores them in internal + * flash. It requires RDV4 hardware (for flash and battery). + * + * This module is similar to hf_bog (which only logs ULC/NTAG/ULEV1 auth). + * + * On entering stand-alone mode, this module will start sniffing ISO15693 frames. + * This will be stored in the normal trace buffer (ie: in RAM -- will be lost + * at power-off). + * + * Short-pressing the button again will stop sniffing, and at _this_ point + * append trace data from RAM to a file in flash (hf_15693sniff.trace) and unmount. + * + * Once the data is saved, standalone mode will exit. + * + * LEDs: + * - LED1: sniffing + * - LED2: sniffed tag command, turns off when finished sniffing reader command + * - LED3: sniffed reader command, turns off when finished sniffing tag command + * - LED4: unmounting/sync'ing flash (normally < 100ms) + * + * To retrieve trace data from flash: + * + * 1. mem spiffs dump -s hf_15693sniff.trace -d hf_15693sniff.trace + * Copies trace data file from flash to your PC. + * + * 2. trace load hf_15693sniff.trace + * Loads trace data from a file into PC-side buffers. + * + * 3. For ISO15693: trace list -t 15 -1 + * For MIFARE Classic: trace list -t mf -1 + * + * Lists trace data from buffer without requesting it from PM3. + * + * This module emits debug strings during normal operation -- so try it out in + * the lab connected to PM3 client before taking it into the field. + * + * To delete the trace data from flash: + * + * Caveats / notes: + * - Trace buffer will be cleared on starting stand-alone mode. Data in flash + * will remain unless explicitly deleted. + * - This module will terminate if the trace buffer is full (and save data to + * flash). + * - Like normal sniffing mode, timestamps overflow after 5 min 16 sec. + * However, the trace buffer is sequential, so will be in the correct order. + */ + +#include "standalone.h" // standalone definitions +#include "proxmark3_arm.h" +#include "fpgaloader.h" +#include "iso15693.h" +#include "iso15.h" +#include "util.h" +#include "spiffs.h" +#include "appmain.h" +#include "dbprint.h" +#include "ticks.h" +#include "BigBuf.h" + + + + +#define HF_15693SNIFF_LOGFILE "hf_15693sniff.trace" + +static void DownloadTraceInstructions(void) { + Dbprintf(""); + Dbprintf("To get the trace from flash and display it:"); + Dbprintf("1. mem spiffs dump -s "HF_15693SNIFF_LOGFILE" -d hf_15693sniff.trace"); + Dbprintf("2. trace load -f hf_15693sniff.trace"); + Dbprintf("3. trace list -t 15 -1"); +} + +void ModInfo(void) { + DbpString(" HF 15693 SNIFF, a ISO15693 sniffer with storing in flashmem"); + DownloadTraceInstructions(); +} + +void RunMod(void) { + StandAloneMode(); + + Dbprintf(_YELLOW_("HF 15693 SNIFF started")); + rdv40_spiffs_lazy_mount(); + + SniffIso15693(0, NULL); + + Dbprintf("Stopped sniffing"); + SpinDelay(200); + + // Write stuff to spiffs logfile + uint32_t trace_len = BigBuf_get_traceLen(); + if (trace_len > 0) { + Dbprintf("[!] Trace length (bytes) = %u", trace_len); + + uint8_t *trace_buffer = BigBuf_get_addr(); + if (!exists_in_spiffs(HF_15693SNIFF_LOGFILE)) { + rdv40_spiffs_write( + HF_15693SNIFF_LOGFILE, trace_buffer, trace_len, RDV40_SPIFFS_SAFETY_SAFE); + Dbprintf("[!] Wrote trace to "HF_15693SNIFF_LOGFILE); + } else { + rdv40_spiffs_append( + HF_15693SNIFF_LOGFILE, trace_buffer, trace_len, RDV40_SPIFFS_SAFETY_SAFE); + Dbprintf("[!] Appended trace to "HF_15693SNIFF_LOGFILE); + } + } else { + Dbprintf("[!] Trace buffer is empty, nothing to write!"); + } + + LED_D_ON(); + rdv40_spiffs_lazy_unmount(); + LED_D_OFF(); + + SpinErr(LED_A, 200, 5); + SpinDelay(100); + + Dbprintf("-=[ exit ]=-"); + LEDsoff(); + DownloadTraceInstructions(); +} From d5842d9d9203bd7757b0816edf426ff06e302b3e Mon Sep 17 00:00:00 2001 From: Nate Glaser Date: Fri, 7 Jan 2022 18:12:28 -0500 Subject: [PATCH 2/9] changed beginning of 15693 sniff file --- armsrc/Standalone/hf_15693sniff.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/armsrc/Standalone/hf_15693sniff.c b/armsrc/Standalone/hf_15693sniff.c index cf72bc646..e44478f58 100644 --- a/armsrc/Standalone/hf_15693sniff.c +++ b/armsrc/Standalone/hf_15693sniff.c @@ -1,5 +1,5 @@ //----------------------------------------------------------------------------- -// Copyright 2020 Michael Farrell +// Copyright 2021 Nathan Glaser // // This code is licensed to you under the terms of the GNU GPL, version 2 or, // at your option, any later version. See the LICENSE.txt file for the text of @@ -9,11 +9,11 @@ //----------------------------------------------------------------------------- /* + * This is 95% the same code as Michael Farrell's hf_14ASNIFF Standalone mode. + * * `hf_15693sniff` passively sniffs ISO15693 frames, and stores them in internal * flash. It requires RDV4 hardware (for flash and battery). * - * This module is similar to hf_bog (which only logs ULC/NTAG/ULEV1 auth). - * * On entering stand-alone mode, this module will start sniffing ISO15693 frames. * This will be stored in the normal trace buffer (ie: in RAM -- will be lost * at power-off). @@ -38,7 +38,6 @@ * Loads trace data from a file into PC-side buffers. * * 3. For ISO15693: trace list -t 15 -1 - * For MIFARE Classic: trace list -t mf -1 * * Lists trace data from buffer without requesting it from PM3. * @@ -83,7 +82,7 @@ static void DownloadTraceInstructions(void) { void ModInfo(void) { DbpString(" HF 15693 SNIFF, a ISO15693 sniffer with storing in flashmem"); - DownloadTraceInstructions(); +// DownloadTraceInstructions(); } void RunMod(void) { From 323248060e10a3c62d481577d3891036040abf79 Mon Sep 17 00:00:00 2001 From: Nate Glaser Date: Fri, 7 Jan 2022 18:16:41 -0500 Subject: [PATCH 3/9] changed description --- armsrc/Standalone/hf_15693sniff.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/armsrc/Standalone/hf_15693sniff.c b/armsrc/Standalone/hf_15693sniff.c index e44478f58..35e22c966 100644 --- a/armsrc/Standalone/hf_15693sniff.c +++ b/armsrc/Standalone/hf_15693sniff.c @@ -81,7 +81,7 @@ static void DownloadTraceInstructions(void) { } void ModInfo(void) { - DbpString(" HF 15693 SNIFF, a ISO15693 sniffer with storing in flashmem"); + DbpString(" HF 15693 SNIFF, a ISO15693 sniffer with storing in flashmem (Nathan Glaser)"); // DownloadTraceInstructions(); } From fcc9a315a29145efa3fe24848ab3e16257df20ed Mon Sep 17 00:00:00 2001 From: Nate Glaser Date: Fri, 7 Jan 2022 18:19:33 -0500 Subject: [PATCH 4/9] Changelog.md update --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6b6622413..07061b864 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -58,6 +58,7 @@ This project uses the changelog in accordance with [keepchangelog](http://keepac - Fixed `SimulateTagLowFrequencyEx` ignoring the `ledcontrol` argument (@zabszk) - Added ledcontrol argument to LF operations (@zabszk) - Added new standalone mode `dankarmulti` - select and run multiple standalone modes (@dankar) + - Added new standalone mode `hf_15693SNIFF` - Same as `hf_14ASNIFF` standalone mode for RDV4 - flashmem ## [crimson.4.14434][2021-09-18] - Fixed `hf mf staticnested` - flashmem / non loop now works (@horrordash) From 5ccc749f237c7bffea05cdc72b1ef68e836153ec Mon Sep 17 00:00:00 2001 From: Nate Glaser Date: Fri, 7 Jan 2022 18:22:08 -0500 Subject: [PATCH 5/9] Added Advanced compilation parameters --- doc/md/Use_of_Proxmark/4_Advanced-compilation-parameters.md | 1 + 1 file changed, 1 insertion(+) 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 150ad762a..1d2127926 100644 --- a/doc/md/Use_of_Proxmark/4_Advanced-compilation-parameters.md +++ b/doc/md/Use_of_Proxmark/4_Advanced-compilation-parameters.md @@ -113,6 +113,7 @@ Here are the supported values you can assign to `STANDALONE` in `Makefile.platfo | LF_SKELETON | standalone mode skeleton - Iceman1001 | LF_THAREXDE | LF EM4x50 simulator/read standalone mode - tharexde | HF_14ASNIFF | 14a sniff storing to flashmem - Micolous +| HF_15693SNIFF | 15693 sniff storing to flashmem - Glaser | HF_AVEFUL | MIFARE Ultralight read/simulation - Ave Ozkal | HF_BOG | 14a sniff with ULC/ULEV1/NTAG auth storing in flashmem - Bogito | HF_CRAFTBYTE | UID stealer - Emulates scanned 14a UID - Anze Jensterle From 0579b8f63cbb92e28353713d583120d92cc707cc Mon Sep 17 00:00:00 2001 From: Nate Glaser Date: Fri, 7 Jan 2022 19:07:29 -0500 Subject: [PATCH 6/9] Made requested changes -- I think --- armsrc/Standalone/Makefile.hal | 17 +++++++++++++- armsrc/Standalone/Makefile.inc | 22 ++++++++++++++++--- .../{hf_15693sniff.c => hf_15sniff.c} | 17 ++++++++++---- .../4_Advanced-compilation-parameters.md | 2 +- 4 files changed, 49 insertions(+), 9 deletions(-) rename armsrc/Standalone/{hf_15693sniff.c => hf_15sniff.c} (86%) diff --git a/armsrc/Standalone/Makefile.hal b/armsrc/Standalone/Makefile.hal index b7fc6e11b..c18bef124 100644 --- a/armsrc/Standalone/Makefile.hal +++ b/armsrc/Standalone/Makefile.hal @@ -1,3 +1,18 @@ +#----------------------------------------------------------------------------- +# Copyright (C) Proxmark3 contributors. See AUTHORS.md for details. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# See LICENSE.txt for the text of the license. +#----------------------------------------------------------------------------- # Default standalone if no standalone specified DEFAULT_STANDALONE=LF_SAMYRUN HELP_EXAMPLE_STANDALONE=LF_SAMYRUN @@ -47,7 +62,7 @@ define KNOWN_STANDALONE_DEFINITIONS | HF_14ASNIFF | 14a sniff to flashmem | | (RDV4 only) | | +----------------------------------------------------------+ -| HF_15693SNIFF | 15693 sniff to flashmem | +| HF_15SNIFF | 15693 sniff to flashmem | | (RDV4 only) | | +----------------------------------------------------------+ | HF_AVEFUL | Mifare ultralight read/simulation | diff --git a/armsrc/Standalone/Makefile.inc b/armsrc/Standalone/Makefile.inc index c65533a57..6f8e3c994 100644 --- a/armsrc/Standalone/Makefile.inc +++ b/armsrc/Standalone/Makefile.inc @@ -1,4 +1,20 @@ +#----------------------------------------------------------------------------- +# Copyright (C) Proxmark3 contributors. See AUTHORS.md for details. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# See LICENSE.txt for the text of the license. +#----------------------------------------------------------------------------- # Generic standalone Mode injection of source code +#----------------------------------------------------------------------------- SRC_STANDALONE = placeholder.c # WITH_STANDALONE_LF_SKELETON @@ -41,9 +57,9 @@ endif ifneq (,$(findstring WITH_STANDALONE_HF_14ASNIFF,$(APP_CFLAGS))) SRC_STANDALONE = hf_14asniff.c endif -# WITH_STANDALONE_HF_15693SNIFF -ifneq (,$(findstring WITH_STANDALONE_HF_15693SNIFF,$(APP_CFLAGS))) - SRC_STANDALONE = hf_15693sniff.c +# WITH_STANDALONE_HF_15SNIFF +ifneq (,$(findstring WITH_STANDALONE_HF_15SNIFF,$(APP_CFLAGS))) + SRC_STANDALONE = hf_15sniff.c endif # WITH_STANDALONE_HF_AVEFUL ifneq (,$(findstring WITH_STANDALONE_HF_AVEFUL,$(APP_CFLAGS))) diff --git a/armsrc/Standalone/hf_15693sniff.c b/armsrc/Standalone/hf_15sniff.c similarity index 86% rename from armsrc/Standalone/hf_15693sniff.c rename to armsrc/Standalone/hf_15sniff.c index 35e22c966..45d837859 100644 --- a/armsrc/Standalone/hf_15693sniff.c +++ b/armsrc/Standalone/hf_15sniff.c @@ -1,9 +1,18 @@ //----------------------------------------------------------------------------- -// Copyright 2021 Nathan Glaser +// Copyright (C) Nathan Glaser, 2021 +// Copyright (C) Proxmark3 contributors. See AUTHORS.md for details. // -// This code is licensed to you under the terms of the GNU GPL, version 2 or, -// at your option, any later version. See the LICENSE.txt file for the text of -// the license. +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// See LICENSE.txt for the text of the license. //----------------------------------------------------------------------------- // main code for standalone HF/iso15693 Sniff to flash //----------------------------------------------------------------------------- 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 1d2127926..5813caf48 100644 --- a/doc/md/Use_of_Proxmark/4_Advanced-compilation-parameters.md +++ b/doc/md/Use_of_Proxmark/4_Advanced-compilation-parameters.md @@ -113,7 +113,7 @@ Here are the supported values you can assign to `STANDALONE` in `Makefile.platfo | LF_SKELETON | standalone mode skeleton - Iceman1001 | LF_THAREXDE | LF EM4x50 simulator/read standalone mode - tharexde | HF_14ASNIFF | 14a sniff storing to flashmem - Micolous -| HF_15693SNIFF | 15693 sniff storing to flashmem - Glaser +| HF_15SNIFF | 15693 sniff storing to flashmem - Glaser | HF_AVEFUL | MIFARE Ultralight read/simulation - Ave Ozkal | HF_BOG | 14a sniff with ULC/ULEV1/NTAG auth storing in flashmem - Bogito | HF_CRAFTBYTE | UID stealer - Emulates scanned 14a UID - Anze Jensterle From 169f7dfc47ed62d7186e914add02e71662c1a7ce Mon Sep 17 00:00:00 2001 From: Nate Glaser Date: Fri, 7 Jan 2022 19:12:13 -0500 Subject: [PATCH 7/9] added build_all_firmware changes --- tools/build_all_firmwares.sh | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/tools/build_all_firmwares.sh b/tools/build_all_firmwares.sh index 648bd211b..7514a9757 100755 --- a/tools/build_all_firmwares.sh +++ b/tools/build_all_firmwares.sh @@ -1,5 +1,20 @@ #!/bin/bash # (Need bash because of Bash Arrays) +#----------------------------------------------------------------------------- +# Copyright (C) Proxmark3 contributors. See AUTHORS.md for details. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# See LICENSE.txt for the text of the license. +#----------------------------------------------------------------------------- # These vars can be overridden by env variables echo "Makefile flags: ${MKFLAGS:=-j8}" @@ -16,10 +31,10 @@ mv bootrom/obj/bootrom.elf "$DEST/PM3BOOTROM.elf" # cf armsrc/Standalone/Makefile.hal STANDALONE_MODES=(LF_SKELETON LF_EM4100EMUL LF_EM4100RSWB LF_EM4100RWC LF_HIDBRUTE LF_HIDFCBRUTE LF_ICEHID LF_PROXBRUTE LF_SAMYRUN LF_THAREXDE LF_NEXID) -STANDALONE_MODES+=(HF_14ASNIFF HF_AVEFUL HF_BOG HF_COLIN HF_CRAFTBYTE HF_ICECLASS HF_LEGIC HF_MATTYRUN HF_MFCSIM HF_MSDSAL HF_TCPRST HF_TMUDFORD HF_YOUNG HF_REBLAY DANKARMULTI) +STANDALONE_MODES+=(HF_14ASNIFF HF_15SNIFF HF_AVEFUL HF_BOG HF_COLIN HF_CRAFTBYTE HF_ICECLASS HF_LEGIC HF_MATTYRUN HF_MFCSIM HF_MSDSAL HF_TCPRST HF_TMUDFORD HF_YOUNG HF_REBLAY DANKARMULTI) STANDALONE_MODES_REQ_BT=(HF_REBLAY) STANDALONE_MODES_REQ_SMARTCARD=() -STANDALONE_MODES_REQ_FLASH=(LF_HIDFCBRUTE LF_ICEHID LF_NEXID LF_THAREXDE HF_14ASNIFF HF_BOG HF_COLIN HF_ICECLASS HF_MFCSIM) +STANDALONE_MODES_REQ_FLASH=(LF_HIDFCBRUTE LF_ICEHID LF_NEXID LF_THAREXDE HF_14ASNIFF HF_15SNIFF HF_BOG HF_COLIN HF_ICECLASS HF_MFCSIM) # PM3GENERIC 256kb, no flash, need to skip some parts to reduce size From a06c88e728c6a8e88350ca190449633d8bea5515 Mon Sep 17 00:00:00 2001 From: Nate Glaser Date: Fri, 7 Jan 2022 19:18:41 -0500 Subject: [PATCH 8/9] Makefile.hal change to remove 693 --- armsrc/Standalone/Makefile.hal | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/armsrc/Standalone/Makefile.hal b/armsrc/Standalone/Makefile.hal index c18bef124..0d6b0527a 100644 --- a/armsrc/Standalone/Makefile.hal +++ b/armsrc/Standalone/Makefile.hal @@ -110,10 +110,10 @@ define KNOWN_STANDALONE_DEFINITIONS endef STANDALONE_MODES := LF_SKELETON LF_EM4100EMUL LF_EM4100RSWB LF_EM4100RWC LF_HIDBRUTE LF_HIDFCBRUTE LF_ICEHID LF_PROXBRUTE LF_SAMYRUN LF_THAREXDE LF_NEXID -STANDALONE_MODES += HF_14ASNIFF HF_15693SNIFF HF_AVEFUL HF_BOG HF_COLIN HF_CRAFTBYTE HF_ICECLASS HF_LEGIC HF_MATTYRUN HF_MFCSIM HF_MSDSAL HF_TCPRST HF_TMUDFORD HF_YOUNG HF_REBLAY DANKARMULTI +STANDALONE_MODES += HF_14ASNIFF HF_15SNIFF HF_AVEFUL HF_BOG HF_COLIN HF_CRAFTBYTE HF_ICECLASS HF_LEGIC HF_MATTYRUN HF_MFCSIM HF_MSDSAL HF_TCPRST HF_TMUDFORD HF_YOUNG HF_REBLAY DANKARMULTI STANDALONE_MODES_REQ_BT := HF_REBLAY STANDALONE_MODES_REQ_SMARTCARD := -STANDALONE_MODES_REQ_FLASH := LF_HIDFCBRUTE LF_ICEHID LF_NEXID LF_THAREXDE HF_14ASNIFF HF_15693SNIFF HF_BOG HF_COLIN HF_ICECLASS HF_MFCSIM +STANDALONE_MODES_REQ_FLASH := LF_HIDFCBRUTE LF_ICEHID LF_NEXID LF_THAREXDE HF_14ASNIFF HF_15SNIFF HF_BOG HF_COLIN HF_ICECLASS HF_MFCSIM ifneq ($(filter $(STANDALONE),$(STANDALONE_MODES)),) STANDALONE_PLATFORM_DEFS += -DWITH_STANDALONE_$(STANDALONE) ifneq ($(filter $(STANDALONE),$(STANDALONE_MODES_REQ_SMARTCARD)),) From 118bc8f16db6bd88795ff7cf4e1fac4a83c892c6 Mon Sep 17 00:00:00 2001 From: Nate Glaser Date: Fri, 7 Jan 2022 19:20:46 -0500 Subject: [PATCH 9/9] Changelog.md to move 15693 --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 07061b864..eab266b2b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ 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] + - Added new standalone mode `hf_15SNIFF` - Same as `hf_14ASNIFF` standalone mode for RDV4 - flashmem - Added support for MIFARE DESFire application creation without authentication (@joswr1ght) - Changed drastically Hitag S ARM code to remove state machines and ease way to build new commands (@doegox) - Fixed Hitag S crypto mode with key or NrAr, fixed `lf hitag cc`, fixed pwd dump in hitagS dump with LKP (@doegox) @@ -58,7 +59,6 @@ This project uses the changelog in accordance with [keepchangelog](http://keepac - Fixed `SimulateTagLowFrequencyEx` ignoring the `ledcontrol` argument (@zabszk) - Added ledcontrol argument to LF operations (@zabszk) - Added new standalone mode `dankarmulti` - select and run multiple standalone modes (@dankar) - - Added new standalone mode `hf_15693SNIFF` - Same as `hf_14ASNIFF` standalone mode for RDV4 - flashmem ## [crimson.4.14434][2021-09-18] - Fixed `hf mf staticnested` - flashmem / non loop now works (@horrordash)