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

annotate XEROX a bit better

Browse source
This commit is contained in:
iceman1001 2024-01-26 20:26:43 +01:00
commit 98f64a4ca5
2 changed files with 43 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

42
client/src/cmdhflist.c
View file

@ -1572,6 +1572,41 @@ void annotateMfPlus(char *exp, size_t size, uint8_t *cmd, uint8_t cmdsize) {
0A 11 22 33 44 55 66 = Authenticate (11 22 33 44 55 66 = data to authenticate)
**/
void annotateIso14443b(char *exp, size_t size, uint8_t *cmd, uint8_t cmdsize) {
// xerox anti collison loop / slot select for uid bytes...
if (cmdsize == 1) {
switch (cmd[0]) {
case 0xB1:
snprintf(exp, size, "Slot 0 ACK");
return;
case 0xB3:
snprintf(exp, size, "Slot 1 ACK");
return;
case 0xB5:
snprintf(exp, size, "Slot 2 ACK");
return;
case 0xB7: {
snprintf(exp, size, "Slot 3 ACK");
return;
}
case 0xA1:
snprintf(exp, size, "Slot 0 NACK");
return;
case 0xA3:
snprintf(exp, size, "Slot 1 NACK");
return;
case 0xA5:
snprintf(exp, size, "Slot 2 NACK");
return;
case 0xA7: {
snprintf(exp, size, "Slot 0 NACK");
return;
}
default:
break;
}
}
switch (cmd[0]) {
case ISO14443B_REQB : {
@ -1634,7 +1669,12 @@ void annotateIso14443b(char *exp, size_t size, uint8_t *cmd, uint8_t cmdsize) {
case ISO14443B_PONG:
snprintf(exp, size, "PONG");
break;
default:
case ISO14443B_XEROX_PWD:
if (cmdsize == 17 && cmd[1] == 0x38) {
snprintf(exp, size, "XEROX PWD");
}
break;
default:
snprintf(exp, size, "?");
break;
}

2
include/protocols.h
View file

@ -314,6 +314,8 @@ ISO 7816-4 Basic interindustry commands. For command APDU's.
#define ISO14443B_PING 0xBA
#define ISO14443B_PONG 0xAB
#define ISO14443B_XEROX_PWD 0x02
// ASK C-ticket
#define ASK_REQT 0x10
#define ASK_IDENTIFY 0x0F