RfidResearchGroup/proxmark3
1
1
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-03-19 19:38:52 +08:00
Code Issues Projects Releases Packages Wiki Activity

iclass: avoid last ping in fast modes

Browse source
This commit is contained in:
Philippe Teuwen 2019-05-08 19:16:37 +02:00
parent 2f2796be7e
commit 2f71d951e1
1 changed files with 8 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
client/cmdhficlass.c
View file

@ -529,13 +529,6 @@ static int CmdHFiClassReader_Replay(const char *Cmd) {
return 0; return 0;
} }
/*
static int iclassEmlSetMem(uint8_t *data, int blockNum, int blocksCount) {
clearCommandBuffer();
SendCommandOLD(CMD_MIFARE_EML_MEMSET, blockNum, blocksCount, 0, data, blocksCount * 16);
return 0;
}
*/
static int CmdHFiClassELoad(const char *Cmd) { static int CmdHFiClassELoad(const char *Cmd) {
char ctmp = tolower(param_getchar(Cmd, 0)); char ctmp = tolower(param_getchar(Cmd, 0));
@ -596,6 +589,10 @@ static int CmdHFiClassELoad(const char *Cmd) {
while (bytes_remaining > 0) { while (bytes_remaining > 0) {
uint32_t bytes_in_packet = MIN(PM3_CMD_DATA_SIZE, bytes_remaining); uint32_t bytes_in_packet = MIN(PM3_CMD_DATA_SIZE, bytes_remaining);
if (bytes_in_packet == bytes_remaining) {
// Disable fast mode on last packet
conn.block_after_ACK = false;
}
clearCommandBuffer(); clearCommandBuffer();
SendCommandOLD(CMD_ICLASS_EML_MEMSET, bytes_sent, bytes_in_packet, 0, dump + bytes_sent, bytes_in_packet); SendCommandOLD(CMD_ICLASS_EML_MEMSET, bytes_sent, bytes_in_packet, 0, dump + bytes_sent, bytes_in_packet);
bytes_remaining -= bytes_in_packet; bytes_remaining -= bytes_in_packet;
@ -603,11 +600,6 @@ static int CmdHFiClassELoad(const char *Cmd) {
} }
free(dump); free(dump);
// Disable fast mode and send a dummy command to make it effective
conn.block_after_ACK = false;
SendCommandNG(CMD_PING, NULL, 0);
WaitForResponseTimeout(CMD_PING, NULL, 1000);
PrintAndLogEx(SUCCESS, "sent %d bytes of data to device emulator memory", bytes_sent); PrintAndLogEx(SUCCESS, "sent %d bytes of data to device emulator memory", bytes_sent);
return 0; return 0;
} }
@ -1966,9 +1958,11 @@ static int CmdHFiClassCheckKeys(const char *Cmd) {
uint32_t keys = ((keycnt - i) > chunksize) ? chunksize : keycnt - i; uint32_t keys = ((keycnt - i) > chunksize) ? chunksize : keycnt - i;
// last chunk? // last chunk?
if (keys == keycnt - i) if (keys == keycnt - i) {
lastChunk = true; lastChunk = true;
// Disable fast mode on last command
conn.block_after_ACK = false;
}
uint32_t flags = lastChunk << 8; uint32_t flags = lastChunk << 8;
// bit 16 // bit 16
// - 1 indicates credit key // - 1 indicates credit key
@ -2035,11 +2029,6 @@ out:
PrintAndLogEx(SUCCESS, "\nTime in iclass checkkeys: %.0f seconds\n", (float)t1 / 1000.0); PrintAndLogEx(SUCCESS, "\nTime in iclass checkkeys: %.0f seconds\n", (float)t1 / 1000.0);
// Disable fast mode and send a dummy command to make it effective
conn.block_after_ACK = false;
SendCommandNG(CMD_PING, NULL, 0);
WaitForResponseTimeout(CMD_PING, NULL, 1000);
DropField(); DropField();
free(pre); free(pre);
free(keyBlock); free(keyBlock);