ShowWaitCycles = true;
}
- uint8_t trace[TRACE_BUFFER_SIZE];
- GetFromBigBuf(trace,TRACE_BUFFER_SIZE,0);
+// for the time being. Need better Bigbuf handling.
+#define TRACE_SIZE 3000
+
+ uint8_t trace[TRACE_SIZE];
+ GetFromBigBuf(trace, TRACE_SIZE, 0);
WaitForResponse(CMD_ACK,NULL);
PrintAndLog("Recorded Activity");
for (;;) {
- if( tracepos >= TRACE_BUFFER_SIZE) break;
+ if(tracepos >= TRACE_SIZE) {
+ break;
+ }
timestamp = *((uint32_t *)(trace + tracepos));
if(tracepos == 0) {
parity_len = (data_len-1)/8 + 1;
-
- if (tracepos + data_len + parity_len >= TRACE_BUFFER_SIZE) { break; }
+ if (tracepos + data_len + parity_len >= TRACE_SIZE) {
+ break;
+ }
uint8_t *frame = trace + tracepos;
tracepos += data_len;
} else {
sprintf(crc, "");
}
+ }
EndOfTransmissionTimestamp = timestamp + duration;
crc);
bool next_isResponse = *((uint16_t *)(trace + tracepos + 6)) & 0x8000;
+
if (ShowWaitCycles && !isResponse && next_isResponse) {
uint32_t next_timestamp = *((uint32_t *)(trace + tracepos));
if (next_timestamp != 0x44444444) {
(next_timestamp - EndOfTransmissionTimestamp));
}
}
- }
+
}
+
return 0;
}
int CmdHF14AReader(const char *Cmd)
{
- UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_CONNECT, 0, 0}};
+ //UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_CONNECT | ISO14A_NO_DISCONNECT, 0, 0}};
+ UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_CONNECT , 0, 0}};
SendCommand(&c);
UsbCommand resp;
WaitForResponse(CMD_ACK,&resp);
- iso14a_card_select_t *card = (iso14a_card_select_t *)resp.d.asBytes;
+ iso14a_card_select_t card;
+ memcpy(&card, (iso14a_card_select_t *)resp.d.asBytes, sizeof(iso14a_card_select_t));
- if(resp.arg[0] == 0) {
+ uint64_t select_status = resp.arg[0]; // 0: couldn't read, 1: OK, with ATS, 2: OK, no ATS
+
+ if(select_status == 0) {
PrintAndLog("iso14443a card select failed");
return 0;
}
- PrintAndLog("ATQA : %02x %02x", card->atqa[0], card->atqa[1]);
- PrintAndLog(" UID : %s", sprint_hex(card->uid, card->uidlen));
- PrintAndLog(" SAK : %02x [%d]", card->sak, resp.arg[0]);
+ PrintAndLog("ATQA : %02x %02x", card.atqa[1], card.atqa[0]);
+ PrintAndLog(" UID : %s", sprint_hex(card.uid, card.uidlen));
+ PrintAndLog(" SAK : %02x [%d]", card.sak, resp.arg[0]);
- switch (card->sak) {
+ switch (card.sak) {
case 0x00: PrintAndLog("TYPE : NXP MIFARE Ultralight | Ultralight C"); break;
- case 0x01: PrintAndLog("TYPE : NXP TNP3xxx Activision Game Appliance"); break;
+ case 0x01: PrintAndLog("TYPE : NXP TNP3xxx Activision Game Appliance"); break;
case 0x04: PrintAndLog("TYPE : NXP MIFARE (various !DESFire !DESFire EV1)"); break;
case 0x08: PrintAndLog("TYPE : NXP MIFARE CLASSIC 1k | Plus 2k SL1"); break;
case 0x09: PrintAndLog("TYPE : NXP MIFARE Mini 0.3k"); break;
case 0x98: PrintAndLog("TYPE : Gemplus MPCOS"); break;
default: ;
}
- if(resp.arg[0] == 1) {
+
+
+ // try to request ATS even if tag claims not to support it
+ if (select_status == 2) {
+ uint8_t rats[] = { 0xE0, 0x80 }; // FSDI=8 (FSD=256), CID=0
+ c.arg[0] = ISO14A_RAW | ISO14A_APPEND_CRC | ISO14A_NO_DISCONNECT;
+ c.arg[1] = 2;
+ c.arg[2] = 0;
+ memcpy(c.d.asBytes, rats, 2);
+ SendCommand(&c);
+ WaitForResponse(CMD_ACK,&resp);
+
+ memcpy(&card.ats, resp.d.asBytes, resp.arg[0]);
+ card.ats_len = resp.arg[0]; // note: ats_len includes CRC Bytes
+ }
+
+ // disconnect
+ c.arg[0] = 0;
+ c.arg[1] = 0;
+ c.arg[2] = 0;
+ SendCommand(&c);
+
+
+ if(card.ats_len >= 3) { // a valid ATS consists of at least the length byte (TL) and 2 CRC bytes
bool ta1 = 0, tb1 = 0, tc1 = 0;
int pos;
- PrintAndLog(" ATS : %s", sprint_hex(card->ats, card->ats_len));
- if (card->ats_len > 0) {
- PrintAndLog(" - TL : length is %d bytes", card->ats[0]);
+ if (select_status == 2) {
+ PrintAndLog("SAK incorrectly claims that card doesn't support RATS");
+ }
+ PrintAndLog(" ATS : %s", sprint_hex(card.ats, card.ats_len));
+ PrintAndLog(" - TL : length is %d bytes", card.ats[0]);
+ if (card.ats[0] != card.ats_len - 2) {
+ PrintAndLog("ATS may be corrupted. Length of ATS (%d bytes incl. 2 Bytes CRC) doesn't match TL", card.ats_len);
}
- if (card->ats_len > 1) {
- ta1 = (card->ats[1] & 0x10) == 0x10;
- tb1 = (card->ats[1] & 0x20) == 0x20;
- tc1 = (card->ats[1] & 0x40) == 0x40;
+
+ if (card.ats[0] > 1) { // there is a format byte (T0)
+ ta1 = (card.ats[1] & 0x10) == 0x10;
+ tb1 = (card.ats[1] & 0x20) == 0x20;
+ tc1 = (card.ats[1] & 0x40) == 0x40;
+ int16_t fsci = card.ats[1] & 0x0f;
PrintAndLog(" - T0 : TA1 is%s present, TB1 is%s present, "
- "TC1 is%s present, FSCI is %d",
+ "TC1 is%s present, FSCI is %d (FSC = %ld)",
(ta1 ? "" : " NOT"), (tb1 ? "" : " NOT"), (tc1 ? "" : " NOT"),
- (card->ats[1] & 0x0f));
+ fsci,
+ fsci < 5 ? (fsci - 2) * 8 :
+ fsci < 8 ? (fsci - 3) * 32 :
+ fsci == 8 ? 256 :
+ -1
+ );
}
pos = 2;
- if (ta1 && card->ats_len > pos) {
+ if (ta1) {
char dr[16], ds[16];
dr[0] = ds[0] = '\0';
- if (card->ats[pos] & 0x10) strcat(ds, "2, ");
- if (card->ats[pos] & 0x20) strcat(ds, "4, ");
- if (card->ats[pos] & 0x40) strcat(ds, "8, ");
- if (card->ats[pos] & 0x01) strcat(dr, "2, ");
- if (card->ats[pos] & 0x02) strcat(dr, "4, ");
- if (card->ats[pos] & 0x04) strcat(dr, "8, ");
+ if (card.ats[pos] & 0x10) strcat(ds, "2, ");
+ if (card.ats[pos] & 0x20) strcat(ds, "4, ");
+ if (card.ats[pos] & 0x40) strcat(ds, "8, ");
+ if (card.ats[pos] & 0x01) strcat(dr, "2, ");
+ if (card.ats[pos] & 0x02) strcat(dr, "4, ");
+ if (card.ats[pos] & 0x04) strcat(dr, "8, ");
if (strlen(ds) != 0) ds[strlen(ds) - 2] = '\0';
if (strlen(dr) != 0) dr[strlen(dr) - 2] = '\0';
PrintAndLog(" - TA1 : different divisors are%s supported, "
"DR: [%s], DS: [%s]",
- (card->ats[pos] & 0x80 ? " NOT" : ""), dr, ds);
+ (card.ats[pos] & 0x80 ? " NOT" : ""), dr, ds);
pos++;
}
- if (tb1 && card->ats_len > pos) {
- PrintAndLog(" - TB1 : SFGI = %d, FWI = %d",
- (card->ats[pos] & 0x08),
- (card->ats[pos] & 0x80) >> 4);
+ if (tb1) {
+ uint32_t sfgi = card.ats[pos] & 0x0F;
+ uint32_t fwi = card.ats[pos] >> 4;
+ PrintAndLog(" - TB1 : SFGI = %d (SFGT = %s%ld/fc), FWI = %d (FWT = %ld/fc)",
+ (sfgi),
+ sfgi ? "" : "(not needed) ",
+ sfgi ? (1 << 12) << sfgi : 0,
+ fwi,
+ (1 << 12) << fwi
+ );
pos++;
}
- if (tc1 && card->ats_len > pos) {
+ if (tc1) {
PrintAndLog(" - TC1 : NAD is%s supported, CID is%s supported",
- (card->ats[pos] & 0x01) ? "" : " NOT",
- (card->ats[pos] & 0x02) ? "" : " NOT");
+ (card.ats[pos] & 0x01) ? "" : " NOT",
+ (card.ats[pos] & 0x02) ? "" : " NOT");
pos++;
}
- if (card->ats_len > pos) {
+ if (card.ats[0] > pos) {
char *tip = "";
- if (card->ats_len - pos > 7) {
- if (memcmp(card->ats + pos, "\xC1\x05\x2F\x2F\x01\xBC\xD6", 7) == 0) {
+ if (card.ats[0] - pos >= 7) {
+ if (memcmp(card.ats + pos, "\xC1\x05\x2F\x2F\x01\xBC\xD6", 7) == 0) {
tip = "-> MIFARE Plus X 2K or 4K";
- } else if (memcmp(card->ats + pos, "\xC1\x05\x2F\x2F\x00\x35\xC7", 7) == 0) {
+ } else if (memcmp(card.ats + pos, "\xC1\x05\x2F\x2F\x00\x35\xC7", 7) == 0) {
tip = "-> MIFARE Plus S 2K or 4K";
}
}
- PrintAndLog(" - HB : %s%s", sprint_hex(card->ats + pos, card->ats_len - pos - 2), tip);
- if (card->ats[pos] == 0xC1) {
+ PrintAndLog(" - HB : %s%s", sprint_hex(card.ats + pos, card.ats[0] - pos), tip);
+ if (card.ats[pos] == 0xC1) {
PrintAndLog(" c1 -> Mifare or (multiple) virtual cards of various type");
PrintAndLog(" %02x -> Length is %d bytes",
- card->ats[pos + 1], card->ats[pos + 1]);
- switch (card->ats[pos + 2] & 0xf0) {
+ card.ats[pos + 1], card.ats[pos + 1]);
+ switch (card.ats[pos + 2] & 0xf0) {
case 0x10:
PrintAndLog(" 1x -> MIFARE DESFire");
break;
PrintAndLog(" 2x -> MIFARE Plus");
break;
}
- switch (card->ats[pos + 2] & 0x0f) {
+ switch (card.ats[pos + 2] & 0x0f) {
case 0x00:
PrintAndLog(" x0 -> <1 kByte");
break;
PrintAndLog(" x0 -> 8 kByte");
break;
}
- switch (card->ats[pos + 3] & 0xf0) {
+ switch (card.ats[pos + 3] & 0xf0) {
case 0x00:
PrintAndLog(" 0x -> Engineering sample");
break;
PrintAndLog(" 2x -> Released");
break;
}
- switch (card->ats[pos + 3] & 0x0f) {
+ switch (card.ats[pos + 3] & 0x0f) {
case 0x00:
PrintAndLog(" x0 -> Generation 1");
break;
PrintAndLog(" x2 -> Generation 3");
break;
}
- switch (card->ats[pos + 4] & 0x0f) {
+ switch (card.ats[pos + 4] & 0x0f) {
case 0x00:
PrintAndLog(" x0 -> Only VCSL supported");
break;
}
}
} else {
- PrintAndLog("proprietary non iso14443a-4 card found, RATS not supported");
+ PrintAndLog("proprietary non iso14443-4 card found, RATS not supported");
}
- return resp.arg[0];
+ return select_status;
}
// Collect ISO14443 Type A UIDs
UsbCommand resp;
WaitForResponse(CMD_ACK,&resp);
- uint8_t *uid = resp.d.asBytes;
- iso14a_card_select_t *card = (iso14a_card_select_t *)(uid + 12);
+ iso14a_card_select_t *card = (iso14a_card_select_t *) resp.d.asBytes;
// check if command failed
if (resp.arg[0] == 0) {
PrintAndLog("Card select failed.");
} else {
- // check if UID is 4 bytes
- if ((card->atqa[1] & 0xC0) == 0) {
- PrintAndLog("%02X%02X%02X%02X",
- *uid, *(uid + 1), *(uid + 2), *(uid + 3));
- } else {
- PrintAndLog("UID longer than 4 bytes");
+ char uid_string[20];
+ for (uint16_t i = 0; i < card->uidlen; i++) {
+ sprintf(&uid_string[2*i], "%02X", card->uid[i]);
}
+ PrintAndLog("%s", uid_string);
}
}
PrintAndLog("End: %u", time(NULL));
projects / proxmark3-svn / blobdiff