mirror of
https://github.com/RfidResearchGroup/proxmark3.git
synced 2024-12-30 20:23:46 +08:00
fix: StandAloneMode proxbrute - missing variable and missing define. ZERO = 0.
This commit is contained in:
parent
3eaddc2b3d
commit
1c37981430
1 changed files with 18 additions and 19 deletions
|
@ -41,17 +41,17 @@ void RunMod() {
|
||||||
LED(LED_RED2, 0);
|
LED(LED_RED2, 0);
|
||||||
|
|
||||||
// record
|
// record
|
||||||
DbpString("Starting recording");
|
DbpString("[+] starting recording");
|
||||||
|
|
||||||
// wait for button to be released
|
// wait for button to be released
|
||||||
while(BUTTON_PRESS())
|
while (BUTTON_PRESS())
|
||||||
WDT_HIT();
|
WDT_HIT();
|
||||||
|
|
||||||
/* need this delay to prevent catching some weird data */
|
/* need this delay to prevent catching some weird data */
|
||||||
SpinDelay(500);
|
SpinDelay(500);
|
||||||
|
|
||||||
CmdHIDdemodFSK(1, &high[selected], &low[selected], 0);
|
CmdHIDdemodFSK(1, &high[selected], &low[selected], 0);
|
||||||
Dbprintf("Recorded %x %x %08x", selected, high[selected], low[selected]);
|
Dbprintf("[+] recorded %x %x %08x", selected, high[selected], low[selected]);
|
||||||
|
|
||||||
LEDsoff();
|
LEDsoff();
|
||||||
LED(selected + 1, 0);
|
LED(selected + 1, 0);
|
||||||
|
@ -67,17 +67,17 @@ void RunMod() {
|
||||||
LED(LED_ORANGE, 0);
|
LED(LED_ORANGE, 0);
|
||||||
|
|
||||||
// record
|
// record
|
||||||
Dbprintf("Cloning %x %x %08x", selected, high[selected], low[selected]);
|
Dbprintf("[+] cloning %x %x %08x", selected, high[selected], low[selected]);
|
||||||
|
|
||||||
// wait for button to be released
|
// wait for button to be released
|
||||||
while(BUTTON_PRESS())
|
while (BUTTON_PRESS())
|
||||||
WDT_HIT();
|
WDT_HIT();
|
||||||
|
|
||||||
/* need this delay to prevent catching some weird data */
|
/* need this delay to prevent catching some weird data */
|
||||||
SpinDelay(500);
|
SpinDelay(500);
|
||||||
|
|
||||||
CopyHIDtoT55x7(0, high[selected], low[selected], 0);
|
CopyHIDtoT55x7(0, high[selected], low[selected], 0);
|
||||||
Dbprintf("Cloned %x %x %08x", selected, high[selected], low[selected]);
|
Dbprintf("[+] cloned %x %x %08x", selected, high[selected], low[selected]);
|
||||||
|
|
||||||
LEDsoff();
|
LEDsoff();
|
||||||
LED(selected + 1, 0);
|
LED(selected + 1, 0);
|
||||||
|
@ -102,9 +102,9 @@ void RunMod() {
|
||||||
// Begin transmitting
|
// Begin transmitting
|
||||||
if (playing) {
|
if (playing) {
|
||||||
LED(LED_GREEN, 0);
|
LED(LED_GREEN, 0);
|
||||||
DbpString("Playing");
|
DbpString("[+] playing");
|
||||||
// wait for button to be released
|
// wait for button to be released
|
||||||
while(BUTTON_PRESS())
|
while (BUTTON_PRESS())
|
||||||
WDT_HIT();
|
WDT_HIT();
|
||||||
|
|
||||||
/* START PROXBRUTE */
|
/* START PROXBRUTE */
|
||||||
|
@ -119,34 +119,33 @@ void RunMod() {
|
||||||
it takes to get a valid ID then start from scratch every time.
|
it takes to get a valid ID then start from scratch every time.
|
||||||
*/
|
*/
|
||||||
if ( selected == 1 ) {
|
if ( selected == 1 ) {
|
||||||
DbpString("Entering ProxBrute Mode");
|
DbpString("[=] entering ProxBrute Mode");
|
||||||
DbpString("brad a. - foundstone");
|
Dbprintf("[+] current Tag: Selected = %x Facility = %08x ID = %08x", selected, high[selected], low[selected]);
|
||||||
Dbprintf("Current Tag: Selected = %x Facility = %08x ID = %08x", selected, high[selected], low[selected]);
|
|
||||||
LED(LED_ORANGE, 0);
|
LED(LED_ORANGE, 0);
|
||||||
LED(LED_RED, 0);
|
LED(LED_RED, 0);
|
||||||
for ( i = low[selected]-1; i > ZERO; i--) {
|
for (uint16_t i = low[selected]-1; i > 0; i--) {
|
||||||
if (BUTTON_PRESS()) {
|
if (BUTTON_PRESS()) {
|
||||||
DbpString("Told to Stop");
|
DbpString("[-] told to stop");
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
Dbprintf("Trying Facility = %08x ID %08x", high[selected], i);
|
Dbprintf("[=] trying Facility = %08x ID %08x", high[selected], i);
|
||||||
CmdHIDsimTAGEx(high[selected], i, 0, 20000);
|
CmdHIDsimTAGEx(high[selected], i, 0, 20000);
|
||||||
SpinDelay(500);
|
SpinDelay(500);
|
||||||
}
|
}
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
DbpString("Red is lit, not entering ProxBrute Mode");
|
DbpString("[+] RED is lit, not entering ProxBrute Mode");
|
||||||
Dbprintf("%x %x %x", selected, high[selected], low[selected]);
|
Dbprintf("[+] %x %x %x", selected, high[selected], low[selected]);
|
||||||
CmdHIDsimTAGEx(high[selected], low[selected], 0, 20000);
|
CmdHIDsimTAGEx(high[selected], low[selected], 0, 20000);
|
||||||
DbpString("Done playing");
|
DbpString("[+] done playing");
|
||||||
}
|
}
|
||||||
|
|
||||||
/* END PROXBRUTE */
|
/* END PROXBRUTE */
|
||||||
|
|
||||||
|
|
||||||
if (BUTTON_HELD(1000) > 0) {
|
if (BUTTON_HELD(1000) > 0) {
|
||||||
DbpString("Exiting");
|
DbpString("[+] exiting");
|
||||||
LEDsoff();
|
LEDsoff();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -161,7 +160,7 @@ void RunMod() {
|
||||||
LED(selected + 1, 0);
|
LED(selected + 1, 0);
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
while(BUTTON_PRESS())
|
while (BUTTON_PRESS())
|
||||||
WDT_HIT();
|
WDT_HIT();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue