mirror of
https://github.com/RfidResearchGroup/proxmark3.git
synced 2025-08-21 05:43:48 -07:00
Merge pull request #1978 from flamebarke/patch-1
New standalone mode - LF_MULTIHID - HID 26 Bit (H1031) multi simulator
This commit is contained in:
commit
52f4373de0
6 changed files with 87 additions and 2 deletions
|
@ -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...
|
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]
|
## [unreleased][unreleased]
|
||||||
|
- Added new standalone mode `LF_MULTIHID` - HID26 (H1031) multi simulator (@flamebarke)
|
||||||
- Changed `hf 14b dump --ns` - now supports `no save` of card memory (@iceman1001)
|
- Changed `hf 14b dump --ns` - now supports `no save` of card memory (@iceman1001)
|
||||||
- Changed `hf mfu dump --ns` - now supports `no save` of card memory (@iceman1001)
|
- Changed `hf mfu dump --ns` - now supports `no save` of card memory (@iceman1001)
|
||||||
- Changed the PM3 client to honor the preferences dump/trace paths. experimental support (@iceman1001)
|
- Changed the PM3 client to honor the preferences dump/trace paths. experimental support (@iceman1001)
|
||||||
|
|
|
@ -50,6 +50,9 @@ define KNOWN_STANDALONE_DEFINITIONS
|
||||||
| LF_ICEHID | LF HID collector to flashmem |
|
| LF_ICEHID | LF HID collector to flashmem |
|
||||||
| (RDV4 only) | |
|
| (RDV4 only) | |
|
||||||
+----------------------------------------------------------+
|
+----------------------------------------------------------+
|
||||||
|
| LF_MULTIHID | LF HID 26 Bit (H1031) multi simulator |
|
||||||
|
| | - Shain Lakin |
|
||||||
|
+----------------------------------------------------------+
|
||||||
| LF_NEDAP_SIM | LF Nedap ID simple simulator |
|
| LF_NEDAP_SIM | LF Nedap ID simple simulator |
|
||||||
| | |
|
| | |
|
||||||
+----------------------------------------------------------+
|
+----------------------------------------------------------+
|
||||||
|
@ -126,7 +129,7 @@ endef
|
||||||
|
|
||||||
|
|
||||||
STANDALONE_MODES := LF_SKELETON
|
STANDALONE_MODES := LF_SKELETON
|
||||||
STANDALONE_MODES += LF_EM4100EMUL LF_EM4100RSWB LF_EM4100RSWW LF_EM4100RWC LF_HIDBRUTE LF_HIDFCBRUTE LF_ICEHID LF_NEDAP_SIM LF_NEXID LF_PROXBRUTE LF_PROX2BRUTE LF_SAMYRUN LF_THAREXDE
|
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_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 += DANKARMULTI
|
STANDALONE_MODES += DANKARMULTI
|
||||||
STANDALONE_MODES_REQ_BT := HF_REBLAY
|
STANDALONE_MODES_REQ_BT := HF_REBLAY
|
||||||
|
|
|
@ -49,6 +49,10 @@ endif
|
||||||
ifneq (,$(findstring WITH_STANDALONE_LF_ICEHID,$(APP_CFLAGS)))
|
ifneq (,$(findstring WITH_STANDALONE_LF_ICEHID,$(APP_CFLAGS)))
|
||||||
SRC_STANDALONE = lf_icehid.c
|
SRC_STANDALONE = lf_icehid.c
|
||||||
endif
|
endif
|
||||||
|
# WITH_STANDALONE_LF_MULTIHID
|
||||||
|
ifneq (,$(findstring WITH_STANDALONE_LF_MULTIHID,$(APP_CFLAGS)))
|
||||||
|
SRC_STANDALONE = lf_multihid.c
|
||||||
|
endif
|
||||||
# WITH_STANDALONE_LF_NEDAP_SIM
|
# WITH_STANDALONE_LF_NEDAP_SIM
|
||||||
ifneq (,$(findstring WITH_STANDALONE_LF_NEDAP_SIM,$(APP_CFLAGS)))
|
ifneq (,$(findstring WITH_STANDALONE_LF_NEDAP_SIM,$(APP_CFLAGS)))
|
||||||
SRC_STANDALONE = lf_nedap_sim.c
|
SRC_STANDALONE = lf_nedap_sim.c
|
||||||
|
|
76
armsrc/Standalone/lf_multihid.c
Normal file
76
armsrc/Standalone/lf_multihid.c
Normal file
|
@ -0,0 +1,76 @@
|
||||||
|
//-----------------------------------------------------------------------------
|
||||||
|
// Copyright (C) Shain Lakin, 2023
|
||||||
|
// 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.
|
||||||
|
//-----------------------------------------------------------------------------
|
||||||
|
// LF HID 26 Bit (H10301) multi simulator:
|
||||||
|
// Simple LF HID26 (H10301) tag simulator
|
||||||
|
// Short click - select next slot and start simulation
|
||||||
|
// LEDS = LED ON for selected slot
|
||||||
|
// Add tags (raw) to the hid26_predefined_raw array
|
||||||
|
//-----------------------------------------------------------------------------
|
||||||
|
|
||||||
|
|
||||||
|
#include "standalone.h"
|
||||||
|
#include "proxmark3_arm.h"
|
||||||
|
#include "appmain.h"
|
||||||
|
#include "fpgaloader.h"
|
||||||
|
#include "util.h"
|
||||||
|
#include "dbprint.h"
|
||||||
|
#include "ticks.h"
|
||||||
|
#include "lfops.h"
|
||||||
|
|
||||||
|
#define ARRAYLEN(x) (sizeof(x) / sizeof((x)[0]))
|
||||||
|
#define MAX_IND 4
|
||||||
|
|
||||||
|
void LED_Slot(int i);
|
||||||
|
|
||||||
|
static uint64_t hid26_predefined_raw[] = {0x2004ec2e87, 0x2004421807, 0x20064312d6, 0x2006ec0c86};
|
||||||
|
static uint8_t hid26_slots_count;
|
||||||
|
|
||||||
|
void ModInfo(void) {
|
||||||
|
DbpString("LF HID 26 Bit (H10301) multi simulator - aka MultiHID (Shain Lakin)");
|
||||||
|
}
|
||||||
|
|
||||||
|
void LED_Slot(int i) {
|
||||||
|
LEDsoff();
|
||||||
|
if (hid26_slots_count > 4) {
|
||||||
|
LED(i % MAX_IND, 0);
|
||||||
|
} else {
|
||||||
|
LED(1 << i, 0);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void RunMod(void) {
|
||||||
|
StandAloneMode();
|
||||||
|
FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
|
||||||
|
Dbprintf(">> LF HID26 multi simulator started - aka MultiHID (Shain Lakin) <<");
|
||||||
|
|
||||||
|
int selected = 0; //selected slot after start
|
||||||
|
hid26_slots_count = ARRAYLEN(hid26_predefined_raw);
|
||||||
|
for (;;) {
|
||||||
|
WDT_HIT();
|
||||||
|
if (data_available()) {
|
||||||
|
LEDsoff();
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
SpinDelay(100);
|
||||||
|
SpinUp(100);
|
||||||
|
LED_Slot(selected);
|
||||||
|
uint64_t raw_data = hid26_predefined_raw[selected];
|
||||||
|
CmdHIDsimTAG(0, raw_data >> 32, raw_data & 0xFFFFFFFF, 0, false);
|
||||||
|
selected = (selected + 1) % hid26_slots_count;
|
||||||
|
}
|
||||||
|
}
|
|
@ -108,6 +108,7 @@ Here are the supported values you can assign to `STANDALONE` in `Makefile.platfo
|
||||||
| LF_HIDBRUTE | HID corporate 1000 bruteforce - Federico dotta & Maurizio Agazzini
|
| LF_HIDBRUTE | HID corporate 1000 bruteforce - Federico dotta & Maurizio Agazzini
|
||||||
| LF_HIDFCBRUTE | LF HID facility code bruteforce - ss23
|
| LF_HIDFCBRUTE | LF HID facility code bruteforce - ss23
|
||||||
| LF_ICEHID | LF HID collector to flashmem - Iceman1001
|
| LF_ICEHID | LF HID collector to flashmem - Iceman1001
|
||||||
|
| LF_MULTIHID | LF HID 26 Bit (H1031) multi simulator - Shain Lakin
|
||||||
| LF_NEDAP_SIM | LF Nedap ID simulator
|
| LF_NEDAP_SIM | LF Nedap ID simulator
|
||||||
| LF_NEXID | Nexwatch credentials detection mode - jrjgjk & Zolorah
|
| LF_NEXID | Nexwatch credentials detection mode - jrjgjk & Zolorah
|
||||||
| LF_PROXBRUTE | HID ProxII bruteforce - Brad Antoniewicz
|
| LF_PROXBRUTE | HID ProxII bruteforce - Brad Antoniewicz
|
||||||
|
|
|
@ -32,7 +32,7 @@ mv bootrom/obj/bootrom.elf "$DEST/PM3BOOTROM.elf"
|
||||||
|
|
||||||
# cf armsrc/Standalone/Makefile.hal
|
# cf armsrc/Standalone/Makefile.hal
|
||||||
STANDALONE_MODES=(LF_SKELETON)
|
STANDALONE_MODES=(LF_SKELETON)
|
||||||
STANDALONE_MODES+=(LF_EM4100EMUL LF_EM4100RSWB LF_EM4100RSWW LF_EM4100RWC LF_HIDBRUTE LF_HIDFCBRUTE LF_ICEHID LF_NEDAP_SIM LF_NEXID LF_PROXBRUTE LF_PROX2BRUTE LF_SAMYRUN LF_THAREXDE)
|
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_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+=(DANKARMULTI)
|
STANDALONE_MODES+=(DANKARMULTI)
|
||||||
STANDALONE_MODES_REQ_BT=(HF_REBLAY)
|
STANDALONE_MODES_REQ_BT=(HF_REBLAY)
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue