mirror of
https://github.com/Proxmark/proxmark3.git
synced 2025-08-20 21:33:19 -07:00
Fix hf 15 sim (#696)
* added ISO15693 coding for tag messages (CodeIso15693AsTag()) * added ISO15693 decoding for reader commands (Handle15693SampleFromReader()) * send tag inventory response in either high or low speed * some refactoring and formatting
This commit is contained in:
pwpiwi
GitHub
parent
666fa6e1cf
commit
8c6cca0ba1
6 changed files with 789 additions and 566 deletions
103
client/cmdhf15.c
103
client/cmdhf15.c
|
|
@ -35,6 +35,7 @@
|
|||
#include "util.h"
|
||||
#include "cmdparser.h"
|
||||
#include "iso15693tools.h"
|
||||
#include "protocols.h"
|
||||
#include "cmdmain.h"
|
||||
|
||||
#define FrameSOF Iso15693FrameSOF
|
||||
|
|
@ -212,18 +213,17 @@ int getUID(uint8_t *buf)
|
|||
|
||||
for (int retry=0;retry<3; retry++) { // don't give up the at the first try
|
||||
|
||||
req[0]= ISO15_REQ_SUBCARRIER_SINGLE | ISO15_REQ_DATARATE_HIGH |
|
||||
ISO15_REQ_INVENTORY | ISO15_REQINV_SLOT1;
|
||||
req[1]=ISO15_CMD_INVENTORY;
|
||||
req[2]=0; // mask length
|
||||
reqlen=AddCrc(req,3);
|
||||
c.arg[0]=reqlen;
|
||||
req[0] = ISO15693_REQ_DATARATE_HIGH | ISO15693_REQ_INVENTORY | ISO15693_REQINV_SLOT1;
|
||||
req[1] = ISO15693_INVENTORY;
|
||||
req[2] = 0; // mask length
|
||||
reqlen = AddCrc(req,3);
|
||||
c.arg[0] = reqlen;
|
||||
|
||||
SendCommand(&c);
|
||||
|
||||
if (WaitForResponseTimeout(CMD_ACK,&resp,1000)) {
|
||||
recv = resp.d.asBytes;
|
||||
if (resp.arg[0]>=12 && ISO15_CRC_CHECK==Crc(recv,12)) {
|
||||
if (resp.arg[0]>=12 && ISO15693_CRC_CHECK==Crc(recv,12)) {
|
||||
memcpy(buf,&recv[2],8);
|
||||
return 1;
|
||||
}
|
||||
|
|
@ -424,6 +424,7 @@ int CmdHF15Sim(const char *Cmd)
|
|||
|
||||
PrintAndLog("Starting simulating UID %02X %02X %02X %02X %02X %02X %02X %02X",
|
||||
uid[0],uid[1],uid[2],uid[3],uid[4], uid[5], uid[6], uid[7]);
|
||||
PrintAndLog("Press the button to stop simulation");
|
||||
|
||||
UsbCommand c = {CMD_SIMTAG_ISO_15693, {0, 0, 0}};
|
||||
memcpy(c.d.asBytes,uid,8);
|
||||
|
|
@ -462,20 +463,19 @@ int CmdHF15DumpMem(const char*Cmd) {
|
|||
|
||||
for (int retry=0; retry<5; retry++) {
|
||||
|
||||
req[0]= ISO15_REQ_SUBCARRIER_SINGLE | ISO15_REQ_DATARATE_HIGH |
|
||||
ISO15_REQ_NONINVENTORY | ISO15_REQ_ADDRESS;
|
||||
req[1]=ISO15_CMD_READ;
|
||||
req[0]= ISO15693_REQ_DATARATE_HIGH | ISO15693_REQ_ADDRESS;
|
||||
req[1] = ISO15693_READBLOCK;
|
||||
memcpy(&req[2],uid,8);
|
||||
req[10]=blocknum;
|
||||
reqlen=AddCrc(req,11);
|
||||
c.arg[0]=reqlen;
|
||||
req[10] = blocknum;
|
||||
reqlen = AddCrc(req,11);
|
||||
c.arg[0] = reqlen;
|
||||
|
||||
SendCommand(&c);
|
||||
|
||||
if (WaitForResponseTimeout(CMD_ACK,&resp,1000)) {
|
||||
recv = resp.d.asBytes;
|
||||
if (ISO15_CRC_CHECK==Crc(recv,resp.arg[0])) {
|
||||
if (!(recv[0] & ISO15_RES_ERROR)) {
|
||||
if (ISO15693_CRC_CHECK==Crc(recv,resp.arg[0])) {
|
||||
if (!(recv[0] & ISO15693_RES_ERROR)) {
|
||||
retry=0;
|
||||
*output=0; // reset outputstring
|
||||
sprintf(output, "Block %02x ",blocknum);
|
||||
|
|
@ -499,7 +499,7 @@ int CmdHF15DumpMem(const char*Cmd) {
|
|||
// TODO: need fix
|
||||
// if (resp.arg[0]<3)
|
||||
// PrintAndLog("Lost Connection");
|
||||
// else if (ISO15_CRC_CHECK!=Crc(resp.d.asBytes,resp.arg[0]))
|
||||
// else if (ISO15693_CRC_CHECK!=Crc(resp.d.asBytes,resp.arg[0]))
|
||||
// PrintAndLog("CRC Failed");
|
||||
// else
|
||||
// PrintAndLog("Tag returned Error %i: %s",recv[1],TagErrorStr(recv[1]));
|
||||
|
|
@ -547,12 +547,11 @@ int CmdHF15CmdInquiry(const char *Cmd)
|
|||
uint8_t *req=c.d.asBytes;
|
||||
int reqlen=0;
|
||||
|
||||
req[0]= ISO15_REQ_SUBCARRIER_SINGLE | ISO15_REQ_DATARATE_HIGH |
|
||||
ISO15_REQ_INVENTORY | ISO15_REQINV_SLOT1;
|
||||
req[1]=ISO15_CMD_INVENTORY;
|
||||
req[2]=0; // mask length
|
||||
req[0] = ISO15693_REQ_DATARATE_HIGH | ISO15693_REQ_INVENTORY | ISO15693_REQINV_SLOT1;
|
||||
req[1] = ISO15693_INVENTORY;
|
||||
req[2] = 0; // mask length
|
||||
reqlen=AddCrc(req,3);
|
||||
c.arg[0]=reqlen;
|
||||
c.arg[0] = reqlen;
|
||||
|
||||
SendCommand(&c);
|
||||
|
||||
|
|
@ -706,7 +705,7 @@ int prepareHF15Cmd(char **cmd, UsbCommand *c, uint8_t iso15cmd[], int iso15cmdle
|
|||
while (**cmd==' ' || **cmd=='\t') (*cmd)++;
|
||||
|
||||
if (strstr(*cmd,"-o")==*cmd) {
|
||||
req[reqlen]=ISO15_REQ_OPTION;
|
||||
req[reqlen]=ISO15693_REQ_OPTION;
|
||||
(*cmd)+=2;
|
||||
}
|
||||
|
||||
|
|
@ -721,36 +720,32 @@ int prepareHF15Cmd(char **cmd, UsbCommand *c, uint8_t iso15cmd[], int iso15cmdle
|
|||
case 's':
|
||||
case 'S':
|
||||
// you must have selected the tag earlier
|
||||
req[reqlen++]|= ISO15_REQ_SUBCARRIER_SINGLE | ISO15_REQ_DATARATE_HIGH |
|
||||
ISO15_REQ_NONINVENTORY | ISO15_REQ_SELECT;
|
||||
memcpy(&req[reqlen],&iso15cmd[0],iso15cmdlen);
|
||||
reqlen+=iso15cmdlen;
|
||||
req[reqlen++] |= ISO15693_REQ_DATARATE_HIGH | ISO15693_REQ_SELECT;
|
||||
memcpy(&req[reqlen],&iso15cmd[0],iso15cmdlen);
|
||||
reqlen += iso15cmdlen;
|
||||
break;
|
||||
case 'u':
|
||||
case 'U':
|
||||
// unaddressed mode may not be supported by all vendors
|
||||
req[reqlen++]|= ISO15_REQ_SUBCARRIER_SINGLE | ISO15_REQ_DATARATE_HIGH |
|
||||
ISO15_REQ_NONINVENTORY;
|
||||
memcpy(&req[reqlen],&iso15cmd[0],iso15cmdlen);
|
||||
reqlen+=iso15cmdlen;
|
||||
req[reqlen++] |= ISO15693_REQ_DATARATE_HIGH;
|
||||
memcpy(&req[reqlen],&iso15cmd[0],iso15cmdlen);
|
||||
reqlen += iso15cmdlen;
|
||||
break;
|
||||
case '*':
|
||||
// we scan for the UID ourself
|
||||
req[reqlen++]|= ISO15_REQ_SUBCARRIER_SINGLE | ISO15_REQ_DATARATE_HIGH |
|
||||
ISO15_REQ_NONINVENTORY | ISO15_REQ_ADDRESS;
|
||||
memcpy(&req[reqlen],&iso15cmd[0],iso15cmdlen);
|
||||
req[reqlen++] |= ISO15693_REQ_DATARATE_HIGH | ISO15693_REQ_ADDRESS;
|
||||
memcpy(&req[reqlen],&iso15cmd[0],iso15cmdlen);
|
||||
reqlen+=iso15cmdlen;
|
||||
if (!getUID(uid)) {
|
||||
PrintAndLog("No Tag found");
|
||||
return 0;
|
||||
}
|
||||
memcpy(req+reqlen,uid,8);
|
||||
PrintAndLog("Detected UID %s",sprintUID(NULL,uid));
|
||||
reqlen+=8;
|
||||
if (!getUID(uid)) {
|
||||
PrintAndLog("No Tag found");
|
||||
return 0;
|
||||
}
|
||||
memcpy(req+reqlen,uid,8);
|
||||
PrintAndLog("Detected UID %s",sprintUID(NULL,uid));
|
||||
reqlen+=8;
|
||||
break;
|
||||
default:
|
||||
req[reqlen++]|= ISO15_REQ_SUBCARRIER_SINGLE | ISO15_REQ_DATARATE_HIGH |
|
||||
ISO15_REQ_NONINVENTORY | ISO15_REQ_ADDRESS;
|
||||
req[reqlen++] |= ISO15693_REQ_DATARATE_HIGH | ISO15693_REQ_ADDRESS;
|
||||
memcpy(&req[reqlen],&iso15cmd[0],iso15cmdlen);
|
||||
reqlen+=iso15cmdlen;
|
||||
|
||||
|
|
@ -809,7 +804,7 @@ int CmdHF15CmdSysinfo(const char *Cmd) {
|
|||
return 0;
|
||||
}
|
||||
|
||||
prepareHF15Cmd(&cmd, &c,(uint8_t[]){ISO15_CMD_SYSINFO},1);
|
||||
prepareHF15Cmd(&cmd, &c,(uint8_t[]){ISO15693_GET_SYSTEM_INFO},1);
|
||||
reqlen=c.arg[0];
|
||||
|
||||
reqlen=AddCrc(req,reqlen);
|
||||
|
|
@ -819,8 +814,8 @@ int CmdHF15CmdSysinfo(const char *Cmd) {
|
|||
|
||||
if (WaitForResponseTimeout(CMD_ACK,&resp,1000) && resp.arg[0]>2) {
|
||||
recv = resp.d.asBytes;
|
||||
if (ISO15_CRC_CHECK==Crc(recv,resp.arg[0])) {
|
||||
if (!(recv[0] & ISO15_RES_ERROR)) {
|
||||
if (ISO15693_CRC_CHECK==Crc(recv,resp.arg[0])) {
|
||||
if (!(recv[0] & ISO15693_RES_ERROR)) {
|
||||
*output=0; // reset outputstring
|
||||
for ( i=1; i<resp.arg[0]-2; i++) {
|
||||
sprintf(output+strlen(output),"%02X ",recv[i]);
|
||||
|
|
@ -896,7 +891,7 @@ int CmdHF15CmdReadmulti(const char *Cmd) {
|
|||
return 0;
|
||||
}
|
||||
|
||||
prepareHF15Cmd(&cmd, &c,(uint8_t[]){ISO15_CMD_READMULTI},1);
|
||||
prepareHF15Cmd(&cmd, &c,(uint8_t[]){ISO15693_READ_MULTI_BLOCK},1);
|
||||
reqlen=c.arg[0];
|
||||
|
||||
pagenum=strtol(cmd,NULL,0);
|
||||
|
|
@ -920,8 +915,8 @@ int CmdHF15CmdReadmulti(const char *Cmd) {
|
|||
|
||||
if (WaitForResponseTimeout(CMD_ACK,&resp,1000) && resp.arg[0]>2) {
|
||||
recv = resp.d.asBytes;
|
||||
if (ISO15_CRC_CHECK==Crc(recv,resp.arg[0])) {
|
||||
if (!(recv[0] & ISO15_RES_ERROR)) {
|
||||
if (ISO15693_CRC_CHECK==Crc(recv,resp.arg[0])) {
|
||||
if (!(recv[0] & ISO15693_RES_ERROR)) {
|
||||
*output=0; // reset outputstring
|
||||
for ( int i=1; i<resp.arg[0]-2; i++) {
|
||||
sprintf(output+strlen(output),"%02X ",recv[i]);
|
||||
|
|
@ -974,7 +969,7 @@ int CmdHF15CmdRead(const char *Cmd) {
|
|||
return 0;
|
||||
}
|
||||
|
||||
prepareHF15Cmd(&cmd, &c,(uint8_t[]){ISO15_CMD_READ},1);
|
||||
prepareHF15Cmd(&cmd, &c,(uint8_t[]){ISO15693_READBLOCK},1);
|
||||
reqlen=c.arg[0];
|
||||
|
||||
pagenum=strtol(cmd,NULL,0);
|
||||
|
|
@ -993,8 +988,8 @@ int CmdHF15CmdRead(const char *Cmd) {
|
|||
|
||||
if (WaitForResponseTimeout(CMD_ACK,&resp,1000) && resp.arg[0]>2) {
|
||||
recv = resp.d.asBytes;
|
||||
if (ISO15_CRC_CHECK==Crc(recv,resp.arg[0])) {
|
||||
if (!(recv[0] & ISO15_RES_ERROR)) {
|
||||
if (ISO15693_CRC_CHECK==Crc(recv,resp.arg[0])) {
|
||||
if (!(recv[0] & ISO15693_RES_ERROR)) {
|
||||
*output=0; // reset outputstring
|
||||
//sprintf(output, "Block %2i ",blocknum);
|
||||
for ( int i=1; i<resp.arg[0]-2; i++) {
|
||||
|
|
@ -1051,7 +1046,7 @@ int CmdHF15CmdWrite(const char *Cmd) {
|
|||
return 0;
|
||||
}
|
||||
|
||||
prepareHF15Cmd(&cmd, &c,(uint8_t[]){ISO15_CMD_WRITE},1);
|
||||
prepareHF15Cmd(&cmd, &c,(uint8_t[]){ISO15693_WRITEBLOCK},1);
|
||||
reqlen=c.arg[0];
|
||||
|
||||
// *cmd -> page num ; *cmd2 -> data
|
||||
|
|
@ -1086,8 +1081,8 @@ int CmdHF15CmdWrite(const char *Cmd) {
|
|||
|
||||
if (WaitForResponseTimeout(CMD_ACK,&resp,2000) && resp.arg[0]>2) {
|
||||
recv = resp.d.asBytes;
|
||||
if (ISO15_CRC_CHECK==Crc(recv,resp.arg[0])) {
|
||||
if (!(recv[0] & ISO15_RES_ERROR)) {
|
||||
if (ISO15693_CRC_CHECK==Crc(recv,resp.arg[0])) {
|
||||
if (!(recv[0] & ISO15693_RES_ERROR)) {
|
||||
PrintAndLog("OK");
|
||||
} else {
|
||||
PrintAndLog("Tag returned Error %i: %s",recv[1],TagErrorStr(recv[1]));
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue