mirror of
https://github.com/Proxmark/proxmark3.git
synced 2024-09-21 23:36:51 +08:00
fixed bug in CmdHF14ACmdRaw: if we cant select we send command anyway...
This commit is contained in:
parent
980417eacd
commit
f1a983a330
|
@ -1910,6 +1910,7 @@ void ReaderIso14443a(UsbCommand *c)
|
|||
uint32_t arg0 = 0;
|
||||
byte_t buf[USB_CMD_DATA_SIZE];
|
||||
uint8_t par[MAX_PARITY_SIZE];
|
||||
bool cantSELECT = false;
|
||||
|
||||
if(param & ISO14A_CONNECT) {
|
||||
clear_trace();
|
||||
|
@ -1922,11 +1923,19 @@ void ReaderIso14443a(UsbCommand *c)
|
|||
}
|
||||
|
||||
if(param & ISO14A_CONNECT) {
|
||||
LED_A_ON();
|
||||
clear_trace();
|
||||
iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
|
||||
if(!(param & ISO14A_NO_SELECT)) {
|
||||
iso14a_card_select_t *card = (iso14a_card_select_t*)buf;
|
||||
arg0 = iso14443a_select_card(NULL, card, NULL, true, 0, param & ISO14A_NO_RATS);
|
||||
|
||||
// if we cant select then we cant send data
|
||||
cantSELECT = (arg0 != 1);
|
||||
|
||||
LED_B_ON();
|
||||
cmd_send(CMD_ACK,arg0,card->uidlen,0,buf,sizeof(iso14a_card_select_t));
|
||||
LED_B_OFF();
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -1934,12 +1943,14 @@ void ReaderIso14443a(UsbCommand *c)
|
|||
iso14a_set_timeout(timeout);
|
||||
}
|
||||
|
||||
if(param & ISO14A_APDU) {
|
||||
if(param & ISO14A_APDU && !cantSELECT) {
|
||||
arg0 = iso14_apdu(cmd, len, buf);
|
||||
LED_B_ON();
|
||||
cmd_send(CMD_ACK,arg0,0,0,buf,sizeof(buf));
|
||||
LED_B_OFF();
|
||||
}
|
||||
|
||||
if(param & ISO14A_RAW) {
|
||||
if(param & ISO14A_RAW && !cantSELECT) {
|
||||
if(param & ISO14A_APPEND_CRC) {
|
||||
if(param & ISO14A_TOPAZMODE) {
|
||||
AppendCrc14443b(cmd,len);
|
||||
|
@ -1975,7 +1986,10 @@ void ReaderIso14443a(UsbCommand *c)
|
|||
}
|
||||
}
|
||||
arg0 = ReaderReceive(buf, par);
|
||||
|
||||
LED_B_ON();
|
||||
cmd_send(CMD_ACK,arg0,0,0,buf,sizeof(buf));
|
||||
LED_B_OFF();
|
||||
}
|
||||
|
||||
if(param & ISO14A_REQUEST_TRIGGER) {
|
||||
|
|
|
@ -29,7 +29,7 @@
|
|||
#include "mifarehost.h"
|
||||
|
||||
static int CmdHelp(const char *Cmd);
|
||||
static void waitCmd(uint8_t iLen);
|
||||
static int waitCmd(uint8_t iLen);
|
||||
|
||||
// structure and database for uid -> tagtype lookups
|
||||
typedef struct {
|
||||
|
@ -656,6 +656,8 @@ int CmdHF14AAPDU(const char *cmd) {
|
|||
if (activateField) {
|
||||
if (!WaitForResponseTimeout(CMD_ACK, &resp, 1500))
|
||||
return 2;
|
||||
if (resp.arg[0] != 1)
|
||||
return 2;
|
||||
}
|
||||
|
||||
if (WaitForResponseTimeout(CMD_ACK, &resp, 1500)) {
|
||||
|
@ -845,17 +847,17 @@ int CmdHF14ACmdRaw(const char *cmd) {
|
|||
SendCommand(&c);
|
||||
|
||||
if (reply) {
|
||||
if(active_select)
|
||||
waitCmd(1);
|
||||
if(datalen>0)
|
||||
int res = 0;
|
||||
if (active_select)
|
||||
res = waitCmd(1);
|
||||
if (!res && datalen > 0)
|
||||
waitCmd(0);
|
||||
} // if reply
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
static void waitCmd(uint8_t iSelect)
|
||||
{
|
||||
static int waitCmd(uint8_t iSelect) {
|
||||
uint8_t *recv;
|
||||
UsbCommand resp;
|
||||
char *hexout;
|
||||
|
@ -865,7 +867,7 @@ static void waitCmd(uint8_t iSelect)
|
|||
uint8_t iLen = iSelect ? resp.arg[1] : resp.arg[0];
|
||||
PrintAndLog("received %i octets", iLen);
|
||||
if(!iLen)
|
||||
return;
|
||||
return 1;
|
||||
hexout = (char *)malloc(iLen * 3 + 1);
|
||||
if (hexout != NULL) {
|
||||
for (int i = 0; i < iLen; i++) { // data in hex
|
||||
|
@ -875,10 +877,13 @@ static void waitCmd(uint8_t iSelect)
|
|||
free(hexout);
|
||||
} else {
|
||||
PrintAndLog("malloc failed your client has low memory?");
|
||||
return 2;
|
||||
}
|
||||
} else {
|
||||
PrintAndLog("timeout while waiting for reply.");
|
||||
return 3;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
static command_t CommandTable[] =
|
||||
|
|
Loading…
Reference in a new issue