github/RRG-Proxmark3
1
0
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-08-21 13:53:55 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

chg: 'hf 15 info' - this fixes some of the bugs. For instance, get_systeminfo responses doesn't have a CRC. No need to verify crc :)

Browse source 
Also if prepare command fails, not finding uid,  don't continue...
This commit is contained in:
iceman1001 2017-09-05 00:25:53 +02:00
commit 59af999763
1 changed files with 23 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

42
client/cmdhf15.c
View file

@ -274,16 +274,20 @@ int usage_15_samples(void){
return 0; return 0;
} }
int usage_15_info(void){ int usage_15_info(void){
PrintAndLog("Uses the optional command 'get_systeminfo' 0x2B to try and extract information");
PrintAndLog("command may fail, depending on tag.");
PrintAndLog("defaults to '1 out of 4' mode");
PrintAndLog("");
PrintAndLog("Usage: hf 15 info [options] <uid|s|u|*>"); PrintAndLog("Usage: hf 15 info [options] <uid|s|u|*>");
PrintAndLog(" options:"); PrintAndLog("options:");
PrintAndLog(" -2 use slower '1 out of 256' mode"); PrintAndLog(" -2 use slower '1 out of 256' mode");
PrintAndLog(" uid (either): "); PrintAndLog(" uid (either): ");
PrintAndLog(" <8B hex> full UID eg E011223344556677"); PrintAndLog(" <8B hex> full UID eg E011223344556677");
PrintAndLog(" s selected tag"); PrintAndLog(" s selected tag");
PrintAndLog(" u unaddressed mode"); PrintAndLog(" u unaddressed mode");
PrintAndLog(" * scan for tag"); PrintAndLog(" * scan for tag");
PrintAndLog(" start#: page number to start 0-255"); PrintAndLog("Samples:");
PrintAndLog(" count#: number of pages"); PrintAndLog(" hf 15 info u");
return 0; return 0;
} }
int usage_15_record(void){ int usage_15_record(void){
@ -480,14 +484,13 @@ int CmdHF15Info(const char *Cmd) {
strncpy(cmd, Cmd, 99); strncpy(cmd, Cmd, 99);
int cmdisok = prepareHF15Cmd(&cmd, &c, ISO15_CMD_SYSINFO); if ( !prepareHF15Cmd(&cmd, &c, ISO15_CMD_SYSINFO) )
if ( !cmdisok )
return 0; return 0;
reqlen = AddCrc(req, c.arg[0]); reqlen = AddCrc(req, c.arg[0]);
c.arg[0] = reqlen; c.arg[0] = reqlen;
PrintAndLog("cmd %s", sprint_hex(c.d.asBytes, reqlen) ); //PrintAndLog("cmd %s", sprint_hex(c.d.asBytes, reqlen) );
clearCommandBuffer(); clearCommandBuffer();
SendCommand(&c); SendCommand(&c);
@ -500,18 +503,13 @@ int CmdHF15Info(const char *Cmd) {
uint32_t status = resp.arg[0]; uint32_t status = resp.arg[0];
if ( status < 2 ) { if ( status < 2 ) {
PrintAndLog("iso15693 card select failed"); PrintAndLog("iso15693 card doesn't answer to systeminfo command");
return 1; return 1;
} }
PrintAndLog("len %u, recv %s",status, sprint_hex(resp.d.asBytes, status) ); // PrintAndLog("len %u, recv %s",status, sprint_hex(resp.d.asBytes, status) );
recv = resp.d.asBytes; recv = resp.d.asBytes;
if (ISO15_CRC_CHECK == Crc(recv, status)) {
PrintAndLog("CRC failed");
return 2;
}
if ( recv[0] & ISO15_RES_ERROR ) { if ( recv[0] & ISO15_RES_ERROR ) {
PrintAndLog("iso15693 card returned error %i: %s", recv[0], TagErrorStr(recv[0])); PrintAndLog("iso15693 card returned error %i: %s", recv[0], TagErrorStr(recv[0]));
return 3; return 3;
@ -519,7 +517,7 @@ int CmdHF15Info(const char *Cmd) {
PrintAndLog(" UID : %s", sprintUID(NULL, recv+2)); PrintAndLog(" UID : %s", sprintUID(NULL, recv+2));
PrintAndLog(" MANUFACTURER : %s", getTagInfo_15(recv+2)); PrintAndLog(" MANUFACTURER : %s", getTagInfo_15(recv+2));
PrintAndLog(" raw : %s", sprint_hex(recv, status-2)); PrintAndLog("\n raw : %s", sprint_hex(recv, status-2));
i = 10; i = 10;
@ -860,7 +858,7 @@ int prepareHF15Cmd(char **cmd, UsbCommand *c, uint8_t iso15cmd) {
req[reqlen++] = iso15cmd; req[reqlen++] = iso15cmd;
if (!getUID(uid)) { if (!getUID(uid)) {
PrintAndLog("No Tag found"); PrintAndLog("No tag found");
return 0; return 0;
} }
memcpy(&req[reqlen], uid, sizeof(uid)); memcpy(&req[reqlen], uid, sizeof(uid));
@ -909,7 +907,9 @@ int CmdHF15Readmulti(const char *Cmd) {
char *cmd = cmdbuf; char *cmd = cmdbuf;
strncpy(cmd, Cmd, 99); strncpy(cmd, Cmd, 99);
prepareHF15Cmd(&cmd, &c, ISO15_CMD_READMULTI); if ( !prepareHF15Cmd(&cmd, &c, ISO15_CMD_READMULTI) )
return 0;
reqlen = c.arg[0]; reqlen = c.arg[0];
pagenum = strtol(cmd, NULL, 0); pagenum = strtol(cmd, NULL, 0);
@ -982,7 +982,9 @@ int CmdHF15Read(const char *Cmd) {
char *cmd = cmdbuf; char *cmd = cmdbuf;
strncpy(cmd, Cmd, 99); strncpy(cmd, Cmd, 99);
prepareHF15Cmd(&cmd, &c,ISO15_CMD_READ); if ( !prepareHF15Cmd(&cmd, &c, ISO15_CMD_READ) )
return 0;
reqlen = c.arg[0]; reqlen = c.arg[0];
pagenum = strtol(cmd, NULL, 0); pagenum = strtol(cmd, NULL, 0);
@ -1042,9 +1044,11 @@ int CmdHF15Write(const char *Cmd) {
char *cmd = cmdbuf; char *cmd = cmdbuf;
char *cmd2; char *cmd2;
strncpy(cmd,Cmd,99); strncpy(cmd, Cmd, 99);
if ( !prepareHF15Cmd(&cmd, &c, ISO15_CMD_WRITE) )
return 0;
prepareHF15Cmd(&cmd, &c, ISO15_CMD_WRITE);
reqlen = c.arg[0]; reqlen = c.arg[0];
// *cmd -> page num ; *cmd2 -> data // *cmd -> page num ; *cmd2 -> data