github/RRG-Proxmark3
1
0
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-08-25 07:35:40 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Merge pull request #1620 from lnv42/standalone15

Browse source 
Make HF_15SNIFF standalone mode compatible with old PM3 (without flashmem)
This commit is contained in:
Iceman 2022-03-08 16:10:02 +01:00 • committed by GitHub
commit 085faa189b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
armsrc/Standalone/Makefile.hal
View file

@ -65,8 +65,8 @@ define KNOWN_STANDALONE_DEFINITIONS
| HF_14ASNIFF | 14a sniff to flashmem | | HF_14ASNIFF | 14a sniff to flashmem |
| (RDV4 only) | | | (RDV4 only) | |
+----------------------------------------------------------+ +----------------------------------------------------------+
| HF_15SNIFF | 15693 sniff to flashmem | | HF_15SNIFF | 15693 sniff to flashmem (rdv4) or ram |
| (RDV4 only) | | | | |
+----------------------------------------------------------+ +----------------------------------------------------------+
| HF_AVEFUL | Mifare ultralight read/simulation | | HF_AVEFUL | Mifare ultralight read/simulation |
| | - Ave Ozkal | | | - Ave Ozkal |
@ -119,7 +119,7 @@ STANDALONE_MODES := LF_SKELETON LF_EM4100EMUL LF_EM4100RSWB LF_EM4100RSWW LF_EM4
STANDALONE_MODES += HF_14ASNIFF HF_15SNIFF HF_AVEFUL HF_BOG HF_COLIN HF_CRAFTBYTE HF_ICECLASS HF_LEGIC HF_LEGICSIM 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_LEGICSIM HF_MATTYRUN HF_MFCSIM HF_MSDSAL HF_TCPRST HF_TMUDFORD HF_YOUNG HF_REBLAY DANKARMULTI
STANDALONE_MODES_REQ_BT := HF_REBLAY STANDALONE_MODES_REQ_BT := HF_REBLAY
STANDALONE_MODES_REQ_SMARTCARD := STANDALONE_MODES_REQ_SMARTCARD :=
STANDALONE_MODES_REQ_FLASH := LF_HIDFCBRUTE LF_ICEHID LF_NEXID LF_THAREXDE HF_14ASNIFF HF_15SNIFF HF_BOG HF_COLIN HF_ICECLASS HF_MFCSIM HF_LEGICSIM STANDALONE_MODES_REQ_FLASH := LF_HIDFCBRUTE LF_ICEHID LF_NEXID LF_THAREXDE HF_14ASNIFF HF_BOG HF_COLIN HF_ICECLASS HF_MFCSIM HF_LEGICSIM
ifneq ($(filter $(STANDALONE),$(STANDALONE_MODES)),) ifneq ($(filter $(STANDALONE),$(STANDALONE_MODES)),)
STANDALONE_PLATFORM_DEFS += -DWITH_STANDALONE_$(STANDALONE) STANDALONE_PLATFORM_DEFS += -DWITH_STANDALONE_$(STANDALONE)
ifneq ($(filter $(STANDALONE),$(STANDALONE_MODES_REQ_SMARTCARD)),) ifneq ($(filter $(STANDALONE),$(STANDALONE_MODES_REQ_SMARTCARD)),)

10
armsrc/Standalone/hf_15sniff.c
View file

@ -98,15 +98,22 @@ void RunMod(void) {
StandAloneMode(); StandAloneMode();
Dbprintf(_YELLOW_("HF 15693 SNIFF started")); Dbprintf(_YELLOW_("HF 15693 SNIFF started"));
#ifdef WITH_FLASH
rdv40_spiffs_lazy_mount(); rdv40_spiffs_lazy_mount();
#endif
SniffIso15693(0, NULL); SniffIso15693(0, NULL);
Dbprintf("Stopped sniffing"); Dbprintf("Stopped sniffing");
SpinDelay(200); SpinDelay(200);
// Write stuff to spiffs logfile
uint32_t trace_len = BigBuf_get_traceLen(); uint32_t trace_len = BigBuf_get_traceLen();
#ifndef WITH_FLASH
// Keep stuff in BigBuf for USB/BT dumping
if (trace_len > 0)
Dbprintf("[!] Trace length (bytes) = %u", trace_len);
#else
// Write stuff to spiffs logfile
if (trace_len > 0) { if (trace_len > 0) {
Dbprintf("[!] Trace length (bytes) = %u", trace_len); Dbprintf("[!] Trace length (bytes) = %u", trace_len);
@ -130,6 +137,7 @@ void RunMod(void) {
SpinErr(LED_A, 200, 5); SpinErr(LED_A, 200, 5);
SpinDelay(100); SpinDelay(100);
#endif
Dbprintf("-=[ exit ]=-"); Dbprintf("-=[ exit ]=-");
LEDsoff(); LEDsoff();