2010-02-21 08:47:22 +08:00
|
|
|
//-----------------------------------------------------------------------------
|
|
|
|
// Copyright (C) 2010 iZsh <izsh at fail0verflow.com>
|
2018-08-13 03:54:31 +08:00
|
|
|
// Modified 2018 iceman
|
2010-02-21 08:47:22 +08:00
|
|
|
//
|
|
|
|
// This code is licensed to you under the terms of the GNU GPL, version 2 or,
|
|
|
|
// at your option, any later version. See the LICENSE.txt file for the text of
|
|
|
|
// the license.
|
|
|
|
//-----------------------------------------------------------------------------
|
|
|
|
// High frequency ISO14443B commands
|
|
|
|
//-----------------------------------------------------------------------------
|
|
|
|
|
Client cleanup and restructuring. Stage 1...
Next Step is refactoring some of the giant functions which are
just copy/paste of some other ones with just a few line changes,
removing unnecessary 'goto' etc.
The MS Windows version is broken with this commit but will be fixed
soon. Everything can't be done all at once :P
The commands are now hierarchical, for example:
"hf 14a read" vs. "hf 14b read".
You can also request help:
"hf help", "data help", "hf 15 help" etc.
Indents are now space-based, not tab-based anymore. Hopefully
no one will be trolling about it, considering the suicide-prone work
being done here ;)
client/cmdhw.c, client/proxusb.c, client/cmdhw.h, client/proxusb.h,
client/cmdmain.c, client/cmdlfhid.c, client/cmdmain.h, client/cmdlfhid.h,
client/data.c, client/data.h, client/cmdhf.c, client/cmdlf.c,
client/cmdhf.h, client/cmdhf15.c, client/cmdhf14b.c, client/cmdlf.h,
client/cmdhf15.h, client/cmdhf14b.h, client/cmddata.c, client/cmddata.h,
client/ui.c, client/cmdparser.c, client/cmdlfti.c, client/ui.h,
client/cmdlfem4x.c, client/cmdparser.h, client/cmdlfti.h, client/cmdlfem4x.h,
client/graph.c, client/graph.h, client/cmdhf14a.c, client/cmdhf14a.h,
client/cmdhflegic.c, client/cmdhflegic.c: New files.
client/cli.c, client/flasher.c, client/snooper.c, client/proxmark3.c,
client/proxmark3.h, client/Makefile: Update accordingly.
client/flash.h, client/flash.c, client/proxgui.cpp: Cosmetic changes.
client/translate.h, client/command.c, client/gui.c,
client/usb.c, client/prox.h: Remove.
include/usb_cmd.h (CMD_ACQUIRE_RAW_ADC_SAMPLES_ISO_14443_SIM): Remove dead cmd.
common/crc16.h: New file.
common/crc16.c: Modify accordingly.
common/iso14443crc.h: New file.
common/iso14443_crc.c: Rename to
common/iso14443crc.c: and modify accordingly.
armsrc/lfops.c, armsrc/iso14443.c,
armsrc/iso14443a.c: include .h files from
the common directory instead of including the c files.
common/Makefile.common, armsrc/Makefile: Modify accordingly.
2010-02-04 09:27:07 +08:00
|
|
|
#include "cmdhf14b.h"
|
|
|
|
|
2016-03-22 05:07:23 +08:00
|
|
|
#define TIMEOUT 2000
|
Client cleanup and restructuring. Stage 1...
Next Step is refactoring some of the giant functions which are
just copy/paste of some other ones with just a few line changes,
removing unnecessary 'goto' etc.
The MS Windows version is broken with this commit but will be fixed
soon. Everything can't be done all at once :P
The commands are now hierarchical, for example:
"hf 14a read" vs. "hf 14b read".
You can also request help:
"hf help", "data help", "hf 15 help" etc.
Indents are now space-based, not tab-based anymore. Hopefully
no one will be trolling about it, considering the suicide-prone work
being done here ;)
client/cmdhw.c, client/proxusb.c, client/cmdhw.h, client/proxusb.h,
client/cmdmain.c, client/cmdlfhid.c, client/cmdmain.h, client/cmdlfhid.h,
client/data.c, client/data.h, client/cmdhf.c, client/cmdlf.c,
client/cmdhf.h, client/cmdhf15.c, client/cmdhf14b.c, client/cmdlf.h,
client/cmdhf15.h, client/cmdhf14b.h, client/cmddata.c, client/cmddata.h,
client/ui.c, client/cmdparser.c, client/cmdlfti.c, client/ui.h,
client/cmdlfem4x.c, client/cmdparser.h, client/cmdlfti.h, client/cmdlfem4x.h,
client/graph.c, client/graph.h, client/cmdhf14a.c, client/cmdhf14a.h,
client/cmdhflegic.c, client/cmdhflegic.c: New files.
client/cli.c, client/flasher.c, client/snooper.c, client/proxmark3.c,
client/proxmark3.h, client/Makefile: Update accordingly.
client/flash.h, client/flash.c, client/proxgui.cpp: Cosmetic changes.
client/translate.h, client/command.c, client/gui.c,
client/usb.c, client/prox.h: Remove.
include/usb_cmd.h (CMD_ACQUIRE_RAW_ADC_SAMPLES_ISO_14443_SIM): Remove dead cmd.
common/crc16.h: New file.
common/crc16.c: Modify accordingly.
common/iso14443crc.h: New file.
common/iso14443_crc.c: Rename to
common/iso14443crc.c: and modify accordingly.
armsrc/lfops.c, armsrc/iso14443.c,
armsrc/iso14443a.c: include .h files from
the common directory instead of including the c files.
common/Makefile.common, armsrc/Makefile: Modify accordingly.
2010-02-04 09:27:07 +08:00
|
|
|
static int CmdHelp(const char *Cmd);
|
|
|
|
|
2019-03-10 18:20:22 +08:00
|
|
|
int usage_hf_14b_info(void) {
|
2019-03-10 06:35:06 +08:00
|
|
|
PrintAndLogEx(NORMAL, "Usage: hf 14b info [h] [s]");
|
|
|
|
PrintAndLogEx(NORMAL, "Options:");
|
|
|
|
PrintAndLogEx(NORMAL, " h this help");
|
|
|
|
PrintAndLogEx(NORMAL, " s silently");
|
|
|
|
PrintAndLogEx(NORMAL, "Example:");
|
|
|
|
PrintAndLogEx(NORMAL, " hf 14b info");
|
|
|
|
return 0;
|
Client cleanup and restructuring. Stage 1...
Next Step is refactoring some of the giant functions which are
just copy/paste of some other ones with just a few line changes,
removing unnecessary 'goto' etc.
The MS Windows version is broken with this commit but will be fixed
soon. Everything can't be done all at once :P
The commands are now hierarchical, for example:
"hf 14a read" vs. "hf 14b read".
You can also request help:
"hf help", "data help", "hf 15 help" etc.
Indents are now space-based, not tab-based anymore. Hopefully
no one will be trolling about it, considering the suicide-prone work
being done here ;)
client/cmdhw.c, client/proxusb.c, client/cmdhw.h, client/proxusb.h,
client/cmdmain.c, client/cmdlfhid.c, client/cmdmain.h, client/cmdlfhid.h,
client/data.c, client/data.h, client/cmdhf.c, client/cmdlf.c,
client/cmdhf.h, client/cmdhf15.c, client/cmdhf14b.c, client/cmdlf.h,
client/cmdhf15.h, client/cmdhf14b.h, client/cmddata.c, client/cmddata.h,
client/ui.c, client/cmdparser.c, client/cmdlfti.c, client/ui.h,
client/cmdlfem4x.c, client/cmdparser.h, client/cmdlfti.h, client/cmdlfem4x.h,
client/graph.c, client/graph.h, client/cmdhf14a.c, client/cmdhf14a.h,
client/cmdhflegic.c, client/cmdhflegic.c: New files.
client/cli.c, client/flasher.c, client/snooper.c, client/proxmark3.c,
client/proxmark3.h, client/Makefile: Update accordingly.
client/flash.h, client/flash.c, client/proxgui.cpp: Cosmetic changes.
client/translate.h, client/command.c, client/gui.c,
client/usb.c, client/prox.h: Remove.
include/usb_cmd.h (CMD_ACQUIRE_RAW_ADC_SAMPLES_ISO_14443_SIM): Remove dead cmd.
common/crc16.h: New file.
common/crc16.c: Modify accordingly.
common/iso14443crc.h: New file.
common/iso14443_crc.c: Rename to
common/iso14443crc.c: and modify accordingly.
armsrc/lfops.c, armsrc/iso14443.c,
armsrc/iso14443a.c: include .h files from
the common directory instead of including the c files.
common/Makefile.common, armsrc/Makefile: Modify accordingly.
2010-02-04 09:27:07 +08:00
|
|
|
}
|
2019-03-10 18:20:22 +08:00
|
|
|
int usage_hf_14b_reader(void) {
|
2019-03-10 06:35:06 +08:00
|
|
|
PrintAndLogEx(NORMAL, "Usage: hf 14b reader [h] [s]");
|
|
|
|
PrintAndLogEx(NORMAL, "Options:");
|
|
|
|
PrintAndLogEx(NORMAL, " h this help");
|
|
|
|
PrintAndLogEx(NORMAL, " s silently");
|
|
|
|
PrintAndLogEx(NORMAL, "Example:");
|
|
|
|
PrintAndLogEx(NORMAL, " hf 14b reader");
|
|
|
|
return 0;
|
Client cleanup and restructuring. Stage 1...
Next Step is refactoring some of the giant functions which are
just copy/paste of some other ones with just a few line changes,
removing unnecessary 'goto' etc.
The MS Windows version is broken with this commit but will be fixed
soon. Everything can't be done all at once :P
The commands are now hierarchical, for example:
"hf 14a read" vs. "hf 14b read".
You can also request help:
"hf help", "data help", "hf 15 help" etc.
Indents are now space-based, not tab-based anymore. Hopefully
no one will be trolling about it, considering the suicide-prone work
being done here ;)
client/cmdhw.c, client/proxusb.c, client/cmdhw.h, client/proxusb.h,
client/cmdmain.c, client/cmdlfhid.c, client/cmdmain.h, client/cmdlfhid.h,
client/data.c, client/data.h, client/cmdhf.c, client/cmdlf.c,
client/cmdhf.h, client/cmdhf15.c, client/cmdhf14b.c, client/cmdlf.h,
client/cmdhf15.h, client/cmdhf14b.h, client/cmddata.c, client/cmddata.h,
client/ui.c, client/cmdparser.c, client/cmdlfti.c, client/ui.h,
client/cmdlfem4x.c, client/cmdparser.h, client/cmdlfti.h, client/cmdlfem4x.h,
client/graph.c, client/graph.h, client/cmdhf14a.c, client/cmdhf14a.h,
client/cmdhflegic.c, client/cmdhflegic.c: New files.
client/cli.c, client/flasher.c, client/snooper.c, client/proxmark3.c,
client/proxmark3.h, client/Makefile: Update accordingly.
client/flash.h, client/flash.c, client/proxgui.cpp: Cosmetic changes.
client/translate.h, client/command.c, client/gui.c,
client/usb.c, client/prox.h: Remove.
include/usb_cmd.h (CMD_ACQUIRE_RAW_ADC_SAMPLES_ISO_14443_SIM): Remove dead cmd.
common/crc16.h: New file.
common/crc16.c: Modify accordingly.
common/iso14443crc.h: New file.
common/iso14443_crc.c: Rename to
common/iso14443crc.c: and modify accordingly.
armsrc/lfops.c, armsrc/iso14443.c,
armsrc/iso14443a.c: include .h files from
the common directory instead of including the c files.
common/Makefile.common, armsrc/Makefile: Modify accordingly.
2010-02-04 09:27:07 +08:00
|
|
|
}
|
2019-03-10 18:20:22 +08:00
|
|
|
int usage_hf_14b_raw(void) {
|
2019-03-10 06:35:06 +08:00
|
|
|
PrintAndLogEx(NORMAL, "Usage: hf 14b raw [-h] [-r] [-c] [-p] [-s || -ss] <0A 0B 0C ... hex>");
|
|
|
|
PrintAndLogEx(NORMAL, "Options:");
|
|
|
|
PrintAndLogEx(NORMAL, " -h this help");
|
|
|
|
PrintAndLogEx(NORMAL, " -r do not read response");
|
|
|
|
PrintAndLogEx(NORMAL, " -c calculate and append CRC");
|
|
|
|
PrintAndLogEx(NORMAL, " -p leave the field on after receive");
|
|
|
|
PrintAndLogEx(NORMAL, " -s active signal field ON with select");
|
|
|
|
PrintAndLogEx(NORMAL, " -ss active signal field ON with select for SRx ST Microelectronics tags");
|
|
|
|
PrintAndLogEx(NORMAL, "Example:");
|
|
|
|
PrintAndLogEx(NORMAL, " hf 14b raw -s -c -p 0200a40400");
|
|
|
|
return 0;
|
Client cleanup and restructuring. Stage 1...
Next Step is refactoring some of the giant functions which are
just copy/paste of some other ones with just a few line changes,
removing unnecessary 'goto' etc.
The MS Windows version is broken with this commit but will be fixed
soon. Everything can't be done all at once :P
The commands are now hierarchical, for example:
"hf 14a read" vs. "hf 14b read".
You can also request help:
"hf help", "data help", "hf 15 help" etc.
Indents are now space-based, not tab-based anymore. Hopefully
no one will be trolling about it, considering the suicide-prone work
being done here ;)
client/cmdhw.c, client/proxusb.c, client/cmdhw.h, client/proxusb.h,
client/cmdmain.c, client/cmdlfhid.c, client/cmdmain.h, client/cmdlfhid.h,
client/data.c, client/data.h, client/cmdhf.c, client/cmdlf.c,
client/cmdhf.h, client/cmdhf15.c, client/cmdhf14b.c, client/cmdlf.h,
client/cmdhf15.h, client/cmdhf14b.h, client/cmddata.c, client/cmddata.h,
client/ui.c, client/cmdparser.c, client/cmdlfti.c, client/ui.h,
client/cmdlfem4x.c, client/cmdparser.h, client/cmdlfti.h, client/cmdlfem4x.h,
client/graph.c, client/graph.h, client/cmdhf14a.c, client/cmdhf14a.h,
client/cmdhflegic.c, client/cmdhflegic.c: New files.
client/cli.c, client/flasher.c, client/snooper.c, client/proxmark3.c,
client/proxmark3.h, client/Makefile: Update accordingly.
client/flash.h, client/flash.c, client/proxgui.cpp: Cosmetic changes.
client/translate.h, client/command.c, client/gui.c,
client/usb.c, client/prox.h: Remove.
include/usb_cmd.h (CMD_ACQUIRE_RAW_ADC_SAMPLES_ISO_14443_SIM): Remove dead cmd.
common/crc16.h: New file.
common/crc16.c: Modify accordingly.
common/iso14443crc.h: New file.
common/iso14443_crc.c: Rename to
common/iso14443crc.c: and modify accordingly.
armsrc/lfops.c, armsrc/iso14443.c,
armsrc/iso14443a.c: include .h files from
the common directory instead of including the c files.
common/Makefile.common, armsrc/Makefile: Modify accordingly.
2010-02-04 09:27:07 +08:00
|
|
|
}
|
2019-03-10 18:20:22 +08:00
|
|
|
int usage_hf_14b_sniff(void) {
|
2019-03-10 06:35:06 +08:00
|
|
|
PrintAndLogEx(NORMAL, "It get data from the field and saves it into command buffer.");
|
|
|
|
PrintAndLogEx(NORMAL, "Buffer accessible from command 'hf list 14b'");
|
|
|
|
PrintAndLogEx(NORMAL, "Usage: hf 14b sniff [h]");
|
|
|
|
PrintAndLogEx(NORMAL, "Options:");
|
|
|
|
PrintAndLogEx(NORMAL, " h this help");
|
|
|
|
PrintAndLogEx(NORMAL, "Example:");
|
|
|
|
PrintAndLogEx(NORMAL, " hf 14b sniff");
|
|
|
|
return 0;
|
2016-03-21 02:33:07 +08:00
|
|
|
}
|
2019-03-10 18:20:22 +08:00
|
|
|
int usage_hf_14b_sim(void) {
|
2019-03-10 06:35:06 +08:00
|
|
|
PrintAndLogEx(NORMAL, "Emulating ISO/IEC 14443 type B tag with 4 UID / PUPI");
|
|
|
|
PrintAndLogEx(NORMAL, "Usage: hf 14b sim [h] u <uid>");
|
|
|
|
PrintAndLogEx(NORMAL, "Options:");
|
|
|
|
PrintAndLogEx(NORMAL, " h this help");
|
|
|
|
PrintAndLogEx(NORMAL, " u 4byte UID/PUPI");
|
|
|
|
PrintAndLogEx(NORMAL, "Example:");
|
|
|
|
PrintAndLogEx(NORMAL, " hf 14b sim");
|
|
|
|
PrintAndLogEx(NORMAL, " hf 14b sim u 11223344");
|
|
|
|
return 0;
|
2016-03-21 02:33:07 +08:00
|
|
|
}
|
2019-03-10 18:20:22 +08:00
|
|
|
int usage_hf_14b_read_srx(void) {
|
2019-03-10 06:35:06 +08:00
|
|
|
PrintAndLogEx(NORMAL, "Usage: hf 14b sriread [h] <1|2>");
|
|
|
|
PrintAndLogEx(NORMAL, "Options:");
|
|
|
|
PrintAndLogEx(NORMAL, " h this help");
|
|
|
|
PrintAndLogEx(NORMAL, " <1|2> 1 = SRIX4K , 2 = SRI512");
|
|
|
|
PrintAndLogEx(NORMAL, "Example:");
|
|
|
|
PrintAndLogEx(NORMAL, " hf 14b sriread 1");
|
|
|
|
PrintAndLogEx(NORMAL, " hf 14b sriread 2");
|
|
|
|
return 0;
|
Client cleanup and restructuring. Stage 1...
Next Step is refactoring some of the giant functions which are
just copy/paste of some other ones with just a few line changes,
removing unnecessary 'goto' etc.
The MS Windows version is broken with this commit but will be fixed
soon. Everything can't be done all at once :P
The commands are now hierarchical, for example:
"hf 14a read" vs. "hf 14b read".
You can also request help:
"hf help", "data help", "hf 15 help" etc.
Indents are now space-based, not tab-based anymore. Hopefully
no one will be trolling about it, considering the suicide-prone work
being done here ;)
client/cmdhw.c, client/proxusb.c, client/cmdhw.h, client/proxusb.h,
client/cmdmain.c, client/cmdlfhid.c, client/cmdmain.h, client/cmdlfhid.h,
client/data.c, client/data.h, client/cmdhf.c, client/cmdlf.c,
client/cmdhf.h, client/cmdhf15.c, client/cmdhf14b.c, client/cmdlf.h,
client/cmdhf15.h, client/cmdhf14b.h, client/cmddata.c, client/cmddata.h,
client/ui.c, client/cmdparser.c, client/cmdlfti.c, client/ui.h,
client/cmdlfem4x.c, client/cmdparser.h, client/cmdlfti.h, client/cmdlfem4x.h,
client/graph.c, client/graph.h, client/cmdhf14a.c, client/cmdhf14a.h,
client/cmdhflegic.c, client/cmdhflegic.c: New files.
client/cli.c, client/flasher.c, client/snooper.c, client/proxmark3.c,
client/proxmark3.h, client/Makefile: Update accordingly.
client/flash.h, client/flash.c, client/proxgui.cpp: Cosmetic changes.
client/translate.h, client/command.c, client/gui.c,
client/usb.c, client/prox.h: Remove.
include/usb_cmd.h (CMD_ACQUIRE_RAW_ADC_SAMPLES_ISO_14443_SIM): Remove dead cmd.
common/crc16.h: New file.
common/crc16.c: Modify accordingly.
common/iso14443crc.h: New file.
common/iso14443_crc.c: Rename to
common/iso14443crc.c: and modify accordingly.
armsrc/lfops.c, armsrc/iso14443.c,
armsrc/iso14443a.c: include .h files from
the common directory instead of including the c files.
common/Makefile.common, armsrc/Makefile: Modify accordingly.
2010-02-04 09:27:07 +08:00
|
|
|
}
|
2019-03-10 18:20:22 +08:00
|
|
|
int usage_hf_14b_write_srx(void) {
|
2019-03-10 06:35:06 +08:00
|
|
|
PrintAndLogEx(NORMAL, "Usage: hf 14b [h] sriwrite <1|2> <BLOCK> <DATA>");
|
|
|
|
PrintAndLogEx(NORMAL, "Options:");
|
|
|
|
PrintAndLogEx(NORMAL, " h this help");
|
|
|
|
PrintAndLogEx(NORMAL, " <1|2> 1 = SRIX4K , 2 = SRI512");
|
|
|
|
PrintAndLogEx(NORMAL, " <block> BLOCK number depends on tag, special block == FF");
|
|
|
|
PrintAndLogEx(NORMAL, " <data> hex bytes of data to be written");
|
|
|
|
PrintAndLogEx(NORMAL, "Example:");
|
|
|
|
PrintAndLogEx(NORMAL, " hf 14b sriwrite 1 7F 11223344");
|
|
|
|
PrintAndLogEx(NORMAL, " hf 14b sriwrite 1 FF 11223344");
|
|
|
|
PrintAndLogEx(NORMAL, " hf 14b sriwrite 2 15 11223344");
|
|
|
|
PrintAndLogEx(NORMAL, " hf 14b sriwrite 2 FF 11223344");
|
|
|
|
return 0;
|
Client cleanup and restructuring. Stage 1...
Next Step is refactoring some of the giant functions which are
just copy/paste of some other ones with just a few line changes,
removing unnecessary 'goto' etc.
The MS Windows version is broken with this commit but will be fixed
soon. Everything can't be done all at once :P
The commands are now hierarchical, for example:
"hf 14a read" vs. "hf 14b read".
You can also request help:
"hf help", "data help", "hf 15 help" etc.
Indents are now space-based, not tab-based anymore. Hopefully
no one will be trolling about it, considering the suicide-prone work
being done here ;)
client/cmdhw.c, client/proxusb.c, client/cmdhw.h, client/proxusb.h,
client/cmdmain.c, client/cmdlfhid.c, client/cmdmain.h, client/cmdlfhid.h,
client/data.c, client/data.h, client/cmdhf.c, client/cmdlf.c,
client/cmdhf.h, client/cmdhf15.c, client/cmdhf14b.c, client/cmdlf.h,
client/cmdhf15.h, client/cmdhf14b.h, client/cmddata.c, client/cmddata.h,
client/ui.c, client/cmdparser.c, client/cmdlfti.c, client/ui.h,
client/cmdlfem4x.c, client/cmdparser.h, client/cmdlfti.h, client/cmdlfem4x.h,
client/graph.c, client/graph.h, client/cmdhf14a.c, client/cmdhf14a.h,
client/cmdhflegic.c, client/cmdhflegic.c: New files.
client/cli.c, client/flasher.c, client/snooper.c, client/proxmark3.c,
client/proxmark3.h, client/Makefile: Update accordingly.
client/flash.h, client/flash.c, client/proxgui.cpp: Cosmetic changes.
client/translate.h, client/command.c, client/gui.c,
client/usb.c, client/prox.h: Remove.
include/usb_cmd.h (CMD_ACQUIRE_RAW_ADC_SAMPLES_ISO_14443_SIM): Remove dead cmd.
common/crc16.h: New file.
common/crc16.c: Modify accordingly.
common/iso14443crc.h: New file.
common/iso14443_crc.c: Rename to
common/iso14443crc.c: and modify accordingly.
armsrc/lfops.c, armsrc/iso14443.c,
armsrc/iso14443a.c: include .h files from
the common directory instead of including the c files.
common/Makefile.common, armsrc/Makefile: Modify accordingly.
2010-02-04 09:27:07 +08:00
|
|
|
}
|
2019-03-10 18:20:22 +08:00
|
|
|
int usage_hf_14b_dump(void) {
|
2019-03-10 06:35:06 +08:00
|
|
|
PrintAndLogEx(NORMAL, "This command dumps the contents of a ISO-14443-B tag and save it to file\n"
|
2019-03-10 07:00:59 +08:00
|
|
|
"\n"
|
|
|
|
"Usage: hf 14b dump [h] [card memory] <f filname> \n"
|
|
|
|
"Options:\n"
|
|
|
|
"\th this help\n"
|
|
|
|
"\t[card memory] 1 = SRIX4K (default), 2 = SRI512"
|
|
|
|
"\tf <name> filename, if no <name> UID will be used as filename\n"
|
|
|
|
"\n"
|
|
|
|
"Example:\n"
|
|
|
|
"\thf 14b dump f\n"
|
|
|
|
"\thf 14b dump 2 f mydump");
|
2019-03-10 06:35:06 +08:00
|
|
|
return 0;
|
2018-08-13 03:54:31 +08:00
|
|
|
}
|
Client cleanup and restructuring. Stage 1...
Next Step is refactoring some of the giant functions which are
just copy/paste of some other ones with just a few line changes,
removing unnecessary 'goto' etc.
The MS Windows version is broken with this commit but will be fixed
soon. Everything can't be done all at once :P
The commands are now hierarchical, for example:
"hf 14a read" vs. "hf 14b read".
You can also request help:
"hf help", "data help", "hf 15 help" etc.
Indents are now space-based, not tab-based anymore. Hopefully
no one will be trolling about it, considering the suicide-prone work
being done here ;)
client/cmdhw.c, client/proxusb.c, client/cmdhw.h, client/proxusb.h,
client/cmdmain.c, client/cmdlfhid.c, client/cmdmain.h, client/cmdlfhid.h,
client/data.c, client/data.h, client/cmdhf.c, client/cmdlf.c,
client/cmdhf.h, client/cmdhf15.c, client/cmdhf14b.c, client/cmdlf.h,
client/cmdhf15.h, client/cmdhf14b.h, client/cmddata.c, client/cmddata.h,
client/ui.c, client/cmdparser.c, client/cmdlfti.c, client/ui.h,
client/cmdlfem4x.c, client/cmdparser.h, client/cmdlfti.h, client/cmdlfem4x.h,
client/graph.c, client/graph.h, client/cmdhf14a.c, client/cmdhf14a.h,
client/cmdhflegic.c, client/cmdhflegic.c: New files.
client/cli.c, client/flasher.c, client/snooper.c, client/proxmark3.c,
client/proxmark3.h, client/Makefile: Update accordingly.
client/flash.h, client/flash.c, client/proxgui.cpp: Cosmetic changes.
client/translate.h, client/command.c, client/gui.c,
client/usb.c, client/prox.h: Remove.
include/usb_cmd.h (CMD_ACQUIRE_RAW_ADC_SAMPLES_ISO_14443_SIM): Remove dead cmd.
common/crc16.h: New file.
common/crc16.c: Modify accordingly.
common/iso14443crc.h: New file.
common/iso14443_crc.c: Rename to
common/iso14443crc.c: and modify accordingly.
armsrc/lfops.c, armsrc/iso14443.c,
armsrc/iso14443a.c: include .h files from
the common directory instead of including the c files.
common/Makefile.common, armsrc/Makefile: Modify accordingly.
2010-02-04 09:27:07 +08:00
|
|
|
|
2018-08-13 03:54:31 +08:00
|
|
|
/*
|
2016-04-25 03:44:19 +08:00
|
|
|
static void switch_on_field_14b(void) {
|
2019-03-10 06:35:06 +08:00
|
|
|
UsbCommand c = {CMD_ISO_14443B_COMMAND, {ISO14B_CONNECT, 0, 0}};
|
|
|
|
clearCommandBuffer();
|
|
|
|
SendCommand(&c);
|
2016-04-25 03:44:19 +08:00
|
|
|
}
|
2018-08-13 03:54:31 +08:00
|
|
|
*/
|
2016-04-25 03:44:19 +08:00
|
|
|
|
2019-03-10 18:20:22 +08:00
|
|
|
static int switch_off_field_14b(void) {
|
2019-03-10 06:35:06 +08:00
|
|
|
UsbCommand c = {CMD_ISO_14443B_COMMAND, {ISO14B_DISCONNECT, 0, 0}};
|
|
|
|
clearCommandBuffer();
|
|
|
|
SendCommand(&c);
|
|
|
|
return 0;
|
2016-03-06 19:40:04 +08:00
|
|
|
}
|
2015-06-16 02:59:01 +08:00
|
|
|
|
2019-03-10 18:20:22 +08:00
|
|
|
int CmdHF14BList(const char *Cmd) {
|
2019-03-10 06:35:06 +08:00
|
|
|
CmdTraceList("14b");
|
|
|
|
return 0;
|
2016-03-21 02:33:07 +08:00
|
|
|
}
|
2015-06-21 17:07:05 +08:00
|
|
|
|
2019-03-10 18:20:22 +08:00
|
|
|
int CmdHF14BSim(const char *Cmd) {
|
2019-03-10 06:35:06 +08:00
|
|
|
char cmdp = tolower(param_getchar(Cmd, 0));
|
|
|
|
if (cmdp == 'h') return usage_hf_14b_sim();
|
|
|
|
|
|
|
|
uint32_t pupi = 0;
|
|
|
|
if (cmdp == 'u') {
|
|
|
|
pupi = param_get32ex(Cmd, 1, 0, 16);
|
|
|
|
}
|
|
|
|
|
|
|
|
UsbCommand c = {CMD_SIMULATE_TAG_ISO_14443B, {pupi, 0, 0}};
|
|
|
|
clearCommandBuffer();
|
|
|
|
SendCommand(&c);
|
|
|
|
return 0;
|
2016-03-21 02:33:07 +08:00
|
|
|
}
|
2015-06-21 17:07:05 +08:00
|
|
|
|
2019-03-10 18:20:22 +08:00
|
|
|
int CmdHF14BSniff(const char *Cmd) {
|
2019-03-09 15:59:13 +08:00
|
|
|
|
2019-03-10 06:35:06 +08:00
|
|
|
char cmdp = tolower(param_getchar(Cmd, 0));
|
|
|
|
if (cmdp == 'h') return usage_hf_14b_sniff();
|
2019-03-09 15:59:13 +08:00
|
|
|
|
2019-03-12 20:15:39 +08:00
|
|
|
UsbCommand c = {CMD_SNIFF_ISO_14443B, {0, 0, 0}};
|
2019-03-10 06:35:06 +08:00
|
|
|
clearCommandBuffer();
|
|
|
|
SendCommand(&c);
|
|
|
|
return 0;
|
2015-06-14 20:39:50 +08:00
|
|
|
}
|
|
|
|
|
2019-03-10 18:20:22 +08:00
|
|
|
int CmdHF14BCmdRaw(const char *Cmd) {
|
2019-03-10 06:35:06 +08:00
|
|
|
bool reply = true, power = false, select = false;
|
|
|
|
char buf[5] = "";
|
|
|
|
int i = 0;
|
|
|
|
uint8_t data[USB_CMD_DATA_SIZE] = {0x00};
|
|
|
|
uint16_t datalen = 0;
|
|
|
|
uint32_t flags = ISO14B_CONNECT;
|
|
|
|
uint32_t temp = 0;
|
2019-03-09 15:59:13 +08:00
|
|
|
|
2019-03-10 07:00:59 +08:00
|
|
|
if (strlen(Cmd) < 3) return usage_hf_14b_raw();
|
2013-09-02 02:41:05 +08:00
|
|
|
|
|
|
|
// strip
|
2019-03-10 07:00:59 +08:00
|
|
|
while (*Cmd == ' ' || *Cmd == '\t') ++Cmd;
|
2019-03-09 15:59:13 +08:00
|
|
|
|
2019-03-10 07:00:59 +08:00
|
|
|
while (Cmd[i] != '\0') {
|
|
|
|
if (Cmd[i] == ' ' || Cmd[i] == '\t') { ++i; continue; }
|
|
|
|
if (Cmd[i] == '-') {
|
|
|
|
switch (tolower(Cmd[i + 1])) {
|
2019-03-10 06:35:06 +08:00
|
|
|
case 'h':
|
|
|
|
return usage_hf_14b_raw();
|
2019-03-09 15:59:13 +08:00
|
|
|
case 'r':
|
2017-07-15 02:54:11 +08:00
|
|
|
reply = false;
|
2013-09-02 02:41:05 +08:00
|
|
|
break;
|
|
|
|
case 'c':
|
2016-03-21 02:33:07 +08:00
|
|
|
flags |= ISO14B_APPEND_CRC;
|
2013-09-02 02:41:05 +08:00
|
|
|
break;
|
2019-03-09 15:59:13 +08:00
|
|
|
case 'p':
|
2019-03-10 06:35:06 +08:00
|
|
|
power = true;
|
|
|
|
break;
|
|
|
|
case 's':
|
|
|
|
select = true;
|
2019-03-10 07:00:59 +08:00
|
|
|
if (tolower(Cmd[i + 2]) == 's') {
|
2019-03-10 06:35:06 +08:00
|
|
|
flags |= ISO14B_SELECT_SR;
|
|
|
|
++i;
|
|
|
|
} else {
|
|
|
|
flags |= ISO14B_SELECT_STD;
|
|
|
|
}
|
2013-09-02 02:41:05 +08:00
|
|
|
break;
|
|
|
|
default:
|
2016-03-21 02:33:07 +08:00
|
|
|
return usage_hf_14b_raw();
|
2013-09-02 02:41:05 +08:00
|
|
|
}
|
2019-03-10 07:00:59 +08:00
|
|
|
i += 2;
|
2013-09-02 02:41:05 +08:00
|
|
|
continue;
|
|
|
|
}
|
2019-03-10 07:00:59 +08:00
|
|
|
if ((Cmd[i] >= '0' && Cmd[i] <= '9') ||
|
2019-03-10 18:20:22 +08:00
|
|
|
(Cmd[i] >= 'a' && Cmd[i] <= 'f') ||
|
|
|
|
(Cmd[i] >= 'A' && Cmd[i] <= 'F')) {
|
2019-03-10 07:00:59 +08:00
|
|
|
buf[strlen(buf) + 1] = 0;
|
|
|
|
buf[strlen(buf)] = Cmd[i];
|
2013-09-02 02:41:05 +08:00
|
|
|
i++;
|
2019-03-09 15:59:13 +08:00
|
|
|
|
2019-03-10 07:00:59 +08:00
|
|
|
if (strlen(buf) >= 2) {
|
|
|
|
sscanf(buf, "%x", &temp);
|
2016-03-21 02:33:07 +08:00
|
|
|
data[datalen++] = (uint8_t)(temp & 0xff);
|
2019-03-10 07:00:59 +08:00
|
|
|
*buf = 0;
|
2019-03-10 06:35:06 +08:00
|
|
|
memset(buf, 0x00, sizeof(buf));
|
2013-09-02 02:41:05 +08:00
|
|
|
}
|
|
|
|
continue;
|
|
|
|
}
|
2018-02-21 14:28:46 +08:00
|
|
|
PrintAndLogEx(WARNING, "unknown parameter '%c'\n", param_getchar(Cmd, i));
|
2019-03-10 06:35:06 +08:00
|
|
|
return 0;
|
2013-09-02 02:41:05 +08:00
|
|
|
}
|
2019-03-09 15:59:13 +08:00
|
|
|
|
2019-03-10 06:35:06 +08:00
|
|
|
if (!power)
|
2016-03-21 02:33:07 +08:00
|
|
|
flags |= ISO14B_DISCONNECT;
|
|
|
|
|
2017-08-26 02:28:16 +08:00
|
|
|
if (datalen > 0)
|
2019-03-10 06:35:06 +08:00
|
|
|
flags |= ISO14B_RAW;
|
2016-03-21 02:33:07 +08:00
|
|
|
|
2019-03-10 06:35:06 +08:00
|
|
|
// Max buffer is USB_CMD_DATA_SIZE
|
|
|
|
datalen = (datalen > USB_CMD_DATA_SIZE) ? USB_CMD_DATA_SIZE : datalen;
|
2016-03-21 02:33:07 +08:00
|
|
|
|
2019-03-10 06:35:06 +08:00
|
|
|
UsbCommand c = {CMD_ISO_14443B_COMMAND, {flags, datalen, 0}};
|
|
|
|
memcpy(c.d.asBytes, data, datalen);
|
|
|
|
clearCommandBuffer();
|
|
|
|
SendCommand(&c);
|
2016-03-21 02:33:07 +08:00
|
|
|
|
2019-03-10 06:35:06 +08:00
|
|
|
if (!reply) return 1;
|
2016-03-21 02:33:07 +08:00
|
|
|
|
2019-03-10 06:35:06 +08:00
|
|
|
bool success = true;
|
|
|
|
// get back iso14b_card_select_t, don't print it.
|
|
|
|
if (select)
|
|
|
|
success = waitCmd14b(false);
|
2016-03-21 02:33:07 +08:00
|
|
|
|
2019-03-10 06:35:06 +08:00
|
|
|
// get back response from the raw bytes you sent.
|
2019-03-10 07:00:59 +08:00
|
|
|
if (success && datalen > 0) waitCmd14b(true);
|
2016-03-21 02:33:07 +08:00
|
|
|
|
|
|
|
return 1;
|
2015-06-14 20:39:50 +08:00
|
|
|
}
|
|
|
|
|
2019-03-10 18:20:22 +08:00
|
|
|
static bool get_14b_UID(iso14b_card_select_t *card) {
|
2018-08-13 03:54:31 +08:00
|
|
|
|
2019-03-10 06:35:06 +08:00
|
|
|
if (!card)
|
|
|
|
return false;
|
2019-03-09 15:59:13 +08:00
|
|
|
|
2019-03-10 06:35:06 +08:00
|
|
|
int8_t retry = 3;
|
|
|
|
UsbCommand resp;
|
|
|
|
UsbCommand c = {CMD_ISO_14443B_COMMAND, {ISO14B_CONNECT | ISO14B_SELECT_SR | ISO14B_DISCONNECT, 0, 0}};
|
2019-03-09 15:59:13 +08:00
|
|
|
|
2019-03-10 06:35:06 +08:00
|
|
|
// test for 14b SR
|
|
|
|
while (retry--) {
|
2018-08-13 03:54:31 +08:00
|
|
|
|
2019-03-10 06:35:06 +08:00
|
|
|
clearCommandBuffer();
|
|
|
|
SendCommand(&c);
|
|
|
|
if (WaitForResponseTimeout(CMD_ACK, &resp, TIMEOUT)) {
|
2019-03-09 15:59:13 +08:00
|
|
|
|
2019-03-10 06:35:06 +08:00
|
|
|
uint8_t status = resp.arg[0];
|
2019-03-10 07:00:59 +08:00
|
|
|
if (status == 0) {
|
2019-03-10 06:35:06 +08:00
|
|
|
memcpy(card, (iso14b_card_select_t *)resp.d.asBytes, sizeof(iso14b_card_select_t));
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
} // retry
|
2018-08-13 03:54:31 +08:00
|
|
|
|
2019-03-10 06:35:06 +08:00
|
|
|
// test 14b standard
|
|
|
|
c.arg[0] = ISO14B_CONNECT | ISO14B_SELECT_STD | ISO14B_DISCONNECT;
|
|
|
|
retry = 3;
|
|
|
|
while (retry--) {
|
2018-08-13 03:54:31 +08:00
|
|
|
|
|
|
|
|
2019-03-10 06:35:06 +08:00
|
|
|
clearCommandBuffer();
|
|
|
|
SendCommand(&c);
|
|
|
|
if (WaitForResponseTimeout(CMD_ACK, &resp, TIMEOUT)) {
|
2019-03-09 15:59:13 +08:00
|
|
|
|
2019-03-10 06:35:06 +08:00
|
|
|
uint8_t status = resp.arg[0];
|
2019-03-10 07:00:59 +08:00
|
|
|
if (status == 0) {
|
2019-03-10 06:35:06 +08:00
|
|
|
memcpy(card, (iso14b_card_select_t *)resp.d.asBytes, sizeof(iso14b_card_select_t));
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
} // retry
|
2019-03-09 15:59:13 +08:00
|
|
|
|
2019-03-10 07:00:59 +08:00
|
|
|
if (retry <= 0)
|
2019-03-10 06:35:06 +08:00
|
|
|
PrintAndLogEx(WARNING, "timeout while waiting for reply.");
|
2019-03-09 15:59:13 +08:00
|
|
|
|
2019-03-10 06:35:06 +08:00
|
|
|
return false;
|
2018-08-13 03:54:31 +08:00
|
|
|
}
|
|
|
|
|
2015-06-30 04:37:55 +08:00
|
|
|
// print full atqb info
|
2016-03-23 21:02:50 +08:00
|
|
|
// bytes
|
|
|
|
// 0,1,2,3 = application data
|
|
|
|
// 4 = bit rate capacity
|
|
|
|
// 5 = max frame size / -4 info
|
|
|
|
// 6 = FWI / Coding options
|
2019-03-10 18:20:22 +08:00
|
|
|
static void print_atqb_resp(uint8_t *data, uint8_t cid) {
|
2019-03-10 06:35:06 +08:00
|
|
|
//PrintAndLogEx(NORMAL, " UID: %s", sprint_hex(data+1,4));
|
2019-03-10 07:00:59 +08:00
|
|
|
PrintAndLogEx(NORMAL, " App Data: %s", sprint_hex(data, 4));
|
|
|
|
PrintAndLogEx(NORMAL, " Protocol: %s", sprint_hex(data + 4, 3));
|
2019-03-10 06:35:06 +08:00
|
|
|
uint8_t BitRate = data[4];
|
|
|
|
if (!BitRate) PrintAndLogEx(NORMAL, " Bit Rate: 106 kbit/s only PICC <-> PCD");
|
|
|
|
if (BitRate & 0x10) PrintAndLogEx(NORMAL, " Bit Rate: 212 kbit/s PICC -> PCD supported");
|
|
|
|
if (BitRate & 0x20) PrintAndLogEx(NORMAL, " Bit Rate: 424 kbit/s PICC -> PCD supported");
|
|
|
|
if (BitRate & 0x40) PrintAndLogEx(NORMAL, " Bit Rate: 847 kbit/s PICC -> PCD supported");
|
|
|
|
if (BitRate & 0x01) PrintAndLogEx(NORMAL, " Bit Rate: 212 kbit/s PICC <- PCD supported");
|
|
|
|
if (BitRate & 0x02) PrintAndLogEx(NORMAL, " Bit Rate: 424 kbit/s PICC <- PCD supported");
|
|
|
|
if (BitRate & 0x04) PrintAndLogEx(NORMAL, " Bit Rate: 847 kbit/s PICC <- PCD supported");
|
|
|
|
if (BitRate & 0x80) PrintAndLogEx(NORMAL, " Same bit rate <-> required");
|
|
|
|
|
|
|
|
uint16_t maxFrame = data[5] >> 4;
|
|
|
|
if (maxFrame < 5) maxFrame = 8 * maxFrame + 16;
|
|
|
|
else if (maxFrame == 5) maxFrame = 64;
|
|
|
|
else if (maxFrame == 6) maxFrame = 96;
|
|
|
|
else if (maxFrame == 7) maxFrame = 128;
|
|
|
|
else if (maxFrame == 8) maxFrame = 256;
|
|
|
|
else maxFrame = 257;
|
|
|
|
|
|
|
|
PrintAndLogEx(NORMAL, "Max Frame Size: %u%s bytes", maxFrame, (maxFrame == 257) ? "+ RFU" : "");
|
|
|
|
|
|
|
|
uint8_t protocolT = data[5] & 0xF;
|
2019-03-10 07:00:59 +08:00
|
|
|
PrintAndLogEx(NORMAL, " Protocol Type: Protocol is %scompliant with ISO/IEC 14443-4", (protocolT) ? "" : "not ");
|
2019-03-10 06:35:06 +08:00
|
|
|
|
2019-03-10 07:00:59 +08:00
|
|
|
uint8_t fwt = data[6] >> 4;
|
|
|
|
if (fwt < 16) {
|
2019-03-10 06:35:06 +08:00
|
|
|
uint32_t etus = (32 << fwt);
|
|
|
|
uint32_t fwt_time = (302 << fwt);
|
|
|
|
PrintAndLogEx(NORMAL, "Frame Wait Integer: %u - %u ETUs | %u us", fwt, etus, fwt_time);
|
|
|
|
} else {
|
|
|
|
PrintAndLogEx(NORMAL, "Frame Wait Integer: %u - RFU", fwt);
|
|
|
|
}
|
|
|
|
|
2019-03-10 07:00:59 +08:00
|
|
|
PrintAndLogEx(NORMAL, " App Data Code: Application is %s", (data[6] & 4) ? "Standard" : "Proprietary");
|
|
|
|
PrintAndLogEx(NORMAL, " Frame Options: NAD is %ssupported", (data[6] & 2) ? "" : "not ");
|
|
|
|
PrintAndLogEx(NORMAL, " Frame Options: CID is %ssupported", (data[6] & 1) ? "" : "not ");
|
2019-03-10 06:35:06 +08:00
|
|
|
PrintAndLogEx(NORMAL, "Tag :");
|
2019-03-10 07:00:59 +08:00
|
|
|
PrintAndLogEx(NORMAL, " Max Buf Length: %u (MBLI) %s", cid >> 4, (cid & 0xF0) ? "" : "chained frames not supported");
|
2019-03-10 06:35:06 +08:00
|
|
|
PrintAndLogEx(NORMAL, " CID : %u", cid & 0x0f);
|
|
|
|
return;
|
2015-06-14 20:39:50 +08:00
|
|
|
}
|
|
|
|
|
2015-06-30 04:37:55 +08:00
|
|
|
// get SRx chip model (from UID) // from ST Microelectronics
|
2019-03-10 18:20:22 +08:00
|
|
|
char *get_ST_Chip_Model(uint8_t data) {
|
2019-03-10 06:35:06 +08:00
|
|
|
static char model[20];
|
|
|
|
char *retStr = model;
|
2019-03-10 07:00:59 +08:00
|
|
|
memset(model, 0, sizeof(model));
|
2019-03-10 06:35:06 +08:00
|
|
|
|
|
|
|
switch (data) {
|
2019-03-10 07:00:59 +08:00
|
|
|
case 0x0:
|
|
|
|
sprintf(retStr, "SRIX4K (Special)");
|
|
|
|
break;
|
|
|
|
case 0x2:
|
|
|
|
sprintf(retStr, "SR176");
|
|
|
|
break;
|
|
|
|
case 0x3:
|
|
|
|
sprintf(retStr, "SRIX4K");
|
|
|
|
break;
|
|
|
|
case 0x4:
|
|
|
|
sprintf(retStr, "SRIX512");
|
|
|
|
break;
|
|
|
|
case 0x6:
|
|
|
|
sprintf(retStr, "SRI512");
|
|
|
|
break;
|
|
|
|
case 0x7:
|
|
|
|
sprintf(retStr, "SRI4K");
|
|
|
|
break;
|
|
|
|
case 0xC:
|
|
|
|
sprintf(retStr, "SRT512");
|
|
|
|
break;
|
|
|
|
default :
|
|
|
|
sprintf(retStr, "Unknown");
|
|
|
|
break;
|
2019-03-10 06:35:06 +08:00
|
|
|
}
|
|
|
|
return retStr;
|
2015-06-25 18:25:44 +08:00
|
|
|
}
|
|
|
|
|
2016-03-21 02:33:07 +08:00
|
|
|
// REMAKE:
|
2019-03-10 18:20:22 +08:00
|
|
|
int print_ST_Lock_info(uint8_t model) {
|
2015-07-13 04:58:16 +08:00
|
|
|
|
2019-03-10 06:35:06 +08:00
|
|
|
// PrintAndLogEx(NORMAL, "Chip Write Protection Bits:");
|
|
|
|
// // now interpret the data
|
|
|
|
// switch (model){
|
2019-03-10 07:00:59 +08:00
|
|
|
// case 0x0: //fall through (SRIX4K special)
|
|
|
|
// case 0x3: //fall through (SRIx4K)
|
|
|
|
// case 0x7: // (SRI4K)
|
|
|
|
// //only need data[3]
|
|
|
|
// blk1 = 9;
|
|
|
|
// PrintAndLogEx(NORMAL, " raw: %s", sprint_bin(data+3, 1));
|
|
|
|
// PrintAndLogEx(NORMAL, " 07/08:%slocked", (data[3] & 1) ? " not " : " " );
|
|
|
|
// for (uint8_t i = 1; i<8; i++){
|
|
|
|
// PrintAndLogEx(NORMAL, " %02u:%slocked", blk1, (data[3] & (1 << i)) ? " not " : " " );
|
|
|
|
// blk1++;
|
|
|
|
// }
|
|
|
|
// break;
|
|
|
|
// case 0x4: //fall through (SRIX512)
|
|
|
|
// case 0x6: //fall through (SRI512)
|
|
|
|
// case 0xC: // (SRT512)
|
|
|
|
// //need data[2] and data[3]
|
|
|
|
// blk1 = 0;
|
|
|
|
// PrintAndLogEx(NORMAL, " raw: %s", sprint_bin(data+2, 2));
|
|
|
|
// for (uint8_t b=2; b<4; b++){
|
|
|
|
// for (uint8_t i=0; i<8; i++){
|
|
|
|
// PrintAndLogEx(NORMAL, " %02u:%slocked", blk1, (data[b] & (1 << i)) ? " not " : " " );
|
|
|
|
// blk1++;
|
|
|
|
// }
|
|
|
|
// }
|
|
|
|
// break;
|
|
|
|
// case 0x2: // (SR176)
|
|
|
|
// //need data[2]
|
|
|
|
// blk1 = 0;
|
|
|
|
// PrintAndLogEx(NORMAL, " raw: %s", sprint_bin(data+2, 1));
|
|
|
|
// for (uint8_t i = 0; i<8; i++){
|
|
|
|
// PrintAndLogEx(NORMAL, " %02u/%02u:%slocked", blk1, blk1+1, (data[2] & (1 << i)) ? " " : " not " );
|
|
|
|
// blk1+=2;
|
|
|
|
// }
|
|
|
|
// break;
|
|
|
|
// default:
|
|
|
|
// return rawClose();
|
2019-03-10 06:35:06 +08:00
|
|
|
// }
|
|
|
|
return 1;
|
2015-07-13 04:58:16 +08:00
|
|
|
}
|
|
|
|
|
2015-06-30 04:37:55 +08:00
|
|
|
// print UID info from SRx chips (ST Microelectronics)
|
2019-03-10 18:20:22 +08:00
|
|
|
static void print_st_general_info(uint8_t *data, uint8_t len) {
|
2019-03-10 06:35:06 +08:00
|
|
|
//uid = first 8 bytes in data
|
2019-03-10 07:00:59 +08:00
|
|
|
PrintAndLogEx(NORMAL, " UID: %s", sprint_hex(SwapEndian64(data, 8, 8), len));
|
2019-03-10 06:35:06 +08:00
|
|
|
PrintAndLogEx(NORMAL, " MFG: %02X, %s", data[6], getTagInfo(data[6]));
|
2019-03-10 07:00:59 +08:00
|
|
|
PrintAndLogEx(NORMAL, "Chip: %02X, %s", data[5] >> 2, get_ST_Chip_Model(data[5] >> 2));
|
2019-03-10 06:35:06 +08:00
|
|
|
return;
|
2015-06-25 18:25:44 +08:00
|
|
|
}
|
|
|
|
|
2016-03-21 02:33:07 +08:00
|
|
|
//05 00 00 = find one tag in field
|
|
|
|
//1d xx xx xx xx 00 08 01 00 = attrib xx=UID (resp 10 [f9 e0])
|
|
|
|
//a3 = ? (resp 03 [e2 c2])
|
|
|
|
//02 = ? (resp 02 [6a d3])
|
|
|
|
// 022b (resp 02 67 00 [29 5b])
|
|
|
|
// 0200a40400 (resp 02 67 00 [29 5b])
|
|
|
|
// 0200a4040c07a0000002480300 (resp 02 67 00 [29 5b])
|
|
|
|
// 0200a4040c07a0000002480200 (resp 02 67 00 [29 5b])
|
|
|
|
// 0200a4040006a0000000010100 (resp 02 6a 82 [4b 4c])
|
|
|
|
// 0200a4040c09d27600002545500200 (resp 02 67 00 [29 5b])
|
|
|
|
// 0200a404000cd2760001354b414e4d30310000 (resp 02 6a 82 [4b 4c])
|
|
|
|
// 0200a404000ca000000063504b43532d313500 (resp 02 6a 82 [4b 4c])
|
|
|
|
// 0200a4040010a000000018300301000000000000000000 (resp 02 6a 82 [4b 4c])
|
|
|
|
//03 = ? (resp 03 [e3 c2])
|
|
|
|
//c2 = ? (resp c2 [66 15])
|
2019-03-09 15:59:13 +08:00
|
|
|
//b2 = ? (resp a3 [e9 67])
|
2016-03-21 02:33:07 +08:00
|
|
|
//a2 = ? (resp 02 [6a d3])
|
2015-06-30 04:37:55 +08:00
|
|
|
|
|
|
|
// 14b get and print Full Info (as much as we know)
|
2019-03-10 18:20:22 +08:00
|
|
|
bool HF14B_Std_Info(bool verbose) {
|
2018-08-13 03:54:31 +08:00
|
|
|
|
2019-03-10 06:35:06 +08:00
|
|
|
bool isSuccess = false;
|
2019-03-09 15:59:13 +08:00
|
|
|
|
2019-03-10 06:35:06 +08:00
|
|
|
// 14b get and print UID only (general info)
|
|
|
|
UsbCommand c = {CMD_ISO_14443B_COMMAND, {ISO14B_CONNECT | ISO14B_SELECT_STD | ISO14B_DISCONNECT, 0, 0}};
|
|
|
|
clearCommandBuffer();
|
|
|
|
SendCommand(&c);
|
|
|
|
UsbCommand resp;
|
2019-03-09 15:59:13 +08:00
|
|
|
|
2019-03-10 06:35:06 +08:00
|
|
|
if (!WaitForResponseTimeout(CMD_ACK, &resp, TIMEOUT)) {
|
|
|
|
if (verbose) PrintAndLogEx(WARNING, "command execution timeout");
|
|
|
|
switch_off_field_14b();
|
2019-03-10 07:00:59 +08:00
|
|
|
return false;
|
2018-08-13 03:54:31 +08:00
|
|
|
}
|
2019-03-09 15:59:13 +08:00
|
|
|
|
2019-03-10 06:35:06 +08:00
|
|
|
iso14b_card_select_t card;
|
|
|
|
memcpy(&card, (iso14b_card_select_t *)resp.d.asBytes, sizeof(iso14b_card_select_t));
|
|
|
|
|
|
|
|
uint64_t status = resp.arg[0];
|
|
|
|
|
2019-03-10 07:00:59 +08:00
|
|
|
switch (status) {
|
2019-03-10 06:35:06 +08:00
|
|
|
case 0:
|
|
|
|
PrintAndLogEx(NORMAL, " UID : %s", sprint_hex(card.uid, card.uidlen));
|
|
|
|
PrintAndLogEx(NORMAL, " ATQB : %s", sprint_hex(card.atqb, sizeof(card.atqb)));
|
|
|
|
PrintAndLogEx(NORMAL, " CHIPID : %02X", card.chipid);
|
|
|
|
print_atqb_resp(card.atqb, card.cid);
|
|
|
|
isSuccess = true;
|
|
|
|
break;
|
|
|
|
case 2:
|
|
|
|
if (verbose) PrintAndLogEx(FAILED, "ISO 14443-3 ATTRIB fail");
|
|
|
|
break;
|
|
|
|
case 3:
|
|
|
|
if (verbose) PrintAndLogEx(FAILED, "ISO 14443-3 CRC fail");
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
if (verbose) PrintAndLogEx(FAILED, "ISO 14443-b card select failed");
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
return isSuccess;
|
2015-06-25 18:25:44 +08:00
|
|
|
}
|
|
|
|
|
2016-03-21 02:33:07 +08:00
|
|
|
// SRx get and print full info (needs more info...)
|
2019-03-10 18:20:22 +08:00
|
|
|
bool HF14B_ST_Info(bool verbose) {
|
2019-03-09 15:59:13 +08:00
|
|
|
|
2019-03-10 06:35:06 +08:00
|
|
|
UsbCommand c = {CMD_ISO_14443B_COMMAND, {ISO14B_CONNECT | ISO14B_SELECT_SR | ISO14B_DISCONNECT, 0, 0}};
|
|
|
|
clearCommandBuffer();
|
|
|
|
SendCommand(&c);
|
|
|
|
UsbCommand resp;
|
2015-06-25 18:25:44 +08:00
|
|
|
|
2019-03-10 06:35:06 +08:00
|
|
|
if (!WaitForResponseTimeout(CMD_ACK, &resp, TIMEOUT)) {
|
|
|
|
if (verbose) PrintAndLogEx(WARNING, "command execution timeout");
|
|
|
|
return false;
|
2016-03-21 02:33:07 +08:00
|
|
|
}
|
2015-06-25 18:25:44 +08:00
|
|
|
|
2019-03-10 06:35:06 +08:00
|
|
|
iso14b_card_select_t card;
|
|
|
|
memcpy(&card, (iso14b_card_select_t *)resp.d.asBytes, sizeof(iso14b_card_select_t));
|
|
|
|
|
|
|
|
uint64_t status = resp.arg[0];
|
2019-03-10 07:00:59 +08:00
|
|
|
if (status > 0)
|
2019-03-10 06:35:06 +08:00
|
|
|
return false;
|
|
|
|
|
|
|
|
print_st_general_info(card.uid, card.uidlen);
|
|
|
|
|
|
|
|
//add locking bit information here. uint8_t data[16] = {0x00};
|
|
|
|
// uint8_t datalen = 2;
|
|
|
|
// uint8_t resplen;
|
|
|
|
// uint8_t blk1;
|
|
|
|
// data[0] = 0x08;
|
|
|
|
|
|
|
|
//
|
|
|
|
// if (model == 0x2) { //SR176 has special command:
|
2019-03-10 07:00:59 +08:00
|
|
|
// data[1] = 0xf;
|
|
|
|
// resplen = 4;
|
2019-03-10 06:35:06 +08:00
|
|
|
// } else {
|
2019-03-10 07:00:59 +08:00
|
|
|
// data[1] = 0xff;
|
|
|
|
// resplen = 6;
|
2019-03-10 06:35:06 +08:00
|
|
|
// }
|
|
|
|
|
|
|
|
// //std read cmd
|
|
|
|
// if (HF14BCmdRaw(true, true, data, &datalen, false)==0)
|
2019-03-10 07:00:59 +08:00
|
|
|
// return rawClose();
|
2019-03-10 06:35:06 +08:00
|
|
|
|
|
|
|
// if (datalen != resplen || !crc) return rawClose();
|
|
|
|
//print_ST_Lock_info(data[5]>>2);
|
|
|
|
return true;
|
2016-03-21 02:33:07 +08:00
|
|
|
}
|
2015-06-25 18:25:44 +08:00
|
|
|
|
2016-03-21 02:33:07 +08:00
|
|
|
// get and print all info known about any known 14b tag
|
2019-03-10 18:20:22 +08:00
|
|
|
bool HF14BInfo(bool verbose) {
|
2015-06-25 18:25:44 +08:00
|
|
|
|
2019-03-10 06:35:06 +08:00
|
|
|
// try std 14b (atqb)
|
|
|
|
if (HF14B_Std_Info(verbose)) return true;
|
2015-06-25 18:25:44 +08:00
|
|
|
|
2019-03-10 06:35:06 +08:00
|
|
|
// try ST 14b
|
|
|
|
if (HF14B_ST_Info(verbose)) return true;
|
2015-07-13 04:58:16 +08:00
|
|
|
|
2019-03-10 06:35:06 +08:00
|
|
|
// try unknown 14b read commands (to be identified later)
|
|
|
|
// could be read of calypso, CEPAS, moneo, or pico pass.
|
|
|
|
if (verbose) PrintAndLogEx(FAILED, "no 14443-B tag found");
|
|
|
|
return false;
|
2016-03-21 02:33:07 +08:00
|
|
|
}
|
2015-06-25 18:25:44 +08:00
|
|
|
|
2016-03-21 02:33:07 +08:00
|
|
|
// menu command to get and print all info known about any known 14b tag
|
2019-03-10 18:20:22 +08:00
|
|
|
int CmdHF14Binfo(const char *Cmd) {
|
2019-03-10 06:35:06 +08:00
|
|
|
char cmdp = tolower(param_getchar(Cmd, 0));
|
|
|
|
if (cmdp == 'h') return usage_hf_14b_info();
|
2019-03-09 15:59:13 +08:00
|
|
|
|
2019-03-10 06:35:06 +08:00
|
|
|
bool verbose = !(cmdp == 's');
|
|
|
|
return HF14BInfo(verbose);
|
2015-06-30 04:37:55 +08:00
|
|
|
}
|
|
|
|
|
2019-03-10 18:20:22 +08:00
|
|
|
bool HF14B_ST_Reader(bool verbose) {
|
2016-03-21 02:33:07 +08:00
|
|
|
|
2019-03-10 06:35:06 +08:00
|
|
|
bool isSuccess = false;
|
2016-03-21 02:33:07 +08:00
|
|
|
|
2019-03-10 06:35:06 +08:00
|
|
|
// SRx get and print general info about SRx chip from UID
|
|
|
|
UsbCommand c = {CMD_ISO_14443B_COMMAND, {ISO14B_CONNECT | ISO14B_SELECT_SR | ISO14B_DISCONNECT, 0, 0}};
|
|
|
|
clearCommandBuffer();
|
|
|
|
SendCommand(&c);
|
|
|
|
UsbCommand resp;
|
|
|
|
if (!WaitForResponseTimeout(CMD_ACK, &resp, TIMEOUT)) {
|
|
|
|
if (verbose) PrintAndLogEx(WARNING, "command execution timeout");
|
|
|
|
return false;
|
2016-03-21 02:33:07 +08:00
|
|
|
}
|
2019-03-09 15:59:13 +08:00
|
|
|
|
2019-03-10 06:35:06 +08:00
|
|
|
iso14b_card_select_t card;
|
|
|
|
memcpy(&card, (iso14b_card_select_t *)resp.d.asBytes, sizeof(iso14b_card_select_t));
|
|
|
|
|
|
|
|
uint64_t status = resp.arg[0];
|
|
|
|
|
2019-03-10 07:00:59 +08:00
|
|
|
switch (status) {
|
2019-03-10 06:35:06 +08:00
|
|
|
case 0:
|
|
|
|
print_st_general_info(card.uid, card.uidlen);
|
|
|
|
isSuccess = true;
|
|
|
|
break;
|
|
|
|
case 1:
|
|
|
|
if (verbose) PrintAndLogEx(FAILED, "ISO 14443-3 random chip id fail");
|
|
|
|
break;
|
|
|
|
case 2:
|
|
|
|
if (verbose) PrintAndLogEx(FAILED, "ISO 14443-3 ATTRIB fail");
|
|
|
|
break;
|
|
|
|
case 3:
|
|
|
|
if (verbose) PrintAndLogEx(FAILED, "ISO 14443-3 CRC fail");
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
if (verbose) PrintAndLogEx(FAILED, "ISO 14443-b card select SRx failed");
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
return isSuccess;
|
2015-06-14 20:39:50 +08:00
|
|
|
}
|
|
|
|
|
2019-03-10 18:20:22 +08:00
|
|
|
bool HF14B_Std_Reader(bool verbose) {
|
2015-06-21 17:07:05 +08:00
|
|
|
|
2019-03-10 06:35:06 +08:00
|
|
|
bool isSuccess = false;
|
2015-06-21 17:07:05 +08:00
|
|
|
|
2019-03-10 06:35:06 +08:00
|
|
|
// 14b get and print UID only (general info)
|
|
|
|
UsbCommand c = {CMD_ISO_14443B_COMMAND, {ISO14B_CONNECT | ISO14B_SELECT_STD | ISO14B_DISCONNECT, 0, 0}};
|
|
|
|
clearCommandBuffer();
|
|
|
|
SendCommand(&c);
|
|
|
|
UsbCommand resp;
|
2019-03-09 15:59:13 +08:00
|
|
|
|
2019-03-10 06:35:06 +08:00
|
|
|
if (!WaitForResponseTimeout(CMD_ACK, &resp, TIMEOUT)) {
|
|
|
|
if (verbose) PrintAndLogEx(WARNING, "command execution timeout");
|
|
|
|
return false;
|
2016-03-21 02:33:07 +08:00
|
|
|
}
|
2019-03-09 15:59:13 +08:00
|
|
|
|
2019-03-10 06:35:06 +08:00
|
|
|
iso14b_card_select_t card;
|
|
|
|
memcpy(&card, (iso14b_card_select_t *)resp.d.asBytes, sizeof(iso14b_card_select_t));
|
|
|
|
|
|
|
|
uint64_t status = resp.arg[0];
|
|
|
|
|
2019-03-10 07:00:59 +08:00
|
|
|
switch (status) {
|
2019-03-10 06:35:06 +08:00
|
|
|
case 0:
|
|
|
|
PrintAndLogEx(NORMAL, " UID : %s", sprint_hex(card.uid, card.uidlen));
|
|
|
|
PrintAndLogEx(NORMAL, " ATQB : %s", sprint_hex(card.atqb, sizeof(card.atqb)));
|
|
|
|
PrintAndLogEx(NORMAL, " CHIPID : %02X", card.chipid);
|
|
|
|
print_atqb_resp(card.atqb, card.cid);
|
|
|
|
isSuccess = true;
|
|
|
|
break;
|
|
|
|
case 2:
|
|
|
|
if (verbose) PrintAndLogEx(FAILED, "ISO 14443-3 ATTRIB fail");
|
|
|
|
break;
|
|
|
|
case 3:
|
|
|
|
if (verbose) PrintAndLogEx(FAILED, "ISO 14443-3 CRC fail");
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
if (verbose) PrintAndLogEx(FAILED, "ISO 14443-b card select failed");
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
return isSuccess;
|
2016-03-21 02:33:07 +08:00
|
|
|
}
|
2015-06-14 20:39:50 +08:00
|
|
|
|
2016-03-21 02:33:07 +08:00
|
|
|
// test for other 14b type tags (mimic another reader - don't have tags to identify)
|
2019-03-10 18:20:22 +08:00
|
|
|
bool HF14B_Other_Reader() {
|
2015-06-18 15:52:53 +08:00
|
|
|
|
2019-03-10 06:35:06 +08:00
|
|
|
// uint8_t data[] = {0x00, 0x0b, 0x3f, 0x80};
|
|
|
|
// uint8_t datalen = 4;
|
|
|
|
|
|
|
|
// // 14b get and print UID only (general info)
|
|
|
|
// uint32_t flags = ISO14B_CONNECT | ISO14B_SELECT_STD | ISO14B_RAW | ISO14B_APPEND_CRC;
|
|
|
|
|
|
|
|
// UsbCommand c = {CMD_ISO_14443B_COMMAND, {flags, datalen, 0}};
|
|
|
|
// memcpy(c.d.asBytes, data, datalen);
|
|
|
|
|
|
|
|
// clearCommandBuffer();
|
|
|
|
// SendCommand(&c);
|
|
|
|
// UsbCommand resp;
|
|
|
|
// WaitForResponse(CMD_ACK,&resp);
|
|
|
|
|
|
|
|
// if (datalen > 2 ) {
|
2019-03-10 07:00:59 +08:00
|
|
|
// PrintAndLogEx(NORMAL, "\n14443-3b tag found:");
|
|
|
|
// PrintAndLogEx(NORMAL, "unknown tag type answered to a 0x000b3f80 command ans:");
|
|
|
|
// //PrintAndLogEx(NORMAL, "%s", sprint_hex(data, datalen));
|
|
|
|
// rawclose();
|
|
|
|
// return true;
|
2019-03-10 06:35:06 +08:00
|
|
|
// }
|
|
|
|
|
|
|
|
// c.arg1 = 1;
|
|
|
|
// c.d.asBytes[0] = ISO14443B_AUTHENTICATE;
|
|
|
|
// clearCommandBuffer();
|
|
|
|
// SendCommand(&c);
|
|
|
|
// UsbCommand resp;
|
|
|
|
// WaitForResponse(CMD_ACK, &resp);
|
|
|
|
|
|
|
|
// if (datalen > 0) {
|
2019-03-10 07:00:59 +08:00
|
|
|
// PrintAndLogEx(NORMAL, "\n14443-3b tag found:");
|
|
|
|
// PrintAndLogEx(NORMAL, "Unknown tag type answered to a 0x0A command ans:");
|
|
|
|
// // PrintAndLogEx(NORMAL, "%s", sprint_hex(data, datalen));
|
|
|
|
// rawClose();
|
|
|
|
// return true;
|
2019-03-10 06:35:06 +08:00
|
|
|
// }
|
|
|
|
|
|
|
|
// c.arg1 = 1;
|
|
|
|
// c.d.asBytes[0] = ISO14443B_RESET;
|
|
|
|
// clearCommandBuffer();
|
|
|
|
// SendCommand(&c);
|
|
|
|
// UsbCommand resp;
|
|
|
|
// WaitForResponse(CMD_ACK, &resp);
|
|
|
|
|
|
|
|
// if (datalen > 0) {
|
2019-03-10 07:00:59 +08:00
|
|
|
// PrintAndLogEx(NORMAL, "\n14443-3b tag found:");
|
|
|
|
// PrintAndLogEx(NORMAL, "Unknown tag type answered to a 0x0C command ans:");
|
|
|
|
// PrintAndLogEx(NORMAL, "%s", sprint_hex(data, datalen));
|
|
|
|
// rawClose();
|
|
|
|
// return true;
|
2019-03-10 06:35:06 +08:00
|
|
|
// }
|
|
|
|
|
|
|
|
// rawClose();
|
|
|
|
return false;
|
2013-09-02 02:41:05 +08:00
|
|
|
}
|
|
|
|
|
2015-06-30 04:37:55 +08:00
|
|
|
// get and print general info about all known 14b chips
|
2019-03-10 18:20:22 +08:00
|
|
|
bool HF14BReader(bool verbose) {
|
2019-03-09 15:59:13 +08:00
|
|
|
|
2019-03-10 06:35:06 +08:00
|
|
|
// try std 14b (atqb)
|
|
|
|
if (HF14B_Std_Reader(verbose)) return true;
|
2015-06-30 04:37:55 +08:00
|
|
|
|
2019-03-10 06:35:06 +08:00
|
|
|
// try ST Microelectronics 14b
|
|
|
|
if (HF14B_ST_Reader(verbose)) return true;
|
2015-06-30 04:37:55 +08:00
|
|
|
|
2019-03-10 06:35:06 +08:00
|
|
|
// try unknown 14b read commands (to be identified later)
|
|
|
|
// could be read of calypso, CEPAS, moneo, or pico pass.
|
|
|
|
if (HF14B_Other_Reader()) return true;
|
2015-06-30 04:37:55 +08:00
|
|
|
|
2019-03-10 06:35:06 +08:00
|
|
|
if (verbose) PrintAndLogEx(FAILED, "no 14443-B tag found");
|
|
|
|
return false;
|
2015-06-30 04:37:55 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
// menu command to get and print general info about all known 14b chips
|
2019-03-10 18:20:22 +08:00
|
|
|
int CmdHF14BReader(const char *Cmd) {
|
2019-03-10 06:35:06 +08:00
|
|
|
char cmdp = tolower(param_getchar(Cmd, 0));
|
|
|
|
if (cmdp == 'h') return usage_hf_14b_reader();
|
2019-03-09 15:59:13 +08:00
|
|
|
|
2019-03-10 06:35:06 +08:00
|
|
|
bool verbose = !(cmdp == 's');
|
|
|
|
return HF14BReader(verbose);
|
2015-06-30 04:37:55 +08:00
|
|
|
}
|
|
|
|
|
2016-03-21 02:33:07 +08:00
|
|
|
/* New command to read the contents of a SRI512|SRIX4K tag
|
|
|
|
* SRI* tags are ISO14443-B modulated memory tags,
|
|
|
|
* this command just dumps the contents of the memory/
|
|
|
|
*/
|
2019-03-10 18:20:22 +08:00
|
|
|
int CmdHF14BReadSri(const char *Cmd) {
|
2019-03-10 06:35:06 +08:00
|
|
|
char cmdp = tolower(param_getchar(Cmd, 0));
|
|
|
|
if (strlen(Cmd) < 1 || cmdp == 'h') return usage_hf_14b_read_srx();
|
2016-03-21 02:33:07 +08:00
|
|
|
|
2019-03-10 06:35:06 +08:00
|
|
|
uint8_t tagtype = param_get8(Cmd, 0);
|
|
|
|
uint8_t blocks = (tagtype == 1) ? 0x7F : 0x0F;
|
2019-03-09 15:59:13 +08:00
|
|
|
|
2019-03-10 06:35:06 +08:00
|
|
|
UsbCommand c = {CMD_READ_SRI_TAG, {blocks, 0, 0}};
|
|
|
|
clearCommandBuffer();
|
|
|
|
SendCommand(&c);
|
|
|
|
return 0;
|
2016-03-21 02:33:07 +08:00
|
|
|
}
|
|
|
|
// New command to write a SRI512/SRIX4K tag.
|
2019-03-10 18:20:22 +08:00
|
|
|
int CmdHF14BWriteSri(const char *Cmd) {
|
2019-03-10 07:00:59 +08:00
|
|
|
/*
|
|
|
|
* For SRIX4K blocks 00 - 7F
|
|
|
|
* hf 14b raw -c -p 09 $srix4kwblock $srix4kwdata
|
|
|
|
*
|
|
|
|
* For SR512 blocks 00 - 0F
|
|
|
|
* hf 14b raw -c -p 09 $sr512wblock $sr512wdata
|
|
|
|
*
|
|
|
|
* Special block FF = otp_lock_reg block.
|
|
|
|
* Data len 4 bytes-
|
|
|
|
*/
|
2019-03-10 06:35:06 +08:00
|
|
|
char cmdp = tolower(param_getchar(Cmd, 0));
|
|
|
|
uint8_t blockno = -1;
|
|
|
|
uint8_t data[4] = {0x00};
|
|
|
|
bool isSrix4k = true;
|
|
|
|
char str[30];
|
|
|
|
memset(str, 0x00, sizeof(str));
|
|
|
|
|
|
|
|
if (strlen(Cmd) < 1 || cmdp == 'h') return usage_hf_14b_write_srx();
|
|
|
|
|
2019-03-10 07:00:59 +08:00
|
|
|
if (cmdp == '2')
|
2019-03-10 06:35:06 +08:00
|
|
|
isSrix4k = false;
|
|
|
|
|
|
|
|
//blockno = param_get8(Cmd, 1);
|
|
|
|
|
2019-03-10 07:00:59 +08:00
|
|
|
if (param_gethex(Cmd, 1, &blockno, 2)) {
|
2019-03-10 06:35:06 +08:00
|
|
|
PrintAndLogEx(WARNING, "block number must include 2 HEX symbols");
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2019-03-10 07:00:59 +08:00
|
|
|
if (isSrix4k) {
|
|
|
|
if (blockno > 0x7f && blockno != 0xff) {
|
2019-03-10 06:35:06 +08:00
|
|
|
PrintAndLogEx(FAILED, "block number out of range");
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
} else {
|
2019-03-10 07:00:59 +08:00
|
|
|
if (blockno > 0x0f && blockno != 0xff) {
|
2019-03-10 06:35:06 +08:00
|
|
|
PrintAndLogEx(FAILED, "block number out of range");
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (param_gethex(Cmd, 2, data, 8)) {
|
|
|
|
PrintAndLogEx(WARNING, "data must include 8 HEX symbols");
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2019-03-10 07:00:59 +08:00
|
|
|
if (blockno == 0xff) {
|
2019-03-10 06:35:06 +08:00
|
|
|
PrintAndLogEx(SUCCESS, "[%s] Write special block %02X [ %s ]",
|
2019-03-10 07:00:59 +08:00
|
|
|
(isSrix4k) ? "SRIX4K" : "SRI512",
|
|
|
|
blockno,
|
|
|
|
sprint_hex(data, 4)
|
|
|
|
);
|
2019-03-10 06:35:06 +08:00
|
|
|
} else {
|
|
|
|
PrintAndLogEx(SUCCESS, "[%s] Write block %02X [ %s ]",
|
2019-03-10 07:00:59 +08:00
|
|
|
(isSrix4k) ? "SRIX4K" : "SRI512",
|
|
|
|
blockno,
|
|
|
|
sprint_hex(data, 4)
|
|
|
|
);
|
2019-03-10 06:35:06 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
sprintf(str, "-ss -c %02x %02x %02x %02x %02x %02x", ISO14443B_WRITE_BLK, blockno, data[0], data[1], data[2], data[3]);
|
|
|
|
CmdHF14BCmdRaw(str);
|
|
|
|
return 0;
|
2015-01-05 22:51:27 +08:00
|
|
|
}
|
|
|
|
|
2018-08-13 03:54:31 +08:00
|
|
|
// need to write to file
|
2019-03-10 18:20:22 +08:00
|
|
|
int CmdHF14BDump(const char *Cmd) {
|
2019-03-09 15:59:13 +08:00
|
|
|
|
2019-03-10 06:35:06 +08:00
|
|
|
uint8_t fileNameLen = 0;
|
|
|
|
char filename[FILE_PATH_SIZE] = {0};
|
2019-03-10 07:00:59 +08:00
|
|
|
char *fptr = filename;
|
2019-03-10 06:35:06 +08:00
|
|
|
bool errors = false;
|
|
|
|
uint8_t cmdp = 0, cardtype = 1;
|
|
|
|
uint16_t cardsize = 0;
|
|
|
|
uint8_t blocks = 0;
|
|
|
|
iso14b_card_select_t card;
|
|
|
|
|
|
|
|
while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
|
|
|
|
switch (tolower(param_getchar(Cmd, cmdp))) {
|
2019-03-10 07:00:59 +08:00
|
|
|
case 'h':
|
|
|
|
return usage_hf_14b_dump();
|
|
|
|
case 'f':
|
|
|
|
fileNameLen = param_getstr(Cmd, cmdp + 1, filename, FILE_PATH_SIZE);
|
|
|
|
cmdp += 2;
|
2019-03-10 06:35:06 +08:00
|
|
|
break;
|
2019-03-10 07:00:59 +08:00
|
|
|
default:
|
|
|
|
if (cmdp == 0) {
|
|
|
|
cardtype = param_get8ex(Cmd, cmdp, 1, 10);
|
|
|
|
cmdp++;
|
|
|
|
} else {
|
|
|
|
PrintAndLogEx(WARNING, "Unknown parameter '%c'\n", param_getchar(Cmd, cmdp));
|
|
|
|
errors = true;
|
|
|
|
break;
|
|
|
|
}
|
2019-03-10 06:35:06 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
//Validations
|
|
|
|
if (errors) return usage_hf_14b_dump();
|
|
|
|
|
2019-03-10 07:00:59 +08:00
|
|
|
switch (cardtype) {
|
2019-03-10 06:35:06 +08:00
|
|
|
case 2:
|
2019-03-10 07:00:59 +08:00
|
|
|
cardsize = (512 / 8) + 4;
|
2019-03-10 06:35:06 +08:00
|
|
|
blocks = 0x0F;
|
|
|
|
break;
|
|
|
|
case 1:
|
|
|
|
default:
|
2019-03-10 07:00:59 +08:00
|
|
|
cardsize = (4096 / 8) + 4;
|
2019-03-10 06:35:06 +08:00
|
|
|
blocks = 0x7F;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!get_14b_UID(&card)) {
|
|
|
|
PrintAndLogEx(WARNING, "No tag found.");
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (fileNameLen < 1) {
|
|
|
|
PrintAndLogEx(INFO, "Using UID as filename");
|
|
|
|
fptr += sprintf(fptr, "hf-14b-");
|
|
|
|
FillFileNameByUID(fptr, card.uid, "-dump", card.uidlen);
|
|
|
|
}
|
|
|
|
|
|
|
|
// detect blocksize from card :)
|
|
|
|
PrintAndLogEx(NORMAL, "Reading memory from tag UID %s", sprint_hex(card.uid, card.uidlen));
|
|
|
|
|
|
|
|
uint8_t data[cardsize];
|
|
|
|
memset(data, 0, sizeof(data));
|
|
|
|
|
|
|
|
int blocknum = 0;
|
|
|
|
uint8_t *recv = NULL;
|
|
|
|
|
|
|
|
UsbCommand resp;
|
|
|
|
UsbCommand c = {CMD_ISO_14443B_COMMAND, { ISO14B_CONNECT | ISO14B_SELECT_SR, 0, 0}};
|
|
|
|
clearCommandBuffer();
|
|
|
|
SendCommand(&c);
|
|
|
|
|
|
|
|
//select
|
|
|
|
if (WaitForResponseTimeout(CMD_ACK, &resp, 2000)) {
|
|
|
|
if (resp.arg[0]) {
|
|
|
|
PrintAndLogEx(INFO, "failed to select %d | %d", resp.arg[0], resp.arg[1]);
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
c.arg[0] = ISO14B_APPEND_CRC | ISO14B_RAW;
|
|
|
|
c.arg[1] = 2;
|
|
|
|
|
|
|
|
uint8_t *req = c.d.asBytes;
|
|
|
|
req[0] = ISO14443B_READ_BLK;
|
|
|
|
|
|
|
|
for (int retry = 0; retry < 5; retry++) {
|
|
|
|
|
|
|
|
req[1] = blocknum;
|
|
|
|
|
|
|
|
clearCommandBuffer();
|
|
|
|
SendCommand(&c);
|
|
|
|
|
|
|
|
if (WaitForResponseTimeout(CMD_ACK, &resp, 2000)) {
|
|
|
|
|
|
|
|
uint8_t status = resp.arg[0] & 0xFF;
|
2019-03-10 07:00:59 +08:00
|
|
|
if (status > 0) {
|
2019-03-10 06:35:06 +08:00
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
uint16_t len = (resp.arg[1] & 0xFFFF);
|
|
|
|
recv = resp.d.asBytes;
|
|
|
|
|
2019-03-10 07:00:59 +08:00
|
|
|
if (!check_crc(CRC_14443_B, recv, len)) {
|
2019-03-10 06:35:06 +08:00
|
|
|
PrintAndLogEx(FAILED, "crc fail, retrying one more time");
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
memcpy(data + (blocknum * 4), resp.d.asBytes, 4);
|
|
|
|
|
2019-03-10 07:00:59 +08:00
|
|
|
if (blocknum == 0xFF) {
|
2019-03-10 06:35:06 +08:00
|
|
|
//last read.
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
retry = 0;
|
|
|
|
blocknum++;
|
2019-03-10 07:00:59 +08:00
|
|
|
if (blocknum > blocks) {
|
2019-03-10 06:35:06 +08:00
|
|
|
// read config block
|
|
|
|
blocknum = 0xFF;
|
|
|
|
}
|
|
|
|
|
2019-03-10 07:00:59 +08:00
|
|
|
printf(".");
|
|
|
|
fflush(stdout);
|
2019-03-10 06:35:06 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-03-10 07:00:59 +08:00
|
|
|
if (blocknum != 0xFF) {
|
2019-03-10 06:35:06 +08:00
|
|
|
PrintAndLogEx(NORMAL, "\n Dump failed");
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
|
|
|
PrintAndLogEx(NORMAL, "\n");
|
|
|
|
PrintAndLogEx(NORMAL, "block# | data | ascii");
|
|
|
|
PrintAndLogEx(NORMAL, "---------+--------------+----------");
|
|
|
|
|
|
|
|
for (int i = 0; i <= blocks; i++) {
|
|
|
|
PrintAndLogEx(NORMAL,
|
2019-03-10 07:00:59 +08:00
|
|
|
"%3d/0x%02X | %s | %s",
|
|
|
|
i,
|
|
|
|
i,
|
|
|
|
sprint_hex(data + (i * 4), 4),
|
|
|
|
sprint_ascii(data + (i * 4), 4)
|
|
|
|
);
|
2019-03-10 06:35:06 +08:00
|
|
|
}
|
2019-03-09 15:59:13 +08:00
|
|
|
|
2019-03-10 06:35:06 +08:00
|
|
|
PrintAndLogEx(NORMAL, "\n");
|
2018-08-13 03:54:31 +08:00
|
|
|
|
2019-03-09 15:59:13 +08:00
|
|
|
|
2019-03-10 07:00:59 +08:00
|
|
|
size_t datalen = (blocks + 1) * 4;
|
2019-03-10 06:35:06 +08:00
|
|
|
saveFileEML(filename, "eml", data, datalen, 4);
|
|
|
|
saveFile(filename, "bin", data, datalen);
|
2018-08-13 03:54:31 +08:00
|
|
|
out:
|
2019-03-10 06:35:06 +08:00
|
|
|
return switch_off_field_14b();
|
2018-08-13 03:54:31 +08:00
|
|
|
}
|
|
|
|
|
2019-03-10 18:20:22 +08:00
|
|
|
uint32_t srix4kEncode(uint32_t value) {
|
2019-03-10 07:00:59 +08:00
|
|
|
/*
|
|
|
|
// vv = value
|
|
|
|
// pp = position
|
|
|
|
// vv vv vv pp
|
|
|
|
4 bytes : 00 1A 20 01
|
|
|
|
*/
|
2019-03-10 06:35:06 +08:00
|
|
|
// only the lower crumbs.
|
|
|
|
uint8_t block = (value & 0xFF);
|
|
|
|
uint8_t i = 0;
|
2019-03-10 07:00:59 +08:00
|
|
|
uint8_t valuebytes[] = {0, 0, 0};
|
2019-03-10 06:35:06 +08:00
|
|
|
|
|
|
|
num_to_bytes(value, 3, valuebytes);
|
|
|
|
|
|
|
|
// Scrambled part
|
|
|
|
// Crumb swapping of value.
|
2019-03-10 07:00:59 +08:00
|
|
|
uint8_t temp[] = {0, 0};
|
|
|
|
temp[0] = (CRUMB(value, 22) << 4 | CRUMB(value, 14) << 2 | CRUMB(value, 6)) << 4;
|
|
|
|
temp[0] |= CRUMB(value, 20) << 4 | CRUMB(value, 12) << 2 | CRUMB(value, 4);
|
|
|
|
temp[1] = (CRUMB(value, 18) << 4 | CRUMB(value, 10) << 2 | CRUMB(value, 2)) << 4;
|
|
|
|
temp[1] |= CRUMB(value, 16) << 4 | CRUMB(value, 8) << 2 | CRUMB(value, 0);
|
2019-03-10 06:35:06 +08:00
|
|
|
|
|
|
|
// chksum part
|
|
|
|
uint32_t chksum = 0xFF - block;
|
|
|
|
|
|
|
|
// chksum is reduced by each nibbles of value.
|
2019-03-10 07:00:59 +08:00
|
|
|
for (i = 0; i < 3; ++i) {
|
2019-03-10 06:35:06 +08:00
|
|
|
chksum -= NIBBLE_HIGH(valuebytes[i]);
|
|
|
|
chksum -= NIBBLE_LOW(valuebytes[i]);
|
|
|
|
}
|
|
|
|
|
|
|
|
// base4 conversion and left shift twice
|
|
|
|
i = 3;
|
2019-03-10 07:00:59 +08:00
|
|
|
uint8_t base4[] = {0, 0, 0, 0};
|
|
|
|
while (chksum != 0) {
|
2015-11-23 01:13:26 +08:00
|
|
|
base4[i--] = (chksum % 4 << 2);
|
2019-03-10 06:35:06 +08:00
|
|
|
chksum /= 4;
|
2015-11-23 01:13:26 +08:00
|
|
|
}
|
2019-03-09 15:59:13 +08:00
|
|
|
|
2019-03-10 06:35:06 +08:00
|
|
|
// merge scambled and chksum parts
|
|
|
|
uint32_t encvalue =
|
2019-03-10 07:00:59 +08:00
|
|
|
(NIBBLE_LOW(base4[0]) << 28) |
|
|
|
|
(NIBBLE_HIGH(temp[0]) << 24) |
|
2019-03-09 15:59:13 +08:00
|
|
|
|
2019-03-10 07:00:59 +08:00
|
|
|
(NIBBLE_LOW(base4[1]) << 20) |
|
|
|
|
(NIBBLE_LOW(temp[0]) << 16) |
|
2019-03-09 15:59:13 +08:00
|
|
|
|
2019-03-10 07:00:59 +08:00
|
|
|
(NIBBLE_LOW(base4[2]) << 12) |
|
|
|
|
(NIBBLE_HIGH(temp[1]) << 8) |
|
2019-03-09 15:59:13 +08:00
|
|
|
|
2019-03-10 07:00:59 +08:00
|
|
|
(NIBBLE_LOW(base4[3]) << 4) |
|
|
|
|
NIBBLE_LOW(temp[1]);
|
2015-11-23 01:13:26 +08:00
|
|
|
|
2019-03-10 06:35:06 +08:00
|
|
|
PrintAndLogEx(NORMAL, "ICE encoded | %08X -> %08X", value, encvalue);
|
|
|
|
return encvalue;
|
2015-12-23 18:59:34 +08:00
|
|
|
}
|
2019-03-10 18:20:22 +08:00
|
|
|
uint32_t srix4kDecode(uint32_t value) {
|
2019-03-10 07:00:59 +08:00
|
|
|
switch (value) {
|
|
|
|
case 0xC04F42C5:
|
|
|
|
return 0x003139;
|
|
|
|
case 0xC1484807:
|
|
|
|
return 0x002943;
|
|
|
|
case 0xC0C60848:
|
|
|
|
return 0x001A20;
|
2019-03-10 06:35:06 +08:00
|
|
|
}
|
|
|
|
return 0;
|
2015-11-23 01:13:26 +08:00
|
|
|
}
|
2019-03-10 18:20:22 +08:00
|
|
|
uint32_t srix4kDecodeCounter(uint32_t num) {
|
2019-03-10 06:35:06 +08:00
|
|
|
uint32_t value = ~num;
|
|
|
|
++value;
|
|
|
|
return value;
|
2015-12-23 18:59:34 +08:00
|
|
|
}
|
|
|
|
|
2019-03-10 18:20:22 +08:00
|
|
|
uint32_t srix4kGetMagicbytes(uint64_t uid, uint32_t block6, uint32_t block18, uint32_t block19) {
|
2015-12-23 18:59:34 +08:00
|
|
|
#define MASK 0xFFFFFFFF;
|
2019-03-10 06:35:06 +08:00
|
|
|
uint32_t uid32 = uid & MASK;
|
|
|
|
uint32_t counter = srix4kDecodeCounter(block6);
|
|
|
|
uint32_t decodedBlock18 = srix4kDecode(block18);
|
|
|
|
uint32_t decodedBlock19 = srix4kDecode(block19);
|
|
|
|
uint32_t doubleBlock = (decodedBlock18 << 16 | decodedBlock19) + 1;
|
|
|
|
|
|
|
|
uint32_t result = (uid32 * doubleBlock * counter) & MASK;
|
|
|
|
PrintAndLogEx(SUCCESS, "Magic bytes | %08X", result);
|
|
|
|
return result;
|
2015-12-23 18:59:34 +08:00
|
|
|
}
|
2019-03-10 18:20:22 +08:00
|
|
|
int srix4kValid(const char *Cmd) {
|
2015-12-23 18:59:34 +08:00
|
|
|
|
2019-03-10 06:35:06 +08:00
|
|
|
uint64_t uid = 0xD00202501A4532F9;
|
|
|
|
uint32_t block6 = 0xFFFFFFFF;
|
|
|
|
uint32_t block18 = 0xC04F42C5;
|
|
|
|
uint32_t block19 = 0xC1484807;
|
|
|
|
uint32_t block21 = 0xD1BCABA4;
|
2019-03-09 15:59:13 +08:00
|
|
|
|
2019-03-10 06:35:06 +08:00
|
|
|
uint32_t test_b18 = 0x00313918;
|
|
|
|
uint32_t test_b18_enc = srix4kEncode(test_b18);
|
|
|
|
//uint32_t test_b18_dec = srix4kDecode(test_b18_enc);
|
2019-03-10 07:00:59 +08:00
|
|
|
PrintAndLogEx(SUCCESS, "ENCODE & CHECKSUM | %08X -> %08X (%s)", test_b18, test_b18_enc, "");
|
2019-03-09 15:59:13 +08:00
|
|
|
|
2019-03-10 06:35:06 +08:00
|
|
|
uint32_t magic = srix4kGetMagicbytes(uid, block6, block18, block19);
|
|
|
|
PrintAndLogEx(SUCCESS, "BLOCK 21 | %08X -> %08X (no XOR)", block21, magic ^ block21);
|
|
|
|
return 0;
|
2015-11-23 01:13:26 +08:00
|
|
|
}
|
2015-12-23 18:59:34 +08:00
|
|
|
|
2019-03-10 18:20:22 +08:00
|
|
|
bool waitCmd14b(bool verbose) {
|
2016-03-21 02:33:07 +08:00
|
|
|
|
2019-03-10 06:35:06 +08:00
|
|
|
bool crc = false;
|
|
|
|
uint8_t data[USB_CMD_DATA_SIZE] = {0x00};
|
|
|
|
uint8_t status = 0;
|
|
|
|
uint16_t len = 0;
|
2016-03-21 02:33:07 +08:00
|
|
|
UsbCommand resp;
|
|
|
|
|
2016-03-22 05:07:23 +08:00
|
|
|
if (WaitForResponseTimeout(CMD_ACK, &resp, TIMEOUT)) {
|
2016-03-21 02:33:07 +08:00
|
|
|
|
2019-03-10 06:35:06 +08:00
|
|
|
status = (resp.arg[0] & 0xFF);
|
2019-03-10 07:00:59 +08:00
|
|
|
if (status > 0) return false;
|
2019-03-10 06:35:06 +08:00
|
|
|
|
|
|
|
len = (resp.arg[1] & 0xFFFF);
|
|
|
|
|
|
|
|
memcpy(data, resp.d.asBytes, len);
|
|
|
|
|
|
|
|
if (verbose) {
|
2019-03-10 07:00:59 +08:00
|
|
|
if (len >= 3) {
|
2019-03-10 06:35:06 +08:00
|
|
|
crc = check_crc(CRC_14443_B, data, len);
|
|
|
|
|
|
|
|
PrintAndLogEx(NORMAL, "[LEN %u] %s[%02X %02X] %s",
|
2019-03-10 07:00:59 +08:00
|
|
|
len,
|
|
|
|
sprint_hex(data, len - 2),
|
|
|
|
data[len - 2],
|
|
|
|
data[len - 1],
|
|
|
|
(crc) ? "OK" : "FAIL"
|
|
|
|
);
|
2019-03-10 06:35:06 +08:00
|
|
|
} else {
|
2019-03-10 07:00:59 +08:00
|
|
|
PrintAndLogEx(NORMAL, "[LEN %u] %s", len, sprint_hex(data, len));
|
2019-03-10 06:35:06 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
return true;
|
2016-03-21 02:33:07 +08:00
|
|
|
} else {
|
2018-02-21 14:28:46 +08:00
|
|
|
PrintAndLogEx(WARNING, "command execution timeout");
|
2019-03-10 06:35:06 +08:00
|
|
|
return false;
|
2016-03-21 02:33:07 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-01-13 05:37:35 +08:00
|
|
|
static command_t CommandTable[] = {
|
2019-03-10 06:35:06 +08:00
|
|
|
{"help", CmdHelp, 1, "This help"},
|
|
|
|
{"dump", CmdHF14BDump, 0, "Read all memory pages of an ISO14443-B tag, save to file"},
|
|
|
|
{"info", CmdHF14Binfo, 0, "Tag information"},
|
|
|
|
{"list", CmdHF14BList, 0, "[Deprecated] List ISO 14443B history"},
|
|
|
|
{"raw", CmdHF14BCmdRaw, 0, "Send raw hex data to tag"},
|
|
|
|
{"reader", CmdHF14BReader, 0, "Act as a 14443B reader to identify a tag"},
|
|
|
|
{"sim", CmdHF14BSim, 0, "Fake ISO 14443B tag"},
|
|
|
|
{"sniff", CmdHF14BSniff, 0, "Eavesdrop ISO 14443B"},
|
|
|
|
{"sriread", CmdHF14BReadSri, 0, "Read contents of a SRI512 | SRIX4K tag"},
|
|
|
|
{"sriwrite", CmdHF14BWriteSri, 0, "Write data to a SRI512 | SRIX4K tag"},
|
|
|
|
//{"valid", srix4kValid, 1, "srix4k checksum test"},
|
|
|
|
{NULL, NULL, 0, NULL}
|
Client cleanup and restructuring. Stage 1...
Next Step is refactoring some of the giant functions which are
just copy/paste of some other ones with just a few line changes,
removing unnecessary 'goto' etc.
The MS Windows version is broken with this commit but will be fixed
soon. Everything can't be done all at once :P
The commands are now hierarchical, for example:
"hf 14a read" vs. "hf 14b read".
You can also request help:
"hf help", "data help", "hf 15 help" etc.
Indents are now space-based, not tab-based anymore. Hopefully
no one will be trolling about it, considering the suicide-prone work
being done here ;)
client/cmdhw.c, client/proxusb.c, client/cmdhw.h, client/proxusb.h,
client/cmdmain.c, client/cmdlfhid.c, client/cmdmain.h, client/cmdlfhid.h,
client/data.c, client/data.h, client/cmdhf.c, client/cmdlf.c,
client/cmdhf.h, client/cmdhf15.c, client/cmdhf14b.c, client/cmdlf.h,
client/cmdhf15.h, client/cmdhf14b.h, client/cmddata.c, client/cmddata.h,
client/ui.c, client/cmdparser.c, client/cmdlfti.c, client/ui.h,
client/cmdlfem4x.c, client/cmdparser.h, client/cmdlfti.h, client/cmdlfem4x.h,
client/graph.c, client/graph.h, client/cmdhf14a.c, client/cmdhf14a.h,
client/cmdhflegic.c, client/cmdhflegic.c: New files.
client/cli.c, client/flasher.c, client/snooper.c, client/proxmark3.c,
client/proxmark3.h, client/Makefile: Update accordingly.
client/flash.h, client/flash.c, client/proxgui.cpp: Cosmetic changes.
client/translate.h, client/command.c, client/gui.c,
client/usb.c, client/prox.h: Remove.
include/usb_cmd.h (CMD_ACQUIRE_RAW_ADC_SAMPLES_ISO_14443_SIM): Remove dead cmd.
common/crc16.h: New file.
common/crc16.c: Modify accordingly.
common/iso14443crc.h: New file.
common/iso14443_crc.c: Rename to
common/iso14443crc.c: and modify accordingly.
armsrc/lfops.c, armsrc/iso14443.c,
armsrc/iso14443a.c: include .h files from
the common directory instead of including the c files.
common/Makefile.common, armsrc/Makefile: Modify accordingly.
2010-02-04 09:27:07 +08:00
|
|
|
};
|
|
|
|
|
2019-03-10 18:20:22 +08:00
|
|
|
int CmdHF14B(const char *Cmd) {
|
2019-03-10 06:35:06 +08:00
|
|
|
clearCommandBuffer();
|
|
|
|
CmdsParse(CommandTable, Cmd);
|
|
|
|
return 0;
|
Client cleanup and restructuring. Stage 1...
Next Step is refactoring some of the giant functions which are
just copy/paste of some other ones with just a few line changes,
removing unnecessary 'goto' etc.
The MS Windows version is broken with this commit but will be fixed
soon. Everything can't be done all at once :P
The commands are now hierarchical, for example:
"hf 14a read" vs. "hf 14b read".
You can also request help:
"hf help", "data help", "hf 15 help" etc.
Indents are now space-based, not tab-based anymore. Hopefully
no one will be trolling about it, considering the suicide-prone work
being done here ;)
client/cmdhw.c, client/proxusb.c, client/cmdhw.h, client/proxusb.h,
client/cmdmain.c, client/cmdlfhid.c, client/cmdmain.h, client/cmdlfhid.h,
client/data.c, client/data.h, client/cmdhf.c, client/cmdlf.c,
client/cmdhf.h, client/cmdhf15.c, client/cmdhf14b.c, client/cmdlf.h,
client/cmdhf15.h, client/cmdhf14b.h, client/cmddata.c, client/cmddata.h,
client/ui.c, client/cmdparser.c, client/cmdlfti.c, client/ui.h,
client/cmdlfem4x.c, client/cmdparser.h, client/cmdlfti.h, client/cmdlfem4x.h,
client/graph.c, client/graph.h, client/cmdhf14a.c, client/cmdhf14a.h,
client/cmdhflegic.c, client/cmdhflegic.c: New files.
client/cli.c, client/flasher.c, client/snooper.c, client/proxmark3.c,
client/proxmark3.h, client/Makefile: Update accordingly.
client/flash.h, client/flash.c, client/proxgui.cpp: Cosmetic changes.
client/translate.h, client/command.c, client/gui.c,
client/usb.c, client/prox.h: Remove.
include/usb_cmd.h (CMD_ACQUIRE_RAW_ADC_SAMPLES_ISO_14443_SIM): Remove dead cmd.
common/crc16.h: New file.
common/crc16.c: Modify accordingly.
common/iso14443crc.h: New file.
common/iso14443_crc.c: Rename to
common/iso14443crc.c: and modify accordingly.
armsrc/lfops.c, armsrc/iso14443.c,
armsrc/iso14443a.c: include .h files from
the common directory instead of including the c files.
common/Makefile.common, armsrc/Makefile: Modify accordingly.
2010-02-04 09:27:07 +08:00
|
|
|
}
|
|
|
|
|
2019-03-10 18:20:22 +08:00
|
|
|
int CmdHelp(const char *Cmd) {
|
2019-03-10 06:35:06 +08:00
|
|
|
CmdsHelp(CommandTable);
|
|
|
|
return 0;
|
Client cleanup and restructuring. Stage 1...
Next Step is refactoring some of the giant functions which are
just copy/paste of some other ones with just a few line changes,
removing unnecessary 'goto' etc.
The MS Windows version is broken with this commit but will be fixed
soon. Everything can't be done all at once :P
The commands are now hierarchical, for example:
"hf 14a read" vs. "hf 14b read".
You can also request help:
"hf help", "data help", "hf 15 help" etc.
Indents are now space-based, not tab-based anymore. Hopefully
no one will be trolling about it, considering the suicide-prone work
being done here ;)
client/cmdhw.c, client/proxusb.c, client/cmdhw.h, client/proxusb.h,
client/cmdmain.c, client/cmdlfhid.c, client/cmdmain.h, client/cmdlfhid.h,
client/data.c, client/data.h, client/cmdhf.c, client/cmdlf.c,
client/cmdhf.h, client/cmdhf15.c, client/cmdhf14b.c, client/cmdlf.h,
client/cmdhf15.h, client/cmdhf14b.h, client/cmddata.c, client/cmddata.h,
client/ui.c, client/cmdparser.c, client/cmdlfti.c, client/ui.h,
client/cmdlfem4x.c, client/cmdparser.h, client/cmdlfti.h, client/cmdlfem4x.h,
client/graph.c, client/graph.h, client/cmdhf14a.c, client/cmdhf14a.h,
client/cmdhflegic.c, client/cmdhflegic.c: New files.
client/cli.c, client/flasher.c, client/snooper.c, client/proxmark3.c,
client/proxmark3.h, client/Makefile: Update accordingly.
client/flash.h, client/flash.c, client/proxgui.cpp: Cosmetic changes.
client/translate.h, client/command.c, client/gui.c,
client/usb.c, client/prox.h: Remove.
include/usb_cmd.h (CMD_ACQUIRE_RAW_ADC_SAMPLES_ISO_14443_SIM): Remove dead cmd.
common/crc16.h: New file.
common/crc16.c: Modify accordingly.
common/iso14443crc.h: New file.
common/iso14443_crc.c: Rename to
common/iso14443crc.c: and modify accordingly.
armsrc/lfops.c, armsrc/iso14443.c,
armsrc/iso14443a.c: include .h files from
the common directory instead of including the c files.
common/Makefile.common, armsrc/Makefile: Modify accordingly.
2010-02-04 09:27:07 +08:00
|
|
|
}
|