mirror of
https://github.com/RfidResearchGroup/proxmark3.git
synced 2025-08-14 02:27:26 -07:00
ADD: @marshmellow42 fudan detection in hf mfu
ADD: @marshmellow42 14b reader changes. ADD: @pwpiwi 14b fixes
This commit is contained in:
iceman1001
parent
569009f3f7
commit
22e2470051
14 changed files with 349 additions and 515 deletions
|
|
@ -23,129 +23,9 @@
|
|||
#include "cmdhf14b.h"
|
||||
#include "cmdmain.h"
|
||||
#include "cmdhf14a.h"
|
||||
//#include "sleep.h"
|
||||
#include "cmddata.h"
|
||||
|
||||
static int CmdHelp(const char *Cmd);
|
||||
|
||||
int CmdHF14BDemod(const char *Cmd)
|
||||
{
|
||||
int i, j, iold;
|
||||
int isum, qsum;
|
||||
int outOfWeakAt;
|
||||
bool negateI, negateQ;
|
||||
|
||||
uint8_t data[256];
|
||||
int dataLen = 0;
|
||||
|
||||
// As received, the samples are pairs, correlations against I and Q
|
||||
// square waves. So estimate angle of initial carrier (or just
|
||||
// quadrant, actually), and then do the demod.
|
||||
|
||||
// First, estimate where the tag starts modulating.
|
||||
for (i = 0; i < GraphTraceLen; i += 2) {
|
||||
if (abs(GraphBuffer[i]) + abs(GraphBuffer[i + 1]) > 40) {
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (i >= GraphTraceLen) {
|
||||
PrintAndLog("too weak to sync");
|
||||
return 0;
|
||||
}
|
||||
PrintAndLog("out of weak at %d", i);
|
||||
outOfWeakAt = i;
|
||||
|
||||
// Now, estimate the phase in the initial modulation of the tag
|
||||
isum = 0;
|
||||
qsum = 0;
|
||||
for (; i < (outOfWeakAt + 16); i += 2) {
|
||||
isum += GraphBuffer[i + 0];
|
||||
qsum += GraphBuffer[i + 1];
|
||||
}
|
||||
negateI = (isum < 0);
|
||||
negateQ = (qsum < 0);
|
||||
|
||||
// Turn the correlation pairs into soft decisions on the bit.
|
||||
j = 0;
|
||||
for (i = 0; i < GraphTraceLen / 2; i++) {
|
||||
int si = GraphBuffer[j];
|
||||
int sq = GraphBuffer[j + 1];
|
||||
if (negateI) si = -si;
|
||||
if (negateQ) sq = -sq;
|
||||
GraphBuffer[i] = si + sq;
|
||||
j += 2;
|
||||
}
|
||||
GraphTraceLen = i;
|
||||
|
||||
i = outOfWeakAt / 2;
|
||||
while (GraphBuffer[i] > 0 && i < GraphTraceLen)
|
||||
i++;
|
||||
if (i >= GraphTraceLen) goto demodError;
|
||||
|
||||
iold = i;
|
||||
while (GraphBuffer[i] < 0 && i < GraphTraceLen)
|
||||
i++;
|
||||
if (i >= GraphTraceLen) goto demodError;
|
||||
if ((i - iold) > 23) goto demodError;
|
||||
|
||||
PrintAndLog("make it to demod loop");
|
||||
|
||||
for (;;) {
|
||||
iold = i;
|
||||
while (GraphBuffer[i] >= 0 && i < GraphTraceLen)
|
||||
i++;
|
||||
if (i >= GraphTraceLen) goto demodError;
|
||||
if ((i - iold) > 6) goto demodError;
|
||||
|
||||
uint16_t shiftReg = 0;
|
||||
if (i + 20 >= GraphTraceLen) goto demodError;
|
||||
|
||||
for (j = 0; j < 10; j++) {
|
||||
int soft = GraphBuffer[i] + GraphBuffer[i + 1];
|
||||
|
||||
if (abs(soft) < (abs(isum) + abs(qsum)) / 20) {
|
||||
PrintAndLog("weak bit");
|
||||
}
|
||||
|
||||
shiftReg >>= 1;
|
||||
if(GraphBuffer[i] + GraphBuffer[i+1] >= 0) {
|
||||
shiftReg |= 0x200;
|
||||
}
|
||||
|
||||
i+= 2;
|
||||
}
|
||||
|
||||
if ((shiftReg & 0x200) && !(shiftReg & 0x001))
|
||||
{
|
||||
// valid data byte, start and stop bits okay
|
||||
PrintAndLog(" %02x", (shiftReg >> 1) & 0xff);
|
||||
data[dataLen++] = (shiftReg >> 1) & 0xff;
|
||||
if (dataLen >= sizeof(data)) {
|
||||
return 0;
|
||||
}
|
||||
} else if (shiftReg == 0x000) {
|
||||
// this is EOF
|
||||
break;
|
||||
} else {
|
||||
goto demodError;
|
||||
}
|
||||
}
|
||||
|
||||
uint8_t first, second;
|
||||
ComputeCrc14443(CRC_14443_B, data, dataLen-2, &first, &second);
|
||||
PrintAndLog("CRC: %02x %02x (%s)\n", first, second,
|
||||
(first == data[dataLen-2] && second == data[dataLen-1]) ?
|
||||
"ok" : "****FAIL****");
|
||||
|
||||
RepaintGraphWindow();
|
||||
return 0;
|
||||
|
||||
demodError:
|
||||
PrintAndLog("demod error");
|
||||
RepaintGraphWindow();
|
||||
return 0;
|
||||
}
|
||||
|
||||
int CmdHF14BList(const char *Cmd)
|
||||
{
|
||||
PrintAndLog("Deprecated command, use 'hf list 14b' instead");
|
||||
|
|
@ -153,28 +33,20 @@ int CmdHF14BList(const char *Cmd)
|
|||
return 0;
|
||||
}
|
||||
|
||||
int CmdHF14Sim(const char *Cmd)
|
||||
int CmdHF14BSim(const char *Cmd)
|
||||
{
|
||||
UsbCommand c={CMD_SIMULATE_TAG_ISO_14443};
|
||||
UsbCommand c={CMD_SIMULATE_TAG_ISO_14443B};
|
||||
clearCommandBuffer();
|
||||
SendCommand(&c);
|
||||
return 0;
|
||||
}
|
||||
|
||||
int CmdHFSimlisten(const char *Cmd)
|
||||
{
|
||||
UsbCommand c = {CMD_SIMULATE_TAG_HF_LISTEN};
|
||||
clearCommandBuffer();
|
||||
SendCommand(&c);
|
||||
return 0;
|
||||
SendCommand(&c);
|
||||
return 0;
|
||||
}
|
||||
|
||||
int CmdHF14BSnoop(const char *Cmd)
|
||||
{
|
||||
UsbCommand c = {CMD_SNOOP_ISO_14443};
|
||||
UsbCommand c = {CMD_SNOOP_ISO_14443B};
|
||||
clearCommandBuffer();
|
||||
SendCommand(&c);
|
||||
return 0;
|
||||
SendCommand(&c);
|
||||
return 0;
|
||||
}
|
||||
|
||||
/* New command to read the contents of a SRI512 tag
|
||||
|
|
@ -183,10 +55,10 @@ int CmdHF14BSnoop(const char *Cmd)
|
|||
*/
|
||||
int CmdSri512Read(const char *Cmd)
|
||||
{
|
||||
UsbCommand c = {CMD_READ_SRI512_TAG, {strtol(Cmd, NULL, 0), 0, 0}};
|
||||
UsbCommand c = {CMD_READ_SRI512_TAG, {strtol(Cmd, NULL, 0), 0, 0}};
|
||||
clearCommandBuffer();
|
||||
SendCommand(&c);
|
||||
return 0;
|
||||
SendCommand(&c);
|
||||
return 0;
|
||||
}
|
||||
|
||||
/* New command to read the contents of a SRIX4K tag
|
||||
|
|
@ -195,14 +67,14 @@ int CmdSri512Read(const char *Cmd)
|
|||
*/
|
||||
int CmdSrix4kRead(const char *Cmd)
|
||||
{
|
||||
UsbCommand c = {CMD_READ_SRIX4K_TAG, {strtol(Cmd, NULL, 0), 0, 0}};
|
||||
UsbCommand c = {CMD_READ_SRIX4K_TAG, {strtol(Cmd, NULL, 0), 0, 0}};
|
||||
clearCommandBuffer();
|
||||
SendCommand(&c);
|
||||
return 0;
|
||||
SendCommand(&c);
|
||||
return 0;
|
||||
}
|
||||
|
||||
int rawClose(void){
|
||||
UsbCommand resp;
|
||||
UsbCommand resp;
|
||||
UsbCommand c = {CMD_ISO_14443B_COMMAND, {0, 0, 0}};
|
||||
clearCommandBuffer();
|
||||
SendCommand(&c);
|
||||
|
|
@ -212,54 +84,54 @@ int rawClose(void){
|
|||
return 0;
|
||||
}
|
||||
|
||||
int HF14BCmdRaw(bool reply, bool *crc, uint8_t power_trace, uint8_t *data, uint8_t *datalen, bool verbose){
|
||||
int HF14BCmdRaw(bool reply, bool *crc, bool power, uint8_t *data, uint8_t *datalen, bool verbose){
|
||||
UsbCommand resp;
|
||||
UsbCommand c = {CMD_ISO_14443B_COMMAND, {0, 0, 0}}; // len,recv,power/trace
|
||||
if(*crc)
|
||||
{
|
||||
uint8_t first, second;
|
||||
ComputeCrc14443(CRC_14443_B, data, *datalen, &first, &second);
|
||||
data[*datalen] = first;
|
||||
data[*datalen + 1] = second;
|
||||
*datalen += 2;
|
||||
}
|
||||
|
||||
c.arg[0] = *datalen;
|
||||
c.arg[1] = reply;
|
||||
c.arg[2] = power_trace;
|
||||
memcpy(c.d.asBytes,data,*datalen);
|
||||
UsbCommand c = {CMD_ISO_14443B_COMMAND, {0, 0, 0}}; // len,recv,power
|
||||
if(*crc)
|
||||
{
|
||||
uint8_t first, second;
|
||||
ComputeCrc14443(CRC_14443_B, data, *datalen, &first, &second);
|
||||
data[*datalen] = first;
|
||||
data[*datalen + 1] = second;
|
||||
*datalen += 2;
|
||||
}
|
||||
|
||||
c.arg[0] = *datalen;
|
||||
c.arg[1] = reply;
|
||||
c.arg[2] = power;
|
||||
memcpy(c.d.asBytes,data,*datalen);
|
||||
clearCommandBuffer();
|
||||
SendCommand(&c);
|
||||
|
||||
if (!reply) return 1;
|
||||
SendCommand(&c);
|
||||
|
||||
if (!WaitForResponseTimeout(CMD_ACK,&resp,1000)) {
|
||||
if (verbose) PrintAndLog("timeout while waiting for reply.");
|
||||
return 0;
|
||||
}
|
||||
*datalen = resp.arg[0];
|
||||
if (verbose) PrintAndLog("received %u octets", *datalen);
|
||||
if(*datalen<2) return 0;
|
||||
if (!reply) return 1;
|
||||
|
||||
memcpy(data, resp.d.asBytes, *datalen);
|
||||
if (verbose) PrintAndLog("%s", sprint_hex(data, *datalen));
|
||||
if (!WaitForResponseTimeout(CMD_ACK,&resp,1000)) {
|
||||
if (verbose) PrintAndLog("timeout while waiting for reply.");
|
||||
return 0;
|
||||
}
|
||||
*datalen = resp.arg[0];
|
||||
if (verbose) PrintAndLog("received %u octets", *datalen);
|
||||
if(*datalen<2) return 0;
|
||||
|
||||
uint8_t first, second;
|
||||
ComputeCrc14443(CRC_14443_B, data, *datalen-2, &first, &second);
|
||||
if(data[*datalen-2] == first && data[*datalen-1] == second) {
|
||||
if (verbose) PrintAndLog("CRC OK");
|
||||
*crc = true;
|
||||
} else {
|
||||
if (verbose) PrintAndLog("CRC failed");
|
||||
*crc = false;
|
||||
}
|
||||
return 1;
|
||||
memcpy(data, resp.d.asBytes, *datalen);
|
||||
if (verbose) PrintAndLog("%s", sprint_hex(data, *datalen));
|
||||
|
||||
uint8_t first, second;
|
||||
ComputeCrc14443(CRC_14443_B, data, *datalen-2, &first, &second);
|
||||
if(data[*datalen-2] == first && data[*datalen-1] == second) {
|
||||
if (verbose) PrintAndLog("CRC OK");
|
||||
*crc = true;
|
||||
} else {
|
||||
if (verbose) PrintAndLog("CRC failed");
|
||||
*crc = false;
|
||||
}
|
||||
return 1;
|
||||
}
|
||||
|
||||
int CmdHF14BCmdRaw (const char *Cmd) {
|
||||
bool reply = true;
|
||||
bool crc = false;
|
||||
uint8_t power_trace = 0;
|
||||
bool power = false;
|
||||
char buf[5]="";
|
||||
uint8_t data[100] = {0x00};
|
||||
uint8_t datalen = 0;
|
||||
|
|
@ -290,7 +162,7 @@ int CmdHF14BCmdRaw (const char *Cmd) {
|
|||
break;
|
||||
case 'p':
|
||||
case 'P':
|
||||
power_trace |= 1;
|
||||
power = true;
|
||||
break;
|
||||
default:
|
||||
PrintAndLog("Invalid option");
|
||||
|
|
@ -322,55 +194,41 @@ int CmdHF14BCmdRaw (const char *Cmd) {
|
|||
return 0;
|
||||
}
|
||||
|
||||
return HF14BCmdRaw(reply, &crc, power_trace, data, &datalen, true);
|
||||
return HF14BCmdRaw(reply, &crc, power, data, &datalen, true);
|
||||
}
|
||||
|
||||
static void print_atqb_resp(uint8_t *data){
|
||||
PrintAndLog (" UID: %s", sprint_hex(data+1,4));
|
||||
PrintAndLog (" App Data: %s", sprint_hex(data+5,4));
|
||||
PrintAndLog (" Protocol: %s", sprint_hex(data+9,3));
|
||||
uint8_t BitRate = data[9];
|
||||
if (!BitRate)
|
||||
PrintAndLog (" Bit Rate: 106 kbit/s only PICC <-> PCD");
|
||||
if (BitRate & 0x10)
|
||||
PrintAndLog (" Bit Rate: 212 kbit/s PICC -> PCD supported");
|
||||
if (BitRate & 0x20)
|
||||
PrintAndLog (" Bit Rate: 424 kbit/s PICC -> PCD supported");
|
||||
if (BitRate & 0x40)
|
||||
PrintAndLog (" Bit Rate: 847 kbit/s PICC -> PCD supported");
|
||||
if (BitRate & 0x01)
|
||||
PrintAndLog (" Bit Rate: 212 kbit/s PICC <- PCD supported");
|
||||
if (BitRate & 0x02)
|
||||
PrintAndLog (" Bit Rate: 424 kbit/s PICC <- PCD supported");
|
||||
if (BitRate & 0x04)
|
||||
PrintAndLog (" Bit Rate: 847 kbit/s PICC <- PCD supported");
|
||||
if (BitRate & 0x80)
|
||||
PrintAndLog (" Same bit rate <-> required");
|
||||
PrintAndLog (" UID: %s", sprint_hex(data+1,4));
|
||||
PrintAndLog (" App Data: %s", sprint_hex(data+5,4));
|
||||
PrintAndLog (" Protocol: %s", sprint_hex(data+9,3));
|
||||
uint8_t BitRate = data[9];
|
||||
if (!BitRate) PrintAndLog (" Bit Rate: 106 kbit/s only PICC <-> PCD");
|
||||
if (BitRate & 0x10) PrintAndLog (" Bit Rate: 212 kbit/s PICC -> PCD supported");
|
||||
if (BitRate & 0x20) PrintAndLog (" Bit Rate: 424 kbit/s PICC -> PCD supported");
|
||||
if (BitRate & 0x40) PrintAndLog (" Bit Rate: 847 kbit/s PICC -> PCD supported");
|
||||
if (BitRate & 0x01) PrintAndLog (" Bit Rate: 212 kbit/s PICC <- PCD supported");
|
||||
if (BitRate & 0x02) PrintAndLog (" Bit Rate: 424 kbit/s PICC <- PCD supported");
|
||||
if (BitRate & 0x04) PrintAndLog (" Bit Rate: 847 kbit/s PICC <- PCD supported");
|
||||
if (BitRate & 0x80) PrintAndLog (" Same bit rate <-> required");
|
||||
|
||||
uint16_t maxFrame = data[10]>>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;
|
||||
uint16_t maxFrame = data[10]>>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;
|
||||
|
||||
PrintAndLog ("Max Frame Size: %d%s",maxFrame, (maxFrame == 257) ? "+ RFU" : "");
|
||||
PrintAndLog ("Max Frame Size: %d%s", maxFrame, (maxFrame == 257) ? "+ RFU" : "");
|
||||
|
||||
uint8_t protocolT = data[10] & 0xF;
|
||||
PrintAndLog (" Protocol Type: Protocol is %scompliant with ISO/IEC 14443-4",(protocolT) ? "" : "not " );
|
||||
PrintAndLog ("Frame Wait Int: %d", data[11]>>4);
|
||||
PrintAndLog (" App Data Code: Application is %s",(data[11]&4) ? "Standard" : "Proprietary");
|
||||
PrintAndLog (" Frame Options: NAD is %ssupported",(data[11]&2) ? "" : "not ");
|
||||
PrintAndLog (" Frame Options: CID is %ssupported",(data[11]&1) ? "" : "not ");
|
||||
|
||||
return;
|
||||
uint8_t protocolT = data[10] & 0xF;
|
||||
PrintAndLog (" Protocol Type: Protocol is %scompliant with ISO/IEC 14443-4",(protocolT) ? "" : "not " );
|
||||
PrintAndLog ("Frame Wait Int: %d", data[11]>>4);
|
||||
PrintAndLog (" App Data Code: Application is %s",(data[11]&4) ? "Standard" : "Proprietary");
|
||||
PrintAndLog (" Frame Options: NAD is %ssupported",(data[11]&2) ? "" : "not ");
|
||||
PrintAndLog (" Frame Options: CID is %ssupported",(data[11]&1) ? "" : "not ");
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
char *get_ST_Chip_Model(uint8_t data){
|
||||
|
|
@ -393,79 +251,149 @@ char *get_ST_Chip_Model(uint8_t data){
|
|||
|
||||
static void print_st_info(uint8_t *data){
|
||||
//uid = first 8 bytes in data
|
||||
PrintAndLog(" UID: %s", sprint_hex(data,8));
|
||||
PrintAndLog(" MFG: %02X, %s", data[1], getTagInfo(data[1]));
|
||||
PrintAndLog("Chip: %02X, %s", data[2]>>2, get_ST_Chip_Model(data[2]>>2));
|
||||
PrintAndLog(" UID: %s", sprint_hex(SwapEndian64(data,8,8),8));
|
||||
PrintAndLog(" MFG: %02X, %s", data[6], getTagInfo(data[6]));
|
||||
PrintAndLog("Chip: %02X, %s", data[5]>>2, get_ST_Chip_Model(data[5]>>2));
|
||||
return;
|
||||
}
|
||||
|
||||
int HF14BStdRead(uint8_t *data, uint8_t *datalen){
|
||||
bool crc = true;
|
||||
*datalen = 3;
|
||||
//std read cmd
|
||||
data[0] = 0x05;
|
||||
data[1] = 0x00;
|
||||
data[2] = 0x08;
|
||||
int HF14BStdReader(uint8_t *data, uint8_t *datalen){
|
||||
|
||||
if (HF14BCmdRaw(true, &crc, 0, data, datalen, false)==0) return 0;
|
||||
//05 00 00 = find one tag in field
|
||||
//1d xx xx xx xx 20 00 08 01 00 = attrib xx=crc
|
||||
//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])
|
||||
//b2 = ? (resp a3 [e9 67])
|
||||
bool crc = true;
|
||||
*datalen = 3;
|
||||
//std read cmd
|
||||
data[0] = 0x05;
|
||||
data[1] = 0x00;
|
||||
data[2] = 0x00;
|
||||
|
||||
if (HF14BCmdRaw(true, &crc, false, data, datalen, false)==0) return 0;
|
||||
|
||||
if (data[0] != 0x50 || *datalen != 14 || !crc) return 0;
|
||||
|
||||
PrintAndLog ("\n14443-3b tag found:");
|
||||
print_atqb_resp(data);
|
||||
PrintAndLog ("\n14443-3b tag found:");
|
||||
print_atqb_resp(data);
|
||||
|
||||
return 1;
|
||||
}
|
||||
return 1;
|
||||
}
|
||||
|
||||
int HF14B_ST_Read(uint8_t *data, uint8_t *datalen){
|
||||
bool crc = true;
|
||||
*datalen = 2;
|
||||
int HF14B_ST_Reader(uint8_t *data, uint8_t *datalen){
|
||||
bool crc = true;
|
||||
*datalen = 2;
|
||||
//wake cmd
|
||||
data[0] = 0x06;
|
||||
data[1] = 0x00;
|
||||
data[0] = 0x06;
|
||||
data[1] = 0x00;
|
||||
|
||||
//leave power on
|
||||
// verbose on for now for testing - turn off when functional
|
||||
if (HF14BCmdRaw(true, &crc, 1, data, datalen, true)==0) return rawClose();
|
||||
if (HF14BCmdRaw(true, &crc, true, data, datalen, false)==0) return rawClose();
|
||||
|
||||
if (*datalen != 3 || !crc) return rawClose();
|
||||
|
||||
uint8_t chipID = data[0];
|
||||
uint8_t chipID = data[0];
|
||||
// select
|
||||
data[0] = 0x0E;
|
||||
data[1] = chipID;
|
||||
*datalen = 2;
|
||||
data[0] = 0x0E;
|
||||
data[1] = chipID;
|
||||
*datalen = 2;
|
||||
|
||||
//leave power on
|
||||
// verbose on for now for testing - turn off when functional
|
||||
if (HF14BCmdRaw(true, &crc, 1, data, datalen, true)==0) return rawClose();
|
||||
if (HF14BCmdRaw(true, &crc, true, data, datalen, false)==0) return rawClose();
|
||||
|
||||
if (*datalen != 3 || !crc || data[0] != chipID) return rawClose();
|
||||
|
||||
// get uid
|
||||
data[0] = 0x0B;
|
||||
*datalen = 1;
|
||||
data[0] = 0x0B;
|
||||
*datalen = 1;
|
||||
|
||||
//power off
|
||||
// verbose on for now for testing - turn off when functional
|
||||
if (HF14BCmdRaw(true, &crc, 1, data, datalen, true)==0) return 0;
|
||||
if (HF14BCmdRaw(true, &crc, true, data, datalen, false)==0) return 0;
|
||||
rawClose();
|
||||
if (*datalen != 10 || !crc) return 0;
|
||||
|
||||
PrintAndLog("\n14443-3b ST tag found:");
|
||||
print_st_info(data);
|
||||
return 1;
|
||||
return 1;
|
||||
}
|
||||
|
||||
// test for other 14b type tags (mimic another reader - don't have tags to identify)
|
||||
int HF14B_Other_Reader(uint8_t *data, uint8_t *datalen){
|
||||
bool crc = true;
|
||||
*datalen = 4;
|
||||
//std read cmd
|
||||
data[0] = 0x00;
|
||||
data[1] = 0x0b;
|
||||
data[2] = 0x3f;
|
||||
data[3] = 0x80;
|
||||
|
||||
if (HF14BCmdRaw(true, &crc, false, data, datalen, false)!=0) {
|
||||
if (*datalen > 2 || !crc) {
|
||||
PrintAndLog ("\n14443-3b tag found:");
|
||||
PrintAndLog ("Unknown tag type answered to a 0x000b3f80 command ans:");
|
||||
PrintAndLog ("%s",sprint_hex(data,*datalen));
|
||||
return 1;
|
||||
}
|
||||
}
|
||||
|
||||
crc = false;
|
||||
*datalen = 1;
|
||||
data[0] = 0x0a;
|
||||
|
||||
if (HF14BCmdRaw(true, &crc, false, data, datalen, false)!=0) {
|
||||
if (*datalen > 0) {
|
||||
PrintAndLog ("\n14443-3b tag found:");
|
||||
PrintAndLog ("Unknown tag type answered to a 0x0A command ans:");
|
||||
PrintAndLog ("%s",sprint_hex(data,*datalen));
|
||||
return 1;
|
||||
}
|
||||
}
|
||||
|
||||
crc = false;
|
||||
*datalen = 1;
|
||||
data[0] = 0x0c;
|
||||
|
||||
if (HF14BCmdRaw(true, &crc, false, data, datalen, false)!=0) {
|
||||
if (*datalen > 0) {
|
||||
PrintAndLog ("\n14443-3b tag found:");
|
||||
PrintAndLog ("Unknown tag type answered to a 0x0C command ans:");
|
||||
PrintAndLog ("%s",sprint_hex(data,*datalen));
|
||||
return 1;
|
||||
}
|
||||
}
|
||||
|
||||
return 0;
|
||||
|
||||
}
|
||||
|
||||
int HF14BReader(bool verbose){
|
||||
uint8_t data[100];
|
||||
uint8_t datalen = 5;
|
||||
|
||||
// try std 14b (atqb)
|
||||
if (HF14BStdRead(data, &datalen)) return 1;
|
||||
uint8_t data[100];
|
||||
uint8_t datalen = 5;
|
||||
|
||||
// try st 14b
|
||||
if (HF14B_ST_Read(data, &datalen)) return 1;
|
||||
// try std 14b (atqb)
|
||||
if (HF14BStdReader(data, &datalen)) return 1;
|
||||
|
||||
// try st 14b
|
||||
if (HF14B_ST_Reader(data, &datalen)) return 1;
|
||||
|
||||
// try unknown 14b read commands (to be identified later)
|
||||
// could be read of calypso, CEPAS, moneo, or pico pass.
|
||||
if (HF14B_Other_Reader(data, &datalen)) return 1;
|
||||
|
||||
if (verbose) PrintAndLog("no 14443B tag found");
|
||||
return 0;
|
||||
|
|
@ -475,19 +403,6 @@ int CmdHF14BReader(const char *Cmd){
|
|||
return HF14BReader(true);
|
||||
}
|
||||
|
||||
int CmdHFRawSamples(const char *Cmd){
|
||||
UsbCommand resp;
|
||||
UsbCommand c = {CMD_ACQUIRE_RAW_ADC_SAMPLES_ISO_14443, {strtol(Cmd,NULL,0), 0, 0}};
|
||||
SendCommand(&c);
|
||||
|
||||
if (!WaitForResponseTimeout(CMD_ACK,&resp,1000)) {
|
||||
PrintAndLog("timeout while waiting for reply.");
|
||||
return 0;
|
||||
}
|
||||
getSamples("39999", true);
|
||||
return 1;
|
||||
}
|
||||
|
||||
int CmdHF14BWrite( const char *Cmd){
|
||||
/*
|
||||
* For SRIX4K blocks 00 - 7F
|
||||
|
|
@ -557,29 +472,27 @@ int CmdHF14BWrite( const char *Cmd){
|
|||
|
||||
static command_t CommandTable[] =
|
||||
{
|
||||
{"help", CmdHelp, 1, "This help"},
|
||||
{"demod", CmdHF14BDemod, 1, "Demodulate ISO14443 Type B from tag"},
|
||||
{"getsamples", CmdHFRawSamples,0, "[atqb=0 or ST=1] Send wake cmd and Get raw HF samples to GraphBuffer"},
|
||||
{"list", CmdHF14BList, 0, "[Deprecated] List ISO 14443b history"},
|
||||
{"reader", CmdHF14BReader, 0, "Find 14b tag (HF ISO 14443b)"},
|
||||
{"sim", CmdHF14Sim, 0, "Fake ISO 14443 tag"},
|
||||
{"simlisten", CmdHFSimlisten, 0, "Get HF samples as fake tag"},
|
||||
{"snoop", CmdHF14BSnoop, 0, "Eavesdrop ISO 14443"},
|
||||
{"sri512read", CmdSri512Read, 0, "Read contents of a SRI512 tag"},
|
||||
{"srix4kread", CmdSrix4kRead, 0, "Read contents of a SRIX4K tag"},
|
||||
{"raw", CmdHF14BCmdRaw, 0, "Send raw hex data to tag"},
|
||||
{"write", CmdHF14BWrite, 0, "Write data to a SRI512 | SRIX4K tag"},
|
||||
{NULL, NULL, 0, NULL}
|
||||
{"help", CmdHelp, 1, "This help"},
|
||||
{"list", CmdHF14BList, 0, "[Deprecated] List ISO 14443b history"},
|
||||
{"reader", CmdHF14BReader, 0, "Find 14b tag (HF ISO 14443b)"},
|
||||
{"sim", CmdHF14BSim, 0, "Fake ISO 14443B tag"},
|
||||
|
||||
{"snoop", CmdHF14BSnoop, 0, "Eavesdrop ISO 14443B"},
|
||||
{"sri512read", CmdSri512Read, 0, "Read contents of a SRI512 tag"},
|
||||
{"srix4kread", CmdSrix4kRead, 0, "Read contents of a SRIX4K tag"},
|
||||
{"raw", CmdHF14BCmdRaw, 0, "Send raw hex data to tag"},
|
||||
{"write", CmdHF14BWrite, 0, "Write data to a SRI512 | SRIX4K tag"},
|
||||
{NULL, NULL, 0, NULL}
|
||||
};
|
||||
|
||||
int CmdHF14B(const char *Cmd)
|
||||
{
|
||||
CmdsParse(CommandTable, Cmd);
|
||||
return 0;
|
||||
CmdsParse(CommandTable, Cmd);
|
||||
return 0;
|
||||
}
|
||||
|
||||
int CmdHelp(const char *Cmd)
|
||||
{
|
||||
CmdsHelp(CommandTable);
|
||||
return 0;
|
||||
CmdsHelp(CommandTable);
|
||||
return 0;
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue