mirror of
https://github.com/Proxmark/proxmark3.git
synced 2025-08-19 04:49:38 -07:00
small fixes to 14b info, added 14b sim cmds
This commit is contained in:
marshmellow42
parent
5f605b8fc8
commit
f3b83bee83
2 changed files with 75 additions and 19 deletions
|
|
@ -321,10 +321,16 @@ static int GetIso14443bCommandFromReader(uint8_t *received, uint16_t *len)
|
|||
//-----------------------------------------------------------------------------
|
||||
void SimulateIso14443bTag(void)
|
||||
{
|
||||
// the only commands we understand is REQB, AFI=0, Select All, N=0:
|
||||
static const uint8_t cmd1[] = { 0x05, 0x00, 0x08, 0x39, 0x73 };
|
||||
// the only commands we understand is REQB, AFI=0, Select All, N=8:
|
||||
static const uint8_t cmd1[] = { 0x05, 0x00, 0x08, 0x39, 0x73 }; // REQB
|
||||
// ... and REQB, AFI=0, Normal Request, N=0:
|
||||
static const uint8_t cmd2[] = { 0x05, 0x00, 0x00, 0x71, 0xFF };
|
||||
static const uint8_t cmd2[] = { 0x05, 0x00, 0x00, 0x71, 0xFF }; // REQB
|
||||
// ... and WUPB, AFI=0, N=8:
|
||||
static const uint8_t cmd3[] = { 0x05, 0x08, 0x08, 0xF9, 0xBD }; // WUPB
|
||||
// ... and HLTB
|
||||
static const uint8_t cmd4[] = { 0x50, 0xff, 0xff, 0xff, 0xff }; // HLTB
|
||||
// ... and ATTRIB
|
||||
static const uint8_t cmd5[] = { 0x1D, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff}; // ATTRIB
|
||||
|
||||
// ... and we always respond with ATQB, PUPI = 820de174, Application Data = 0x20381922,
|
||||
// supports only 106kBit/s in both directions, max frame size = 32Bytes,
|
||||
|
|
@ -333,6 +339,9 @@ void SimulateIso14443bTag(void)
|
|||
0x50, 0x82, 0x0d, 0xe1, 0x74, 0x20, 0x38, 0x19, 0x22,
|
||||
0x00, 0x21, 0x85, 0x5e, 0xd7
|
||||
};
|
||||
// response to HLTB and ATTRIB
|
||||
static const uint8_t response2[] = {0x00, 0x78, 0xF0};
|
||||
|
||||
|
||||
FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
|
||||
|
||||
|
|
@ -356,6 +365,12 @@ void SimulateIso14443bTag(void)
|
|||
memcpy(resp1Code, ToSend, ToSendMax);
|
||||
uint16_t resp1CodeLen = ToSendMax;
|
||||
|
||||
// prepare the (other) tag answer:
|
||||
CodeIso14443bAsTag(response2, sizeof(response2));
|
||||
uint8_t *resp2Code = BigBuf_malloc(ToSendMax);
|
||||
memcpy(resp2Code, ToSend, ToSendMax);
|
||||
uint16_t resp2CodeLen = ToSendMax;
|
||||
|
||||
// We need to listen to the high-frequency, peak-detected path.
|
||||
SetAdcMuxFor(GPIO_MUXSEL_HIPKD);
|
||||
FpgaSetupSsc();
|
||||
|
|
@ -376,23 +391,38 @@ void SimulateIso14443bTag(void)
|
|||
|
||||
// Good, look at the command now.
|
||||
if ( (len == sizeof(cmd1) && memcmp(receivedCmd, cmd1, len) == 0)
|
||||
|| (len == sizeof(cmd2) && memcmp(receivedCmd, cmd2, len) == 0) ) {
|
||||
|| (len == sizeof(cmd2) && memcmp(receivedCmd, cmd2, len) == 0)
|
||||
|| (len == sizeof(cmd3) && memcmp(receivedCmd, cmd3, len) == 0) ) {
|
||||
resp = response1;
|
||||
respLen = sizeof(response1);
|
||||
respCode = resp1Code;
|
||||
respCodeLen = resp1CodeLen;
|
||||
} else if ( (len == sizeof(cmd4) && receivedCmd[0] == cmd4[0])
|
||||
|| (len == sizeof(cmd5) && receivedCmd[0] == cmd5[0]) ) {
|
||||
resp = response2;
|
||||
respLen = sizeof(response2);
|
||||
respCode = resp2Code;
|
||||
respCodeLen = resp2CodeLen;
|
||||
} else {
|
||||
Dbprintf("new cmd from reader: len=%d, cmdsRecvd=%d", len, cmdsRecvd);
|
||||
// And print whether the CRC fails, just for good measure
|
||||
uint8_t b1, b2;
|
||||
ComputeCrc14443(CRC_14443_B, receivedCmd, len-2, &b1, &b2);
|
||||
if(b1 != receivedCmd[len-2] || b2 != receivedCmd[len-1]) {
|
||||
// Not so good, try again.
|
||||
DbpString("+++CRC fail");
|
||||
} else {
|
||||
DbpString("CRC passes");
|
||||
if (len >= 3){ // if crc exists
|
||||
ComputeCrc14443(CRC_14443_B, receivedCmd, len-2, &b1, &b2);
|
||||
if(b1 != receivedCmd[len-2] || b2 != receivedCmd[len-1]) {
|
||||
// Not so good, try again.
|
||||
DbpString("+++CRC fail");
|
||||
} else {
|
||||
DbpString("CRC passes");
|
||||
}
|
||||
}
|
||||
break;
|
||||
//get rid of compiler warning
|
||||
respCodeLen = 0;
|
||||
resp = response1;
|
||||
respLen = 0;
|
||||
respCode = resp1Code;
|
||||
//don't crash at new command just wait and see if reader will send other new cmds.
|
||||
//break;
|
||||
}
|
||||
|
||||
cmdsRecvd++;
|
||||
|
|
|
|||
|
|
@ -206,7 +206,7 @@ int CmdHF14BCmdRaw (const char *Cmd) {
|
|||
bool crc2 = true;
|
||||
cmd2[0] = 0x05;
|
||||
cmd2[1] = 0x00;
|
||||
cmd2[2] = 0x08;
|
||||
cmd2[2] = 0x00;
|
||||
|
||||
// REQB
|
||||
if (HF14BCmdRaw(true, &crc2, true, cmd2, &cmdLen, false)==0) return rawClose();
|
||||
|
|
@ -224,7 +224,7 @@ int CmdHF14BCmdRaw (const char *Cmd) {
|
|||
// attrib
|
||||
if (HF14BCmdRaw(true, &crc2, true, cmd2, &cmdLen, false)==0) return rawClose();
|
||||
|
||||
if (cmd2[0] != 0x10 || cmdLen != 3 || !crc2) return rawClose();
|
||||
if (cmdLen != 3 || !crc2) return rawClose();
|
||||
}
|
||||
|
||||
return HF14BCmdRaw(reply, &crc, power, data, &datalen, true);
|
||||
|
|
@ -232,7 +232,7 @@ int CmdHF14BCmdRaw (const char *Cmd) {
|
|||
|
||||
// print full atqb info
|
||||
static void print_atqb_resp(uint8_t *data){
|
||||
PrintAndLog (" UID: %s", sprint_hex(data+1,4));
|
||||
//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];
|
||||
|
|
@ -267,14 +267,15 @@ static void print_atqb_resp(uint8_t *data){
|
|||
else
|
||||
maxFrame = 257;
|
||||
|
||||
PrintAndLog ("Max Frame Size: %d%s",maxFrame, (maxFrame == 257) ? "+ RFU" : "");
|
||||
PrintAndLog ("Max Frame Size: %u%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 ("Frame Wait Int: %u", 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 ");
|
||||
PrintAndLog ("Max Buf Length: %u (MBLI) %s",data[14]>>4, (data[14] & 0xF0) ? "" : "not supported");
|
||||
|
||||
return;
|
||||
}
|
||||
|
|
@ -390,20 +391,44 @@ int HF14BStdReader(uint8_t *data, uint8_t *datalen){
|
|||
//03 = ? (resp 03 [e3 c2])
|
||||
//c2 = ? (resp c2 [66 15])
|
||||
//b2 = ? (resp a3 [e9 67])
|
||||
//a2 = ? (resp 02 [6a d3])
|
||||
bool crc = true;
|
||||
*datalen = 3;
|
||||
//std read cmd
|
||||
data[0] = 0x05;
|
||||
data[1] = 0x00;
|
||||
data[2] = 0x08;
|
||||
data[2] = 0x00;
|
||||
|
||||
if (HF14BCmdRaw(true, &crc, false, data, datalen, false)==0) return 0;
|
||||
if (HF14BCmdRaw(true, &crc, true, data, datalen, false)==0) return rawClose();
|
||||
|
||||
if (data[0] != 0x50 || *datalen != 14 || !crc) return 0;
|
||||
if (data[0] != 0x50 || *datalen != 14 || !crc) return rawClose();
|
||||
|
||||
PrintAndLog ("\n14443-3b tag found:");
|
||||
PrintAndLog (" UID: %s", sprint_hex(data+1,4));
|
||||
|
||||
uint8_t cmd2[16];
|
||||
uint8_t cmdLen = 3;
|
||||
bool crc2 = true;
|
||||
|
||||
cmd2[0] = 0x1D;
|
||||
// UID from data[1 - 4]
|
||||
cmd2[1] = data[1];
|
||||
cmd2[2] = data[2];
|
||||
cmd2[3] = data[3];
|
||||
cmd2[4] = data[4];
|
||||
cmd2[5] = 0x00;
|
||||
cmd2[6] = 0x08;
|
||||
cmd2[7] = 0x01;
|
||||
cmd2[8] = 0x00;
|
||||
cmdLen = 9;
|
||||
|
||||
// attrib
|
||||
if (HF14BCmdRaw(true, &crc2, true, cmd2, &cmdLen, false)==0) return rawClose();
|
||||
|
||||
if (cmdLen != 3 || !crc2) return rawClose();
|
||||
// add attrib responce to data
|
||||
data[14] = cmd2[0];
|
||||
rawClose();
|
||||
return 1;
|
||||
}
|
||||
|
||||
|
|
@ -414,6 +439,7 @@ int HF14BStdInfo(uint8_t *data, uint8_t *datalen){
|
|||
//add more info here
|
||||
print_atqb_resp(data);
|
||||
|
||||
|
||||
return 1;
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue