This commit is contained in:
iceman1001 2020-08-12 11:27:41 +02:00
commit 94ce1a9ec9

View file

@ -33,9 +33,9 @@
// Select which standalone function to be active. // Select which standalone function to be active.
// 4 possiblities. Uncomment the one you wanna use. // 4 possiblities. Uncomment the one you wanna use.
//#define ICE_USE ICE_STATE_FULLSIM #define ICE_USE ICE_STATE_FULLSIM
//#define ICE_USE ICE_STATE_ATTACK //#define ICE_USE ICE_STATE_ATTACK
#define ICE_USE ICE_STATE_READER //#define ICE_USE ICE_STATE_READER
//#define ICE_USE ICE_STATE_CONFIGCARD //#define ICE_USE ICE_STATE_CONFIGCARD
// ==================================================== // ====================================================
@ -111,25 +111,25 @@ static uint8_t csns[8 * NUM_CSNS] = {
}; };
static void download_instructions(uint8_t t) { static void download_instructions(uint8_t t) {
Dbprintf(""); DbpString("");
switch (t) { switch (t) {
case ICE_STATE_FULLSIM: { case ICE_STATE_FULLSIM: {
Dbprintf("The emulator memory was saved to flash. Try the following from flash and display it"); DbpString("The emulator memory was saved to SPIFFS");
Dbprintf("1. " _YELLOW_("mem spiffs dump o "HF_ICLASS_FULLSIM_MOD_BIN" f "HF_ICLASS_FULLSIM_MOD" e")); DbpString("1. " _YELLOW_("mem spiffs dump o " HF_ICLASS_FULLSIM_MOD_BIN " f " HF_ICLASS_FULLSIM_MOD" e"));
Dbprintf("2. " _YELLOW_("exit proxmark3 client")); DbpString("2. " _YELLOW_("hf iclass view f " HF_ICLASS_FULLSIM_MOD_BIN));
Dbprintf("3. " _YELLOW_("cat "HF_ICLASS_FULLSIM_MOD_EML));
break; break;
} }
case ICE_STATE_ATTACK: { case ICE_STATE_ATTACK: {
Dbprintf("The emulator memory was saved to flash. Try the following from flash and display it"); DbpString("The collected data was saved to SPIFFS. The file names below may differ");
Dbprintf("1. " _YELLOW_("mem spiffs dump o "HF_ICLASS_ATTACK_BIN" f "HF_ICLASS_ATTACK_BIN)); DbpString("1. " _YELLOW_("mem spiffs tree"));
Dbprintf("2. " _YELLOW_("hf iclass loclass f "HF_ICLASS_ATTACK_BIN)); DbpString("2. " _YELLOW_("mem spiffs dump o " HF_ICLASS_ATTACK_BIN " f " HF_ICLASS_ATTACK_BIN));
DbpString("3. " _YELLOW_("hf iclass loclass f " HF_ICLASS_ATTACK_BIN));
break; break;
} }
case ICE_STATE_READER: { case ICE_STATE_READER: {
Dbprintf("The found tags was saved to flash. Try to download from flash and display it"); DbpString("The found tags was saved to SPIFFS");
Dbprintf("1. " _YELLOW_("mem spiffs tree")); DbpString("1. " _YELLOW_("mem spiffs tree"));
Dbprintf("2. " _YELLOW_("mem spiffs dump h")); DbpString("2. " _YELLOW_("mem spiffs dump h"));
break; break;
} }
} }
@ -182,7 +182,7 @@ static int fullsim_mode(void) {
int res = rdv40_spiffs_read_as_filetype(HF_ICLASS_FULLSIM_ORIG_BIN, emul, fsize, RDV40_SPIFFS_SAFETY_SAFE); int res = rdv40_spiffs_read_as_filetype(HF_ICLASS_FULLSIM_ORIG_BIN, emul, fsize, RDV40_SPIFFS_SAFETY_SAFE);
rdv40_spiffs_lazy_unmount(); rdv40_spiffs_lazy_unmount();
if (res == SPIFFS_OK) { if (res == SPIFFS_OK) {
Dbprintf("loaded " _YELLOW_(HF_ICLASS_FULLSIM_ORIG_BIN) " (%u bytes)", fsize); Dbprintf("loaded " _GREEN_(HF_ICLASS_FULLSIM_ORIG_BIN) " (%u bytes)", fsize);
} }
iclass_simulate(ICLASS_SIM_MODE_FULL, 0 , false, NULL, NULL, NULL); iclass_simulate(ICLASS_SIM_MODE_FULL, 0 , false, NULL, NULL, NULL);
@ -198,7 +198,7 @@ static int fullsim_mode(void) {
Dbprintf(_RED_("error") " writing "HF_ICLASS_FULLSIM_MOD_BIN" to flash ( %d )", res); Dbprintf(_RED_("error") " writing "HF_ICLASS_FULLSIM_MOD_BIN" to flash ( %d )", res);
} }
DbpString("-=[ exiting " _YELLOW_("`full simulation`") " mode ]=-"); DbpString("-=[ exiting " _CYAN_("`full simulation`") " mode ]=-");
return PM3_SUCCESS; return PM3_SUCCESS;
} }
@ -258,7 +258,7 @@ static int reader_attack_mode(void) {
} }
} }
BigBuf_free(); BigBuf_free();
DbpString("-=[ exiting " _YELLOW_("`reader attack`") " mode ]=-"); DbpString("-=[ exiting " _CYAN_("`reader attack`") " mode ]=-");
return PM3_SUCCESS; return PM3_SUCCESS;
} }
@ -302,7 +302,6 @@ static int reader_dump_mode(void) {
} }
picopass_hdr *hdr = (picopass_hdr *)card_data; picopass_hdr *hdr = (picopass_hdr *)card_data;
// sanity check of CSN. // sanity check of CSN.
if (hdr->csn[7] != 0xE0 && hdr->csn[6] != 0x12) { if (hdr->csn[7] != 0xE0 && hdr->csn[6] != 0x12) {
switch_off(); switch_off();
@ -393,7 +392,7 @@ static int reader_dump_mode(void) {
save_to_flash(card_data, (start_block + dumped) * 8 ); save_to_flash(card_data, (start_block + dumped) * 8 );
Dbprintf("%u bytes saved", (start_block + dumped) * 8); Dbprintf("%u bytes saved", (start_block + dumped) * 8);
} }
DbpString("-=[ exiting " _YELLOW_("`read & dump`") " mode ]=-"); DbpString("-=[ exiting " _CYAN_("`read & dump`") " mode ]=-");
return PM3_SUCCESS; return PM3_SUCCESS;
} }
@ -403,19 +402,18 @@ static int config_sim_mode(void) {
for (uint8_t i = 0; i < 2; i++) { for (uint8_t i = 0; i < 2; i++) {
SpinOff(0); SpinOff(0);
rdv40_spiffs_lazy_mount(); rdv40_spiffs_lazy_mount();
uint32_t fsize = size_in_spiffs(cc_files[i]); uint32_t fsize = size_in_spiffs(cc_files[i]);
int res = rdv40_spiffs_read_as_filetype(cc_files[i], emul, fsize, RDV40_SPIFFS_SAFETY_SAFE); int res = rdv40_spiffs_read_as_filetype(cc_files[i], emul, fsize, RDV40_SPIFFS_SAFETY_SAFE);
rdv40_spiffs_lazy_unmount(); rdv40_spiffs_lazy_unmount();
if (res == SPIFFS_OK) { if (res == SPIFFS_OK) {
Dbprintf("loaded " _YELLOW_("%s") " (%u bytes) to emulator memory", cc_files[i], fsize); Dbprintf("loaded " _GREEN_("%s") " (%u bytes) to emulator memory", cc_files[i], fsize);
iclass_simulate(ICLASS_SIM_MODE_FULL, 0 , false, NULL, NULL, NULL); iclass_simulate(ICLASS_SIM_MODE_FULL, 0 , false, NULL, NULL, NULL);
} }
} }
DbpString("-=[ exiting " _YELLOW_("`config card simulation`") " mode ]=-"); DbpString("-=[ exiting " _CYAN_("`glitch & config`") " mode ]=-");
return PM3_SUCCESS; return PM3_SUCCESS;
} }
@ -432,13 +430,12 @@ void RunMod(void) {
} }
FpgaDownloadAndGo(FPGA_BITSTREAM_HF); FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
BigBuf_Clear(); BigBuf_Clear_ext(false);
StandAloneMode(); StandAloneMode();
Dbprintf(_YELLOW_("HF iCLASS mode a.k.a iceCLASS started")); Dbprintf(_YELLOW_("HF iCLASS mode a.k.a iceCLASS started"));
for (;;) { for (;;) {
WDT_HIT(); WDT_HIT();
@ -450,7 +447,7 @@ void RunMod(void) {
switch (mode) { switch (mode) {
case ICE_STATE_FULLSIM: { case ICE_STATE_FULLSIM: {
Dbprintf("enter full simulation mode"); DbpString("-=[ enter " _CYAN_("`full simulation`") " mode ]=-");
// Look for iCLASS dump file // Look for iCLASS dump file
rdv40_spiffs_lazy_mount(); rdv40_spiffs_lazy_mount();
@ -471,7 +468,7 @@ void RunMod(void) {
break; break;
} }
case ICE_STATE_ATTACK: { case ICE_STATE_ATTACK: {
Dbprintf("enter reader attack mode"); DbpString("-=[ enter " _CYAN_("`reader attack`") " mode ]=-");
res = reader_attack_mode(); res = reader_attack_mode();
if (res == PM3_SUCCESS) if (res == PM3_SUCCESS)
download_instructions(mode); download_instructions(mode);
@ -480,7 +477,7 @@ void RunMod(void) {
break; break;
} }
case ICE_STATE_READER: { case ICE_STATE_READER: {
Dbprintf("enter read & dump mode, continuous scanning"); DbpString("-=[ enter " _CYAN_("`read & dump`") " mode, continuous scanning ]=-");
res = reader_dump_mode(); res = reader_dump_mode();
if (res == PM3_SUCCESS) if (res == PM3_SUCCESS)
download_instructions(mode); download_instructions(mode);
@ -489,7 +486,7 @@ void RunMod(void) {
break; break;
} }
case ICE_STATE_CONFIGCARD: { case ICE_STATE_CONFIGCARD: {
Dbprintf("enter config card simulation mode"); DbpString("-=[ enter " _CYAN_("`glitch & config`") " mode ]=-");
// Look for config cards // Look for config cards
rdv40_spiffs_lazy_mount(); rdv40_spiffs_lazy_mount();