#define ICLASS_CMD_READ4 0x06
-#define ISO14443_CMD_REQA 0x26
-#define ISO14443_CMD_READBLOCK 0x30
-#define ISO14443_CMD_WUPA 0x52
-#define ISO14443_CMD_ANTICOLL_OR_SELECT 0x93
-#define ISO14443_CMD_ANTICOLL_OR_SELECT_2 0x95
-#define ISO14443_CMD_WRITEBLOCK 0xA0 // or 0xA2 ?
-#define ISO14443_CMD_HALT 0x50
-#define ISO14443_CMD_RATS 0xE0
+#define ISO14443A_CMD_REQA 0x26
+#define ISO14443A_CMD_READBLOCK 0x30
+#define ISO14443A_CMD_WUPA 0x52
+#define ISO14443A_CMD_ANTICOLL_OR_SELECT 0x93
+#define ISO14443A_CMD_ANTICOLL_OR_SELECT_2 0x95
+#define ISO14443A_CMD_WRITEBLOCK 0xA0 // or 0xA2 ?
+#define ISO14443A_CMD_HALT 0x50
+#define ISO14443A_CMD_RATS 0xE0
#define MIFARE_AUTH_KEYA 0x60
#define MIFARE_AUTH_KEYB 0x61
#define ISO15693_READ_MULTI_SECSTATUS 0x2C
+#define ISO_14443A 0
+#define ICLASS 1
+#define ISO_14443B 2
void annotateIso14443a(char *exp, size_t size, uint8_t* cmd, uint8_t cmdsize)
{
switch(cmd[0])
{
- case ISO14443_CMD_WUPA: snprintf(exp,size,"WUPA"); break;
- case ISO14443_CMD_ANTICOLL_OR_SELECT:{
+ case ISO14443A_CMD_WUPA: snprintf(exp,size,"WUPA"); break;
+ case ISO14443A_CMD_ANTICOLL_OR_SELECT:{
// 93 20 = Anticollision (usage: 9320 - answer: 4bytes UID+1byte UID-bytes-xor)
// 93 70 = Select (usage: 9370+5bytes 9320 answer - answer: 1byte SAK)
if(cmd[2] == 0x70)
snprintf(exp,size,"ANTICOLL"); break;
}
}
- case ISO14443_CMD_ANTICOLL_OR_SELECT_2:{
+ case ISO14443A_CMD_ANTICOLL_OR_SELECT_2:{
//95 20 = Anticollision of cascade level2
//95 70 = Select of cascade level2
if(cmd[2] == 0x70)
snprintf(exp,size,"ANTICOLL-2"); break;
}
}
- case ISO14443_CMD_REQA: snprintf(exp,size,"REQA"); break;
- case ISO14443_CMD_READBLOCK: snprintf(exp,size,"READBLOCK(%d)",cmd[1]); break;
- case ISO14443_CMD_WRITEBLOCK: snprintf(exp,size,"WRITEBLOCK(%d)",cmd[1]); break;
- case ISO14443_CMD_HALT: snprintf(exp,size,"HALT"); break;
- case ISO14443_CMD_RATS: snprintf(exp,size,"RATS"); break;
+ case ISO14443A_CMD_REQA: snprintf(exp,size,"REQA"); break;
+ case ISO14443A_CMD_READBLOCK: snprintf(exp,size,"READBLOCK(%d)",cmd[1]); break;
+ case ISO14443A_CMD_WRITEBLOCK: snprintf(exp,size,"WRITEBLOCK(%d)",cmd[1]); break;
+ case ISO14443A_CMD_HALT: snprintf(exp,size,"HALT"); break;
+ case ISO14443A_CMD_RATS: snprintf(exp,size,"RATS"); break;
case MIFARE_CMD_INC: snprintf(exp,size,"INC(%d)",cmd[1]); break;
case MIFARE_CMD_DEC: snprintf(exp,size,"DEC(%d)",cmd[1]); break;
case MIFARE_CMD_RESTORE: snprintf(exp,size,"RESTORE(%d)",cmd[1]); break;
case ISO15693_LOCK_DSFID :snprintf(exp, size, "LOCK_DSFID");break;
case ISO15693_GET_SYSTEM_INFO :snprintf(exp, size, "GET_SYSTEM_INFO");break;
case ISO15693_READ_MULTI_SECSTATUS :snprintf(exp, size, "READ_MULTI_SECSTATUS");break;
- default: snprintf(exp,size,"?"); break;
+ default: snprintf(exp,size,"?"); break;
}
}
}
+void annotateIso14443b(char *exp, size_t size, uint8_t* cmd, uint8_t cmdsize)
+{
+ switch(cmd[0]){
+ case ISO14443B_REQB : snprintf(exp,size,"REQB");break;
+ case ISO14443B_ATTRIB : snprintf(exp,size,"ATTRIB");break;
+ case ISO14443B_HALT : snprintf(exp,size,"HALT");break;
+ default: snprintf(exp,size ,"?");break;
+ }
+
+}
+
+/**
+ * @brief iso14443B_CRC_Ok Checks CRC in command or response
+ * @param isResponse
+ * @param data
+ * @param len
+ * @return 0 : CRC-command, CRC not ok
+ * 1 : CRC-command, CRC ok
+ * 2 : Not crc-command
+ */
+
+uint8_t iso14443B_CRC_check(bool isResponse, uint8_t* data, uint8_t len)
+{
+ uint8_t b1,b2;
+
+ if(len <= 2) return 2;
+
+ ComputeCrc14443(CRC_14443_B, data, len-2, &b1, &b2);
+ if(b1 != data[len-2] || b2 != data[len-1]) {
+ return 0;
+ }
+ return 1;
+}
+
/**
* @brief iclass_CRC_Ok Checks CRC in command or response
* @param isResponse
* 1 : CRC-command, CRC ok
* 2 : Not crc-command
*/
-uint8_t iclass_CRC_Ok(bool isResponse, uint8_t* data, uint8_t len)
+uint8_t iclass_CRC_check(bool isResponse, uint8_t* data, uint8_t len)
{
if(len < 4) return 2;//CRC commands (and responses) are all at least 4 bytes
}
}
-uint16_t printTraceLine(uint16_t tracepos, uint8_t* trace, bool iclass, bool showWaitCycles)
+uint16_t printTraceLine(uint16_t tracepos, uint8_t* trace, uint8_t protocol, bool showWaitCycles)
{
bool isResponse;
uint16_t duration, data_len,parity_len;
if (tracepos + data_len + parity_len >= TRACE_SIZE) {
return TRACE_SIZE;
}
-
uint8_t *frame = trace + tracepos;
tracepos += data_len;
uint8_t *parityBytes = trace + tracepos;
tracepos += parity_len;
+
//--- Draw the data column
+ //char line[16][110];
char line[16][110];
- for (int j = 0; j < data_len; j++) {
+
+ for (int j = 0; j < data_len && j/16 < 16; j++) {
+
int oddparity = 0x01;
int k;
}
uint8_t parityBits = parityBytes[j>>3];
-
if (isResponse && (oddparity != ((parityBits >> (7-(j&0x0007))) & 0x01))) {
- sprintf(line[j/16]+((j%16)*4), "%02x! ", frame[j]);
+ snprintf(line[j/16]+(( j % 16) * 4),110, "%02x! ", frame[j]);
+
} else {
- sprintf(line[j/16]+((j%16)*4), "%02x ", frame[j]);
+ snprintf(line[j/16]+(( j % 16) * 4),110, "%02x! ", frame[j]);
+ }
+ }
+ if(data_len == 0)
+ {
+ if(data_len == 0){
+ sprintf(line[0],"<empty trace - possible error>");
}
}
//--- Draw the CRC column
if (data_len > 2) {
uint8_t b1, b2;
- if(iclass)
+ if(protocol == ICLASS)
{
- //The following commands have crc
- crcStatus = iclass_CRC_Ok(isResponse, frame, data_len);
+ crcStatus = iclass_CRC_check(isResponse, frame, data_len);
- }else{//Iso 14443a
+ }else if (protocol == ISO_14443B)
+ {
+ crcStatus = iso14443B_CRC_check(isResponse, frame, data_len);
+ }
+ else if (protocol == ISO_14443A){//Iso 14443a
ComputeCrc14443(CRC_14443_A, frame, data_len-2, &b1, &b2);
if(!isResponse)
{
- if(iclass)
+ if(protocol == ICLASS)
annotateIclass(explanation,sizeof(explanation),frame,data_len);
- else
+ else if (protocol == ISO_14443A)
annotateIso14443a(explanation,sizeof(explanation),frame,data_len);
+ else if(protocol == ISO_14443B)
+ annotateIso14443b(explanation,sizeof(explanation),frame,data_len);
}
- int num_lines = (data_len - 1)/16 + 1;
- for (int j = 0; j < num_lines; j++) {
+ int num_lines = MIN((data_len - 1)/16 + 1, 16);
+ for (int j = 0; j < num_lines ; j++) {
if (j == 0) {
PrintAndLog(" %9d | %9d | %s | %-64s| %s| %s",
(timestamp - first_timestamp),
int tlen = param_getstr(Cmd,0,type);
char param = param_getchar(Cmd, 1);
bool errors = false;
- bool iclass = false;
+ uint8_t protocol = 0;
//Validate params
- if(tlen == 0 || (strcmp(type, "iclass") != 0 && strcmp(type,"14a") != 0))
+ if(tlen == 0)
{
errors = true;
}
{
errors = true;
}
+ if(!errors)
+ {
+ if(strcmp(type, "iclass") == 0)
+ {
+ protocol = ICLASS;
+ }else if(strcmp(type, "14a") == 0)
+ {
+ protocol = ISO_14443A;
+ }
+ else if(strcmp(type, "14b") == 0)
+ {
+ protocol = ISO_14443B;
+ }else if(strcmp(type,"raw")== 0)
+ {
+ protocol = -1;//No crc, no annotations
+ }else{
+ errors = true;
+ }
+ }
if (errors) {
PrintAndLog("List protocol data in trace buffer.");
- PrintAndLog("Usage: hf list [14a|iclass] [f]");
+ PrintAndLog("Usage: hf list [14a|14b|iclass] [f]");
PrintAndLog(" 14a - interpret data as iso14443a communications");
+ PrintAndLog(" 14b - interpret data as iso14443b communications");
PrintAndLog(" iclass - interpret data as iclass communications");
+ PrintAndLog(" raw - just show raw data");
PrintAndLog(" f - show frame delay times as well");
PrintAndLog("");
PrintAndLog("example: hf list 14a f");
PrintAndLog("example: hf list iclass");
return 0;
}
- if(strcmp(type, "iclass") == 0)
- {
- iclass = true;
- }
+
if (param == 'f') {
showWaitCycles = true;
uint16_t tracepos = 0;
GetFromBigBuf(trace, TRACE_SIZE, 0);
WaitForResponse(CMD_ACK, NULL);
-
PrintAndLog("Recorded Activity");
PrintAndLog("");
PrintAndLog("Start = Start of Start Bit, End = End of last modulation. Src = Source of Transfer");
while(tracepos < TRACE_SIZE)
{
- tracepos = printTraceLine(tracepos, trace, iclass, showWaitCycles);
+ tracepos = printTraceLine(tracepos, trace, protocol, showWaitCycles);
}
return 0;
}
projects / proxmark3-svn / blobdiff