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

extended read block and read block annotation. Adapt select_card to keep antenna on when dump/info

Browse source
This commit is contained in:
iceman1001 2024-01-26 22:09:37 +01:00
commit 5de626992f
3 changed files with 53 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

4
client/src/cmdhflist.c
View file

@ -1678,6 +1678,10 @@ void annotateIso14443b(char *exp, size_t size, uint8_t *cmd, uint8_t cmdsize) {
snprintf(exp, size, "XEROX READ_BLK(%u)", cmd[2+8]); snprintf(exp, size, "XEROX READ_BLK(%u)", cmd[2+8]);
break; break;
} }
if (cmdsize == 13 && cmd[1] == ISO14443B_XEROX_EXT_READ_BLK) {
snprintf(exp, size, "XEROX EXT_READ_BLK(%u)", cmd[2+8]);
break;
}
case ISO14443B_XEROX_WUP1: case ISO14443B_XEROX_WUP1:
if (cmdsize == 5) { if (cmdsize == 5) {

35
client/src/cmdhfxerox.c
View file

@ -385,7 +385,7 @@ static int switch_off_field(void) {
return PM3_SUCCESS; return PM3_SUCCESS;
} }
static int xerox_select_card(iso14b_card_select_t *card) { static int xerox_select_card(iso14b_card_select_t *card, bool disconnect) {
if (card == NULL) { if (card == NULL) {
return PM3_EINVARG; return PM3_EINVARG;
@ -395,11 +395,15 @@ static int xerox_select_card(iso14b_card_select_t *card) {
while (retry--) { while (retry--) {
iso14b_raw_cmd_t packet = { iso14b_raw_cmd_t packet = {
.flags = (ISO14B_CONNECT | ISO14B_SELECT_XRX | ISO14B_DISCONNECT), .flags = (ISO14B_CONNECT | ISO14B_SELECT_XRX ),
.timeout = 0, .timeout = 0,
.rawlen = 0, .rawlen = 0,
}; };
if (disconnect) {
packet.flags |= ISO14B_DISCONNECT;
}
clearCommandBuffer(); clearCommandBuffer();
SendCommandNG(CMD_HF_ISO14443B_COMMAND, (uint8_t *)&packet, sizeof(iso14b_raw_cmd_t)); SendCommandNG(CMD_HF_ISO14443B_COMMAND, (uint8_t *)&packet, sizeof(iso14b_raw_cmd_t));
PacketResponseNG resp; PacketResponseNG resp;
@ -572,7 +576,7 @@ int read_xerox_uid(bool loop, bool verbose) {
do { do {
iso14b_card_select_t card; iso14b_card_select_t card;
int status = xerox_select_card(&card); int status = xerox_select_card(&card, true);
if (loop) { if (loop) {
if (status != PM3_SUCCESS) { if (status != PM3_SUCCESS) {
@ -636,7 +640,7 @@ static int read_xerox_block(iso14b_card_select_t *card, uint8_t blockno, uint8_t
} }
// set up the read command // set up the read command
packet->flags = (ISO14B_CONNECT | ISO14B_SELECT_XRX | ISO14B_APPEND_CRC | ISO14B_RAW); packet->flags = (ISO14B_CONNECT | ISO14B_APPEND_CRC | ISO14B_RAW);
packet->raw[packet->rawlen++] = 0x02; packet->raw[packet->rawlen++] = 0x02;
packet->raw[packet->rawlen++] = ISO14443B_XEROX_READ_BLK; packet->raw[packet->rawlen++] = ISO14443B_XEROX_READ_BLK;
@ -740,7 +744,7 @@ static int CmdHFXeroxInfo(const char *Cmd) {
CLIParserFree(ctx); CLIParserFree(ctx);
iso14b_card_select_t card; iso14b_card_select_t card;
int status = xerox_select_card(&card); int status = xerox_select_card(&card, false);
if (status != PM3_SUCCESS) { if (status != PM3_SUCCESS) {
if (verbose) { if (verbose) {
PrintAndLogEx(FAILED, "Fuji/Xerox tag select failed"); PrintAndLogEx(FAILED, "Fuji/Xerox tag select failed");
@ -797,7 +801,7 @@ static int CmdHFXeroxDump(const char *Cmd) {
CLIParserFree(ctx); CLIParserFree(ctx);
iso14b_card_select_t card; iso14b_card_select_t card;
int status = xerox_select_card(&card); int status = xerox_select_card(&card, false);
if (status != PM3_SUCCESS) { if (status != PM3_SUCCESS) {
if (verbose) { if (verbose) {
PrintAndLogEx(FAILED, "Fuji/Xerox tag select failed"); PrintAndLogEx(FAILED, "Fuji/Xerox tag select failed");
@ -832,18 +836,20 @@ static int CmdHFXeroxDump(const char *Cmd) {
for (int retry = 0; (retry < 2 && blockno < 0x100); retry++) { for (int retry = 0; (retry < 2 && blockno < 0x100); retry++) {
packet->raw[1] = (blockno < 12) ? 0x30 : 0x20; // set command: read ext mem or read mem // set command: read ext mem or read mem
packet->raw[1] = (blockno < 12) ? ISO14443B_XEROX_READ_BLK : ISO14443B_XEROX_EXT_READ_BLK;
packet->raw[10] = blockno & 0xFF; packet->raw[10] = blockno & 0xFF;
PacketResponseNG resp; PacketResponseNG resp;
clearCommandBuffer(); clearCommandBuffer();
SendCommandNG(CMD_HF_ISO14443B_COMMAND, (uint8_t *)packet, sizeof(iso14b_raw_cmd_t) + packet->rawlen); SendCommandNG(CMD_HF_ISO14443B_COMMAND, (uint8_t *)packet, sizeof(iso14b_raw_cmd_t) + packet->rawlen);
if (WaitForResponseTimeout(CMD_HF_ISO14443B_COMMAND, &resp, 2000)) { if (WaitForResponseTimeout(CMD_HF_ISO14443B_COMMAND, &resp, 2000) == false) {
/* continue;
PrintAndLogEx(INFO, "%X %X %X %X %X %I64X %I64X %I64X %X %X %X %c", }
resp.cmd, resp.length, resp.magic, resp.status, resp.crc, resp.oldarg[0], resp.oldarg[1], resp.oldarg[2],
resp.data.asBytes[0], resp.data.asBytes[1], resp.data.asBytes[2], resp.ng ? 't' : 'f'); if (resp.status != PM3_SUCCESS) {
*/ continue;
}
if (resp.length < 7) { if (resp.length < 7) {
PrintAndLogEx(FAILED, "retrying one more time"); PrintAndLogEx(FAILED, "retrying one more time");
@ -857,7 +863,7 @@ static int CmdHFXeroxDump(const char *Cmd) {
continue; continue;
} }
if (d[0] != 2) { if (d[0] != 0x02) {
PrintAndLogEx(NORMAL, ""); PrintAndLogEx(NORMAL, "");
PrintAndLogEx(FAILED, "Tag returned Error %x %x", d[0], d[1]); PrintAndLogEx(FAILED, "Tag returned Error %x %x", d[0], d[1]);
break; break;
@ -871,7 +877,6 @@ static int CmdHFXeroxDump(const char *Cmd) {
PrintAndLogEx(NORMAL, "." NOLF); PrintAndLogEx(NORMAL, "." NOLF);
fflush(stdout); fflush(stdout);
} }
}
switch_off_field(); switch_off_field();

4
include/protocols.h
View file

@ -318,8 +318,8 @@ ISO 7816-4 Basic interindustry commands. For command APDU's.
#define ISO14443B_XEROX_PWD 0x38 #define ISO14443B_XEROX_PWD 0x38
#define ISO14443B_XEROX_WUP1 0x0D #define ISO14443B_XEROX_WUP1 0x0D
#define ISO14443B_XEROX_WUP2 0x5D #define ISO14443B_XEROX_WUP2 0x5D
#define ISO14443B_XEROX_READ_BLK 0x20 #define ISO14443B_XEROX_EXT_READ_BLK 0x20
#define ISO14443B_XEROX_READ_BLK 0x30
// ASK C-ticket // ASK C-ticket
#define ASK_REQT 0x10 #define ASK_REQT 0x10