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

FIX: cleanup code, sync of output texts.

Browse source
This commit is contained in:
Chris 2018-09-05 18:58:58 +02:00
commit 4c72acaf63
3 changed files with 66 additions and 61 deletions
Download patch file Download diff file Expand all files Collapse all files

57
armsrc/Standalone/lf_hidbrute.c
View file

@ -47,7 +47,7 @@ void RunMod() {
// Was our button held down or pressed? // Was our button held down or pressed?
int button_pressed = BUTTON_HELD(1000); int button_pressed = BUTTON_HELD(1000);
//SpinDelay(300); SpinDelay(300);
// Button was held for a second, begin recording // Button was held for a second, begin recording
if (button_pressed > 0 && cardRead == 0) { if (button_pressed > 0 && cardRead == 0) {
@ -56,7 +56,7 @@ 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())
@ -66,7 +66,7 @@ void RunMod() {
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);
@ -82,7 +82,7 @@ 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())
@ -92,7 +92,7 @@ void RunMod() {
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);
@ -109,6 +109,7 @@ void RunMod() {
// Next option if we were previously playing // Next option if we were previously playing
if (playing) if (playing)
selected = (selected + 1) % OPTS; selected = (selected + 1) % OPTS;
playing = !playing; playing = !playing;
LEDsoff(); LEDsoff();
@ -118,21 +119,18 @@ void RunMod() {
if (playing && selected != 2) { if (playing && selected != 2) {
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();
Dbprintf("[+] %x %x %08x", selected, high[selected], low[selected]); Dbprintf("[=] %x %x %08x", selected, high[selected], low[selected]);
CmdHIDsimTAG(high[selected], low[selected], 0); CmdHIDsimTAG(high[selected], low[selected], 0);
DbpString("[+] done playing"); DbpString("[=] done playing");
if (BUTTON_HELD(1000) > 0) { if (BUTTON_HELD(1000) > 0)
DbpString("[+] exiting"); goto out;
LEDsoff();
return;
}
/* We pressed a button so ignore it here with a delay */ /* We pressed a button so ignore it here with a delay */
SpinDelay(300); SpinDelay(300);
@ -166,18 +164,18 @@ void RunMod() {
uint32_t fc = ((high[selected] & 1 ) << 11 ) | (low[selected] >> 21); uint32_t fc = ((high[selected] & 1 ) << 11 ) | (low[selected] >> 21);
uint32_t original_cardnum = cardnum; uint32_t original_cardnum = cardnum;
Dbprintf("[+] Proxbrute - starting decrementing card number"); Dbprintf("[=] Proxbrute - starting decrementing card number");
while (cardnum >= 0) { while (cardnum >= 0) {
// Needed for exiting from proxbrute when button is pressed // Needed for exiting from proxbrute when button is pressed
if (BUTTON_PRESS()) { if (BUTTON_PRESS()) {
if (BUTTON_HELD(1000) > 0) { if (BUTTON_HELD(1000) > 0) {
DbpString("[+] exiting"); goto out;
LEDsoff();
return;
} else { } else {
while (BUTTON_PRESS()) { WDT_HIT(); } while (BUTTON_PRESS()) {
WDT_HIT();
}
break; break;
} }
} }
@ -189,23 +187,21 @@ void RunMod() {
hid_corporate_1000_calculate_checksum_and_set(&high[selected], &low[selected], cardnum, fc); hid_corporate_1000_calculate_checksum_and_set(&high[selected], &low[selected], cardnum, fc);
// Print actual code to brute // Print actual code to brute
Dbprintf("[+] TAG ID: %x%08x (%d) - FC: %u - Card: %u", high[selected], low[selected], (low[selected] >> 1) & 0xFFFF, fc, cardnum); Dbprintf("[=] TAG ID: %x%08x (%d) - FC: %u - Card: %u", high[selected], low[selected], (low[selected] >> 1) & 0xFFFF, fc, cardnum);
CmdHIDsimTAGEx(high[selected], low[selected], 1, 50000); CmdHIDsimTAGEx(high[selected], low[selected], 1, 50000);
} }
cardnum = original_cardnum; cardnum = original_cardnum;
Dbprintf("[+] Proxbrute - starting incrementing card number"); Dbprintf("[=] Proxbrute - starting incrementing card number");
while (cardnum <= 0xFFFFF) { while (cardnum <= 0xFFFFF) {
// Needed for exiting from proxbrute when button is pressed // Needed for exiting from proxbrute when button is pressed
if (BUTTON_PRESS()) { if (BUTTON_PRESS()) {
if (BUTTON_HELD(1000) > 0) { if (BUTTON_HELD(1000) > 0) {
DbpString("[+] exiting"); goto out;
LEDsoff();
return;
} else { } else {
while (BUTTON_PRESS()) { WDT_HIT(); } while (BUTTON_PRESS()) { WDT_HIT(); }
break; break;
@ -219,17 +215,14 @@ void RunMod() {
hid_corporate_1000_calculate_checksum_and_set(&high[selected], &low[selected], cardnum, fc); hid_corporate_1000_calculate_checksum_and_set(&high[selected], &low[selected], cardnum, fc);
// Print actual code to brute // Print actual code to brute
Dbprintf("[+] TAG ID: %x%08x (%d) - FC: %u - Card: %u", high[selected], low[selected], (low[selected] >> 1) & 0xFFFF, fc, cardnum); Dbprintf("[=] TAG ID: %x%08x (%d) - FC: %u - Card: %u", high[selected], low[selected], (low[selected] >> 1) & 0xFFFF, fc, cardnum);
CmdHIDsimTAGEx(high[selected], low[selected], 1, 50000); CmdHIDsimTAGEx(high[selected], low[selected], 1, 50000);
} }
DbpString("[+] done bruteforcing"); DbpString("[=] done bruteforcing");
if (BUTTON_HELD(1000) > 0) { if (BUTTON_HELD(1000) > 0)
DbpString("Exiting"); goto out;
LEDsoff();
return;
}
/* We pressed a button so ignore it here with a delay */ /* We pressed a button so ignore it here with a delay */
SpinDelay(300); SpinDelay(300);
@ -246,6 +239,10 @@ void RunMod() {
} }
} }
} }
out:
DbpString("[=] exiting");
LEDsoff();
} }
// Function that calculate next value for the brutforce of HID corporate 1000 // Function that calculate next value for the brutforce of HID corporate 1000

30
armsrc/Standalone/lf_proxbrute.c
View file

@ -32,7 +32,7 @@ void RunMod() {
// Was our button held down or pressed? // Was our button held down or pressed?
int button_pressed = BUTTON_HELD(1000); int button_pressed = BUTTON_HELD(1000);
//SpinDelay(300); SpinDelay(300);
// Button was held for a second, begin recording // Button was held for a second, begin recording
if (button_pressed > 0 && cardRead == 0) { if (button_pressed > 0 && cardRead == 0) {
@ -41,7 +41,7 @@ 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())
@ -51,7 +51,7 @@ void RunMod() {
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,7 +67,7 @@ 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())
@ -77,7 +77,7 @@ void RunMod() {
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,7 +102,7 @@ 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();
@ -120,7 +120,7 @@ void RunMod() {
*/ */
if ( selected == 1 ) { if ( selected == 1 ) {
DbpString("[=] entering ProxBrute Mode"); DbpString("[=] entering ProxBrute Mode");
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 (uint16_t i = low[selected]-1; i > 0; i--) { for (uint16_t i = low[selected]-1; i > 0; i--) {
@ -135,20 +135,17 @@ void RunMod() {
} }
} 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"); goto out;
LEDsoff();
return;
}
/* We pressed a button so ignore it here with a delay */ /* We pressed a button so ignore it here with a delay */
SpinDelay(300); SpinDelay(300);
@ -165,4 +162,7 @@ void RunMod() {
} }
} }
} }
out:
DbpString("[=] exiting");
LEDsoff();
} }

38
armsrc/Standalone/lf_samyrun.c
View file

@ -19,7 +19,7 @@ void RunMod() {
int selected = 0; int selected = 0;
int playing = 0; int playing = 0;
int cardRead = 0; int cardRead = 0;
bool gotCard;
// Turn on selected LED // Turn on selected LED
LED(selected + 1, 0); LED(selected + 1, 0);
@ -31,7 +31,9 @@ void RunMod() {
// Was our button held down or pressed? // Was our button held down or pressed?
int button_pressed = BUTTON_HELD(1000); int button_pressed = BUTTON_HELD(1000);
//SpinDelay(300);
Dbprintf("button %d", button_pressed);
SpinDelay(300);
// Button was held for a second, begin recording // Button was held for a second, begin recording
if (button_pressed > 0 && cardRead == 0) { if (button_pressed > 0 && cardRead == 0) {
@ -40,7 +42,7 @@ 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())
@ -50,7 +52,7 @@ void RunMod() {
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 bank %x | %x %08x", selected, high[selected], low[selected]);
LEDsoff(); LEDsoff();
LED(selected + 1, 0); LED(selected + 1, 0);
@ -59,6 +61,8 @@ void RunMod() {
// so next button push begins playing what we recorded // so next button push begins playing what we recorded
playing = 0; playing = 0;
cardRead = 1; cardRead = 1;
gotCard = true;
} }
else if (button_pressed > 0 && cardRead == 1) { else if (button_pressed > 0 && cardRead == 1) {
LEDsoff(); LEDsoff();
@ -66,7 +70,7 @@ 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())
@ -76,7 +80,7 @@ void RunMod() {
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);
@ -89,10 +93,11 @@ void RunMod() {
} }
// Change where to record (or begin playing) // Change where to record (or begin playing)
else if (button_pressed) { else if (button_pressed && gotCard) {
// Next option if we were previously playing // Next option if we were previously playing
if (playing) if (playing)
selected = (selected + 1) % OPTS; selected = (selected + 1) % OPTS;
playing = !playing; playing = !playing;
LEDsoff(); LEDsoff();
@ -100,21 +105,20 @@ 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();
Dbprintf("[+] %x %x %08x", selected, high[selected], low[selected]); Dbprintf("[=] %x %x %08x", selected, high[selected], low[selected]);
CmdHIDsimTAG(high[selected], low[selected], false); CmdHIDsimTAG(high[selected], low[selected], false);
DbpString("[+] done playing"); DbpString("[=] done playing");
if (BUTTON_HELD(1000) > 0) { if (BUTTON_HELD(1000) > 0)
DbpString("[+] exiting"); goto out;
LEDsoff();
return;
}
/* We pressed a button so ignore it here with a delay */ /* We pressed a button so ignore it here with a delay */
SpinDelay(300); SpinDelay(300);
@ -131,4 +135,8 @@ void RunMod() {
} }
} }
} }
out:
DbpString("[=] exiting");
LEDsoff();
} }