mirror of
https://github.com/RfidResearchGroup/proxmark3.git
synced 2024-09-20 23:36:31 +08:00
CHG: moved trace commands into its own category (from hf)
'trace list' there will also the load / save of trace buffer come. For backwardfunctionality the old commands still works.
This commit is contained in:
iceman1001
parent
4c666e3832
commit
71ce6e07ee
|
|
@ -180,6 +180,7 @@ CMDSRCS = crapto1/crapto1.c \
|
||||||
cmdlfti.c \
|
cmdlfti.c \
|
||||||
cmdlfviking.c \
|
cmdlfviking.c \
|
||||||
cmdlfvisa2000.c \
|
cmdlfvisa2000.c \
|
||||||
|
cmdtrace.c \
|
||||||
cmdparser.c \
|
cmdparser.c \
|
||||||
cmdmain.c \
|
cmdmain.c \
|
||||||
pm3_binlib.c \
|
pm3_binlib.c \
|
||||||
|
|
|
||||||
464
client/cmdhf.c
464
client/cmdhf.c
|
|
@ -12,32 +12,6 @@
|
||||||
|
|
||||||
static int CmdHelp(const char *Cmd);
|
static int CmdHelp(const char *Cmd);
|
||||||
|
|
||||||
int usage_hf_list(){
|
|
||||||
PrintAndLogEx(NORMAL, "List protocol data in trace buffer.");
|
|
||||||
PrintAndLogEx(NORMAL, "Usage: hf list <protocol> [f][c]");
|
|
||||||
PrintAndLogEx(NORMAL, " f - show frame delay times as well");
|
|
||||||
PrintAndLogEx(NORMAL, " c - mark CRC bytes");
|
|
||||||
PrintAndLogEx(NORMAL, "Supported <protocol> values:");
|
|
||||||
PrintAndLogEx(NORMAL, " raw - just show raw data without annotations");
|
|
||||||
PrintAndLogEx(NORMAL, " 14a - interpret data as iso14443a communications");
|
|
||||||
PrintAndLogEx(NORMAL, " mf - interpret data as iso14443a communications and decrypt crypto1 stream");
|
|
||||||
PrintAndLogEx(NORMAL, " 14b - interpret data as iso14443b communications");
|
|
||||||
PrintAndLogEx(NORMAL, " 15 - interpret data as iso15693 communications");
|
|
||||||
PrintAndLogEx(NORMAL, " des - interpret data as DESFire communications");
|
|
||||||
#ifdef WITH_EMV
|
|
||||||
PrintAndLogEx(NORMAL, " emv - interpret data as EMV / communications");
|
|
||||||
#endif
|
|
||||||
PrintAndLogEx(NORMAL, " iclass - interpret data as iclass communications");
|
|
||||||
PrintAndLogEx(NORMAL, " topaz - interpret data as topaz communications");
|
|
||||||
PrintAndLogEx(NORMAL, " 7816 - interpret data as iso7816-4 communications");
|
|
||||||
PrintAndLogEx(NORMAL, " legic - interpret data as LEGIC communications");
|
|
||||||
PrintAndLogEx(NORMAL, " felica - interpret data as ISO18092 / FeliCa communications");
|
|
||||||
PrintAndLogEx(NORMAL, "");
|
|
||||||
PrintAndLogEx(NORMAL, "Examples:");
|
|
||||||
PrintAndLogEx(NORMAL, " hf list 14a f");
|
|
||||||
PrintAndLogEx(NORMAL, " hf list iclass");
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
int usage_hf_search(){
|
int usage_hf_search(){
|
||||||
PrintAndLogEx(NORMAL, "Usage: hf search");
|
PrintAndLogEx(NORMAL, "Usage: hf search");
|
||||||
PrintAndLogEx(NORMAL, "Will try to find a HF read out of the unknown tag. Stops when found.");
|
PrintAndLogEx(NORMAL, "Will try to find a HF read out of the unknown tag. Stops when found.");
|
||||||
|
|
@ -62,442 +36,6 @@ int usage_hf_snoop(){
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool is_last_record(uint16_t tracepos, uint8_t *trace, uint16_t traceLen) {
|
|
||||||
return(tracepos + sizeof(uint32_t) + sizeof(uint16_t) + sizeof(uint16_t) >= traceLen);
|
|
||||||
}
|
|
||||||
|
|
||||||
bool next_record_is_response(uint16_t tracepos, uint8_t *trace) {
|
|
||||||
uint16_t next_records_datalen = *((uint16_t *)(trace + tracepos + sizeof(uint32_t) + sizeof(uint16_t)));
|
|
||||||
return(next_records_datalen & 0x8000);
|
|
||||||
}
|
|
||||||
|
|
||||||
bool merge_topaz_reader_frames(uint32_t timestamp, uint32_t *duration, uint16_t *tracepos, uint16_t traceLen,
|
|
||||||
uint8_t *trace, uint8_t *frame, uint8_t *topaz_reader_command, uint16_t *data_len) {
|
|
||||||
|
|
||||||
#define MAX_TOPAZ_READER_CMD_LEN 16
|
|
||||||
|
|
||||||
uint32_t last_timestamp = timestamp + *duration;
|
|
||||||
|
|
||||||
if ((*data_len != 1) || (frame[0] == TOPAZ_WUPA) || (frame[0] == TOPAZ_REQA)) return false;
|
|
||||||
|
|
||||||
memcpy(topaz_reader_command, frame, *data_len);
|
|
||||||
|
|
||||||
while (!is_last_record(*tracepos, trace, traceLen) && !next_record_is_response(*tracepos, trace)) {
|
|
||||||
uint32_t next_timestamp = *((uint32_t *)(trace + *tracepos));
|
|
||||||
*tracepos += sizeof(uint32_t);
|
|
||||||
uint16_t next_duration = *((uint16_t *)(trace + *tracepos));
|
|
||||||
*tracepos += sizeof(uint16_t);
|
|
||||||
uint16_t next_data_len = *((uint16_t *)(trace + *tracepos)) & 0x7FFF;
|
|
||||||
*tracepos += sizeof(uint16_t);
|
|
||||||
uint8_t *next_frame = (trace + *tracepos);
|
|
||||||
*tracepos += next_data_len;
|
|
||||||
if ((next_data_len == 1) && (*data_len + next_data_len <= MAX_TOPAZ_READER_CMD_LEN)) {
|
|
||||||
memcpy(topaz_reader_command + *data_len, next_frame, next_data_len);
|
|
||||||
*data_len += next_data_len;
|
|
||||||
last_timestamp = next_timestamp + next_duration;
|
|
||||||
} else {
|
|
||||||
// rewind and exit
|
|
||||||
*tracepos = *tracepos - next_data_len - sizeof(uint16_t) - sizeof(uint16_t) - sizeof(uint32_t);
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
uint16_t next_parity_len = (next_data_len-1)/8 + 1;
|
|
||||||
*tracepos += next_parity_len;
|
|
||||||
}
|
|
||||||
|
|
||||||
*duration = last_timestamp - timestamp;
|
|
||||||
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
uint16_t printTraceLine(uint16_t tracepos, uint16_t traceLen, uint8_t *trace, uint8_t protocol, bool showWaitCycles, bool markCRCBytes) {
|
|
||||||
// sanity check
|
|
||||||
if (tracepos + sizeof(uint32_t) + sizeof(uint16_t) + sizeof(uint16_t) > traceLen) return traceLen;
|
|
||||||
|
|
||||||
bool isResponse;
|
|
||||||
uint16_t data_len, parity_len;
|
|
||||||
uint32_t duration, timestamp, first_timestamp, EndOfTransmissionTimestamp;
|
|
||||||
uint8_t topaz_reader_command[9];
|
|
||||||
char explanation[30] = {0};
|
|
||||||
uint8_t mfData[32] = {0};
|
|
||||||
size_t mfDataLen = 0;
|
|
||||||
|
|
||||||
|
|
||||||
first_timestamp = *((uint32_t *)(trace));
|
|
||||||
timestamp = *((uint32_t *)(trace + tracepos));
|
|
||||||
tracepos += 4;
|
|
||||||
|
|
||||||
duration = *((uint16_t *)(trace + tracepos));
|
|
||||||
tracepos += 2;
|
|
||||||
|
|
||||||
data_len = *((uint16_t *)(trace + tracepos));
|
|
||||||
tracepos += 2;
|
|
||||||
|
|
||||||
if (data_len & 0x8000) {
|
|
||||||
data_len &= 0x7fff;
|
|
||||||
isResponse = true;
|
|
||||||
} else {
|
|
||||||
isResponse = false;
|
|
||||||
}
|
|
||||||
parity_len = (data_len-1)/8 + 1;
|
|
||||||
|
|
||||||
if (tracepos + data_len + parity_len > traceLen) {
|
|
||||||
return traceLen;
|
|
||||||
}
|
|
||||||
uint8_t *frame = trace + tracepos;
|
|
||||||
tracepos += data_len;
|
|
||||||
uint8_t *parityBytes = trace + tracepos;
|
|
||||||
tracepos += parity_len;
|
|
||||||
|
|
||||||
if (protocol == TOPAZ && !isResponse) {
|
|
||||||
// topaz reader commands come in 1 or 9 separate frames with 7 or 8 Bits each.
|
|
||||||
// merge them:
|
|
||||||
if (merge_topaz_reader_frames(timestamp, &duration, &tracepos, traceLen, trace, frame, topaz_reader_command, &data_len)) {
|
|
||||||
frame = topaz_reader_command;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
//Check the CRC status
|
|
||||||
uint8_t crcStatus = 2;
|
|
||||||
|
|
||||||
if (data_len > 2) {
|
|
||||||
switch (protocol) {
|
|
||||||
case ICLASS:
|
|
||||||
crcStatus = iclass_CRC_check(isResponse, frame, data_len);
|
|
||||||
break;
|
|
||||||
case ISO_14443B:
|
|
||||||
case TOPAZ:
|
|
||||||
case FELICA:
|
|
||||||
crcStatus = iso14443B_CRC_check(frame, data_len);
|
|
||||||
break;
|
|
||||||
case PROTO_MIFARE:
|
|
||||||
crcStatus = mifare_CRC_check(isResponse, frame, data_len);
|
|
||||||
case ISO_14443A:
|
|
||||||
case MFDES:
|
|
||||||
crcStatus = iso14443A_CRC_check(isResponse, frame, data_len);
|
|
||||||
break;
|
|
||||||
case ISO_15693:
|
|
||||||
crcStatus = iso15693_CRC_check(frame, data_len);
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
//0 CRC-command, CRC not ok
|
|
||||||
//1 CRC-command, CRC ok
|
|
||||||
//2 Not crc-command
|
|
||||||
|
|
||||||
//--- Draw the data column
|
|
||||||
char line[18][110];
|
|
||||||
|
|
||||||
for (int j = 0; j < data_len && j/18 < 18; j++) {
|
|
||||||
|
|
||||||
uint8_t parityBits = parityBytes[j >> 3];
|
|
||||||
if (protocol != LEGIC &&
|
|
||||||
protocol != ISO_14443B &&
|
|
||||||
protocol != ISO_7816_4 &&
|
|
||||||
(isResponse || protocol == ISO_14443A) &&
|
|
||||||
(oddparity8(frame[j]) != ((parityBits >> (7-(j&0x0007))) & 0x01))) {
|
|
||||||
|
|
||||||
snprintf(line[j/18]+(( j % 18) * 4),110, "%02x! ", frame[j]);
|
|
||||||
} else {
|
|
||||||
snprintf(line[j/18]+(( j % 18) * 4),110, "%02x ", frame[j]);
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
if (markCRCBytes) {
|
|
||||||
//CRC-command
|
|
||||||
if(crcStatus == 0 || crcStatus == 1) {
|
|
||||||
char *pos1 = line[(data_len-2)/18]+(((data_len-2) % 18) * 4);
|
|
||||||
(*pos1) = '[';
|
|
||||||
char *pos2 = line[(data_len)/18]+(((data_len) % 18) * 4);
|
|
||||||
sprintf(pos2, "%c", ']');
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (data_len == 0 ) {
|
|
||||||
sprintf(line[0],"<empty trace - possible error>");
|
|
||||||
return tracepos;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Draw the CRC column
|
|
||||||
char *crc = (crcStatus == 0 ? "!crc" : (crcStatus == 1 ? " ok " : " "));
|
|
||||||
|
|
||||||
EndOfTransmissionTimestamp = timestamp + duration;
|
|
||||||
|
|
||||||
// Always annotate LEGIC read/tag
|
|
||||||
if ( protocol == LEGIC )
|
|
||||||
annotateLegic(explanation, sizeof(explanation), frame, data_len);
|
|
||||||
|
|
||||||
if ( protocol == PROTO_MIFARE )
|
|
||||||
annotateMifare(explanation, sizeof(explanation), frame, data_len, parityBytes, parity_len, isResponse);
|
|
||||||
|
|
||||||
if (!isResponse) {
|
|
||||||
switch(protocol) {
|
|
||||||
case ICLASS: annotateIclass(explanation,sizeof(explanation),frame,data_len); break;
|
|
||||||
case ISO_14443A: annotateIso14443a(explanation,sizeof(explanation),frame,data_len); break;
|
|
||||||
case MFDES: annotateMfDesfire(explanation,sizeof(explanation),frame,data_len); break;
|
|
||||||
case ISO_14443B: annotateIso14443b(explanation,sizeof(explanation),frame,data_len); break;
|
|
||||||
case TOPAZ: annotateTopaz(explanation,sizeof(explanation),frame,data_len); break;
|
|
||||||
case ISO_7816_4: annotateIso7816(explanation,sizeof(explanation),frame,data_len); break;
|
|
||||||
case ISO_15693: annotateIso15693(explanation,sizeof(explanation),frame,data_len); break;
|
|
||||||
case FELICA: annotateFelica(explanation,sizeof(explanation),frame,data_len); break;
|
|
||||||
default: break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
int num_lines = MIN((data_len - 1)/18 + 1, 18);
|
|
||||||
for (int j = 0; j < num_lines ; j++) {
|
|
||||||
if (j == 0) {
|
|
||||||
PrintAndLogEx(NORMAL, " %10u | %10u | %s |%-72s | %s| %s",
|
|
||||||
(timestamp - first_timestamp),
|
|
||||||
(EndOfTransmissionTimestamp - first_timestamp),
|
|
||||||
(isResponse ? "Tag" : "Rdr"),
|
|
||||||
line[j],
|
|
||||||
(j == num_lines-1) ? crc : " ",
|
|
||||||
(j == num_lines-1) ? explanation : "");
|
|
||||||
} else {
|
|
||||||
PrintAndLogEx(NORMAL, " | | |%-72s | %s| %s",
|
|
||||||
line[j],
|
|
||||||
(j == num_lines-1) ? crc : " ",
|
|
||||||
(j == num_lines-1) ? explanation : "");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (DecodeMifareData(frame, data_len, parityBytes, isResponse, mfData, &mfDataLen)) {
|
|
||||||
memset(explanation, 0x00, sizeof(explanation));
|
|
||||||
if (!isResponse) {
|
|
||||||
annotateIso14443a(explanation, sizeof(explanation), mfData, mfDataLen);
|
|
||||||
}
|
|
||||||
uint8_t crcc = iso14443A_CRC_check(isResponse, mfData, mfDataLen);
|
|
||||||
PrintAndLogEx(NORMAL, " | | * |%-72s | %-4s| %s",
|
|
||||||
sprint_hex_inrow_spaces(mfData, mfDataLen, 2),
|
|
||||||
(crcc == 0 ? "!crc" : (crcc == 1 ? " ok " : " ")),
|
|
||||||
explanation);
|
|
||||||
};
|
|
||||||
|
|
||||||
if (is_last_record(tracepos, trace, traceLen)) return traceLen;
|
|
||||||
|
|
||||||
if (showWaitCycles && !isResponse && next_record_is_response(tracepos, trace)) {
|
|
||||||
uint32_t next_timestamp = *((uint32_t *)(trace + tracepos));
|
|
||||||
PrintAndLogEx(NORMAL, " %10u | %10u | %s |fdt (Frame Delay Time): %d",
|
|
||||||
(EndOfTransmissionTimestamp - first_timestamp),
|
|
||||||
(next_timestamp - first_timestamp),
|
|
||||||
" ",
|
|
||||||
(next_timestamp - EndOfTransmissionTimestamp));
|
|
||||||
}
|
|
||||||
|
|
||||||
return tracepos;
|
|
||||||
}
|
|
||||||
|
|
||||||
void printFelica(uint16_t traceLen, uint8_t *trace) {
|
|
||||||
|
|
||||||
PrintAndLogEx(NORMAL, " Gap | Src | Data | CRC | Annotation |");
|
|
||||||
PrintAndLogEx(NORMAL, "--------|-----|---------------------------------|----------|-------------------|");
|
|
||||||
uint16_t tracepos = 0;
|
|
||||||
|
|
||||||
while( tracepos < traceLen) {
|
|
||||||
|
|
||||||
if (tracepos + 3 >= traceLen) break;
|
|
||||||
|
|
||||||
uint16_t gap = (uint16_t)trace[tracepos+1] + ((uint16_t)trace[tracepos] >> 8);
|
|
||||||
uint16_t crc_ok = trace[tracepos+2];
|
|
||||||
tracepos += 3;
|
|
||||||
|
|
||||||
if (tracepos + 3 >= traceLen) break;
|
|
||||||
|
|
||||||
uint16_t len = trace[tracepos+2];
|
|
||||||
|
|
||||||
//I am stripping SYNC
|
|
||||||
tracepos += 3; //skip SYNC
|
|
||||||
|
|
||||||
if( tracepos + len + 1 >= traceLen) break;
|
|
||||||
|
|
||||||
uint8_t cmd = trace[tracepos];
|
|
||||||
uint8_t isResponse = cmd&1;
|
|
||||||
|
|
||||||
char line[32][110];
|
|
||||||
for (int j = 0; j < len+1 && j/8 < 32; j++) {
|
|
||||||
snprintf(line[j/8]+(( j % 8) * 4), 110, " %02x ", trace[tracepos+j]);
|
|
||||||
}
|
|
||||||
char expbuf[50];
|
|
||||||
switch(cmd) {
|
|
||||||
case FELICA_POLL_REQ: snprintf(expbuf,49,"Poll Req");break;
|
|
||||||
case FELICA_POLL_ACK: snprintf(expbuf,49,"Poll Resp");break;
|
|
||||||
|
|
||||||
case FELICA_REQSRV_REQ: snprintf(expbuf,49,"Request Srvc Req");break;
|
|
||||||
case FELICA_REQSRV_ACK: snprintf(expbuf,49,"Request Srv Resp");break;
|
|
||||||
|
|
||||||
case FELICA_RDBLK_REQ: snprintf(expbuf,49,"Read block(s) Req");break;
|
|
||||||
case FELICA_RDBLK_ACK: snprintf(expbuf,49,"Read block(s) Resp");break;
|
|
||||||
|
|
||||||
case FELICA_WRTBLK_REQ: snprintf(expbuf,49,"Write block(s) Req");break;
|
|
||||||
case FELICA_WRTBLK_ACK: snprintf(expbuf,49,"Write block(s) Resp");break;
|
|
||||||
case FELICA_SRCHSYSCODE_REQ: snprintf(expbuf,49,"Search syscode Req");break;
|
|
||||||
case FELICA_SRCHSYSCODE_ACK: snprintf(expbuf,49,"Search syscode Resp");break;
|
|
||||||
|
|
||||||
case FELICA_REQSYSCODE_REQ: snprintf(expbuf,49,"Request syscode Req");break;
|
|
||||||
case FELICA_REQSYSCODE_ACK: snprintf(expbuf,49,"Request syscode Resp");break;
|
|
||||||
|
|
||||||
case FELICA_AUTH1_REQ: snprintf(expbuf,49,"Auth1 Req");break;
|
|
||||||
case FELICA_AUTH1_ACK: snprintf(expbuf,49,"Auth1 Resp");break;
|
|
||||||
|
|
||||||
case FELICA_AUTH2_REQ: snprintf(expbuf,49,"Auth2 Req");break;
|
|
||||||
case FELICA_AUTH2_ACK: snprintf(expbuf,49,"Auth2 Resp");break;
|
|
||||||
|
|
||||||
case FELICA_RDSEC_REQ: snprintf(expbuf,49,"Secure read Req");break;
|
|
||||||
case FELICA_RDSEC_ACK: snprintf(expbuf,49,"Secure read Resp");break;
|
|
||||||
|
|
||||||
case FELICA_WRTSEC_REQ: snprintf(expbuf,49,"Secure write Req");break;
|
|
||||||
case FELICA_WRTSEC_ACK: snprintf(expbuf,49,"Secure write Resp");break;
|
|
||||||
|
|
||||||
case FELICA_REQSRV2_REQ: snprintf(expbuf,49,"Request Srvc v2 Req");break;
|
|
||||||
case FELICA_REQSRV2_ACK: snprintf(expbuf,49,"Request Srvc v2 Resp");break;
|
|
||||||
|
|
||||||
case FELICA_GETSTATUS_REQ: snprintf(expbuf,49,"Get status Req");break;
|
|
||||||
case FELICA_GETSTATUS_ACK: snprintf(expbuf,49,"Get status Resp");break;
|
|
||||||
|
|
||||||
case FELICA_OSVER_REQ: snprintf(expbuf,49,"Get OS Version Req");break;
|
|
||||||
case FELICA_OSVER_ACK: snprintf(expbuf,49,"Get OS Version Resp");break;
|
|
||||||
|
|
||||||
case FELICA_RESET_MODE_REQ: snprintf(expbuf,49,"Reset mode Req");break;
|
|
||||||
case FELICA_RESET_MODE_ACK: snprintf(expbuf,49,"Reset mode Resp");break;
|
|
||||||
|
|
||||||
case FELICA_AUTH1V2_REQ: snprintf(expbuf,49,"Auth1 v2 Req");break;
|
|
||||||
case FELICA_AUTH1V2_ACK: snprintf(expbuf,49,"Auth1 v2 Resp");break;
|
|
||||||
|
|
||||||
case FELICA_AUTH2V2_REQ: snprintf(expbuf,49,"Auth2 v2 Req");break;
|
|
||||||
case FELICA_AUTH2V2_ACK: snprintf(expbuf,49,"Auth2 v2 Resp");break;
|
|
||||||
|
|
||||||
case FELICA_RDSECV2_REQ: snprintf(expbuf,49,"Secure read v2 Req");break;
|
|
||||||
case FELICA_RDSECV2_ACK: snprintf(expbuf,49,"Secure read v2 Resp");break;
|
|
||||||
case FELICA_WRTSECV2_REQ: snprintf(expbuf,49,"Secure write v2 Req");break;
|
|
||||||
case FELICA_WRTSECV2_ACK: snprintf(expbuf,49,"Secure write v2 Resp");break;
|
|
||||||
|
|
||||||
case FELICA_UPDATE_RNDID_REQ: snprintf(expbuf,49,"Update IDr Req");break;
|
|
||||||
case FELICA_UPDATE_RNDID_ACK: snprintf(expbuf,49,"Update IDr Resp");break;
|
|
||||||
default: snprintf(expbuf,49,"Unknown");break;
|
|
||||||
}
|
|
||||||
|
|
||||||
int num_lines = MIN((len )/16 + 1, 16);
|
|
||||||
for (int j = 0; j < num_lines ; j++) {
|
|
||||||
if (j == 0) {
|
|
||||||
PrintAndLogEx(NORMAL, "%7d | %s |%-32s |%02x %02x %s| %s",
|
|
||||||
gap,
|
|
||||||
(isResponse ? "Tag" : "Rdr"),
|
|
||||||
line[j],
|
|
||||||
trace[tracepos+len],
|
|
||||||
trace[tracepos+len+1],
|
|
||||||
(crc_ok) ? "OK" : "NG",
|
|
||||||
expbuf);
|
|
||||||
} else {
|
|
||||||
PrintAndLogEx(NORMAL, " | |%-32s | | ", line[j]);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
tracepos += len + 1;
|
|
||||||
}
|
|
||||||
PrintAndLogEx(NORMAL, "");
|
|
||||||
}
|
|
||||||
|
|
||||||
int CmdHFList(const char *Cmd) {
|
|
||||||
clearCommandBuffer();
|
|
||||||
|
|
||||||
bool showWaitCycles = false;
|
|
||||||
bool markCRCBytes = false;
|
|
||||||
char type[10] = {0};
|
|
||||||
//int tlen = param_getstr(Cmd,0,type);
|
|
||||||
char param1 = param_getchar(Cmd, 1);
|
|
||||||
char param2 = param_getchar(Cmd, 2);
|
|
||||||
bool errors = false;
|
|
||||||
uint8_t protocol = 0;
|
|
||||||
|
|
||||||
//Validate params H or empty
|
|
||||||
if (strlen(Cmd) < 1 || param1 == 'h' || param1 == 'H') return usage_hf_list();
|
|
||||||
|
|
||||||
//Validate params F,C
|
|
||||||
if(
|
|
||||||
(param1 != 0 && param1 != 'f' && param1 != 'c') ||
|
|
||||||
(param2 != 0 && param2 != 'f' && param2 != 'c')
|
|
||||||
) {
|
|
||||||
return usage_hf_list();
|
|
||||||
}
|
|
||||||
|
|
||||||
param_getstr(Cmd, 0, type, sizeof(type) );
|
|
||||||
|
|
||||||
// validate type of output
|
|
||||||
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, "topaz") == 0) protocol = TOPAZ;
|
|
||||||
else if(strcmp(type, "7816") == 0) protocol = ISO_7816_4;
|
|
||||||
else if(strcmp(type, "des") == 0) protocol = MFDES;
|
|
||||||
else if(strcmp(type, "legic") == 0) protocol = LEGIC;
|
|
||||||
else if(strcmp(type, "15") == 0) protocol = ISO_15693;
|
|
||||||
else if(strcmp(type, "felica") == 0) protocol = FELICA;
|
|
||||||
else if(strcmp(type, "mf") == 0) protocol = PROTO_MIFARE;
|
|
||||||
else if(strcmp(type, "raw") == 0) protocol = -1;//No crc, no annotations
|
|
||||||
else errors = true;
|
|
||||||
|
|
||||||
if (errors) return usage_hf_list();
|
|
||||||
|
|
||||||
if (param1 == 'f' || param2 == 'f') showWaitCycles = true;
|
|
||||||
if (param1 == 'c' || param2 == 'c') markCRCBytes = true;
|
|
||||||
|
|
||||||
uint8_t *trace;
|
|
||||||
uint16_t tracepos = 0;
|
|
||||||
trace = malloc(USB_CMD_DATA_SIZE);
|
|
||||||
|
|
||||||
// Query for the size of the trace
|
|
||||||
UsbCommand response;
|
|
||||||
GetFromBigBuf(trace, USB_CMD_DATA_SIZE, 0);
|
|
||||||
if ( !WaitForResponseTimeout(CMD_ACK, &response, 4000) ) {
|
|
||||||
PrintAndLogEx(FAILED, "timeout while waiting for reply.");
|
|
||||||
return 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
uint16_t traceLen = response.arg[2];
|
|
||||||
if (traceLen > USB_CMD_DATA_SIZE) {
|
|
||||||
uint8_t *p = realloc(trace, traceLen);
|
|
||||||
if (p == NULL) {
|
|
||||||
PrintAndLogEx(FAILED, "Cannot allocate memory for trace");
|
|
||||||
free(trace);
|
|
||||||
return 2;
|
|
||||||
}
|
|
||||||
trace = p;
|
|
||||||
GetFromBigBuf(trace, traceLen, 0);
|
|
||||||
WaitForResponse(CMD_ACK, NULL);
|
|
||||||
}
|
|
||||||
|
|
||||||
PrintAndLogEx(NORMAL, "Recorded Activity (TraceLen = %d bytes)", traceLen);
|
|
||||||
PrintAndLogEx(NORMAL, "");
|
|
||||||
if (protocol == FELICA) {
|
|
||||||
printFelica(traceLen, trace);
|
|
||||||
} else {
|
|
||||||
PrintAndLogEx(NORMAL, "Start = Start of Start Bit, End = End of last modulation. Src = Source of Transfer");
|
|
||||||
if ( protocol == ISO_14443A || protocol == PROTO_MIFARE)
|
|
||||||
PrintAndLogEx(NORMAL, "iso14443a - All times are in carrier periods (1/13.56Mhz)");
|
|
||||||
if ( protocol == ICLASS )
|
|
||||||
PrintAndLogEx(NORMAL, "iClass - Timings are not as accurate");
|
|
||||||
if ( protocol == LEGIC )
|
|
||||||
PrintAndLogEx(NORMAL, "LEGIC - Timings are in ticks (1us == 1.5ticks)");
|
|
||||||
if ( protocol == ISO_15693 )
|
|
||||||
PrintAndLogEx(NORMAL, "ISO15693 - Timings are not as accurate");
|
|
||||||
if ( protocol == FELICA )
|
|
||||||
PrintAndLogEx(NORMAL, "ISO18092 / FeliCa - Timings are not as accurate");
|
|
||||||
|
|
||||||
PrintAndLogEx(NORMAL, "");
|
|
||||||
PrintAndLogEx(NORMAL, " Start | End | Src | Data (! denotes parity error) | CRC | Annotation");
|
|
||||||
PrintAndLogEx(NORMAL, "------------+------------+-----+-------------------------------------------------------------------------+-----+--------------------");
|
|
||||||
|
|
||||||
ClearAuthData();
|
|
||||||
while(tracepos < traceLen) {
|
|
||||||
tracepos = printTraceLine(tracepos, traceLen, trace, protocol, showWaitCycles, markCRCBytes);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
free(trace);
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
int CmdHFSearch(const char *Cmd){
|
int CmdHFSearch(const char *Cmd){
|
||||||
|
|
||||||
char cmdp = param_getchar(Cmd, 0);
|
char cmdp = param_getchar(Cmd, 0);
|
||||||
|
|
@ -583,8 +121,8 @@ static command_t CommandTable[] = {
|
||||||
{"mfu", CmdHFMFUltra, 1, "{ MIFARE Ultralight RFIDs... }"},
|
{"mfu", CmdHFMFUltra, 1, "{ MIFARE Ultralight RFIDs... }"},
|
||||||
{"mfdes", CmdHFMFDes, 1, "{ MIFARE Desfire RFIDs... }"},
|
{"mfdes", CmdHFMFDes, 1, "{ MIFARE Desfire RFIDs... }"},
|
||||||
{"topaz", CmdHFTopaz, 1, "{ TOPAZ (NFC Type 1) RFIDs... }"},
|
{"topaz", CmdHFTopaz, 1, "{ TOPAZ (NFC Type 1) RFIDs... }"},
|
||||||
|
{"list", CmdTraceList, 0, "List protocol data in trace buffer"},
|
||||||
{"tune", CmdHFTune, 0, "Continuously measure HF antenna tuning"},
|
{"tune", CmdHFTune, 0, "Continuously measure HF antenna tuning"},
|
||||||
{"list", CmdHFList, 1, "List protocol data in trace buffer"},
|
|
||||||
{"search", CmdHFSearch, 1, "Search for known HF tags [preliminary]"},
|
{"search", CmdHFSearch, 1, "Search for known HF tags [preliminary]"},
|
||||||
{"snoop", CmdHFSnoop, 0, "<samples to skip (10000)> <triggers to skip (1)> Generic HF Snoop"},
|
{"snoop", CmdHFSnoop, 0, "<samples to skip (10000)> <triggers to skip (1)> Generic HF Snoop"},
|
||||||
{NULL, NULL, 0, NULL}
|
{NULL, NULL, 0, NULL}
|
||||||
|
|
|
||||||
|
|
@ -29,19 +29,14 @@
|
||||||
#include "cmdhfmfdes.h" // DESFIRE
|
#include "cmdhfmfdes.h" // DESFIRE
|
||||||
#include "cmdhftopaz.h" // TOPAZ
|
#include "cmdhftopaz.h" // TOPAZ
|
||||||
#include "cmdhffelica.h" // ISO18092 / FeliCa
|
#include "cmdhffelica.h" // ISO18092 / FeliCa
|
||||||
#include "emv/cmdemv.h" // EMV
|
#include "emv/cmdemv.h" // EMV
|
||||||
#include "protocols.h"
|
#include "cmdtrace.h" // trace list
|
||||||
#include "parity.h" // oddparity
|
|
||||||
#include "iso15693tools.h" // ISO15693 crc
|
|
||||||
#include "cmdhflist.h" // annotations
|
|
||||||
|
|
||||||
extern int CmdHF(const char *Cmd);
|
extern int CmdHF(const char *Cmd);
|
||||||
extern int CmdHFTune(const char *Cmd);
|
extern int CmdHFTune(const char *Cmd);
|
||||||
extern int CmdHFList(const char *Cmd);
|
|
||||||
extern int CmdHFSearch(const char *Cmd);
|
extern int CmdHFSearch(const char *Cmd);
|
||||||
extern int CmdHFSnoop(const char *Cmd);
|
extern int CmdHFSnoop(const char *Cmd);
|
||||||
|
|
||||||
extern int usage_hf_list();
|
|
||||||
extern int usage_hf_search();
|
extern int usage_hf_search();
|
||||||
extern int usage_hf_snoop();
|
extern int usage_hf_snoop();
|
||||||
#endif
|
#endif
|
||||||
|
|
|
||||||
|
|
@ -185,7 +185,7 @@ int usage_hf_14a_antifuzz(void) {
|
||||||
|
|
||||||
int CmdHF14AList(const char *Cmd) {
|
int CmdHF14AList(const char *Cmd) {
|
||||||
//PrintAndLogEx(NORMAL, "Deprecated command, use 'hf list 14a' instead");
|
//PrintAndLogEx(NORMAL, "Deprecated command, use 'hf list 14a' instead");
|
||||||
CmdHFList("14a");
|
CmdTraceList("14a");
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -104,7 +104,7 @@ static int switch_off_field_14b(void) {
|
||||||
}
|
}
|
||||||
|
|
||||||
int CmdHF14BList(const char *Cmd) {
|
int CmdHF14BList(const char *Cmd) {
|
||||||
CmdHFList("14b");
|
CmdTraceList("14b");
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -876,7 +876,7 @@ int CmdHF15Restore(const char*Cmd) {
|
||||||
|
|
||||||
int CmdHF15List(const char *Cmd) {
|
int CmdHF15List(const char *Cmd) {
|
||||||
//PrintAndLogEx(WARNING, "Deprecated command, use 'hf list 15' instead");
|
//PrintAndLogEx(WARNING, "Deprecated command, use 'hf list 15' instead");
|
||||||
CmdHFList("15");
|
CmdTraceList("15");
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -322,7 +322,7 @@ int CmdHfEmvSim(const char *Cmd) {
|
||||||
}
|
}
|
||||||
|
|
||||||
int CmdHfEmvList(const char *Cmd) {
|
int CmdHfEmvList(const char *Cmd) {
|
||||||
return CmdHFList("7816");
|
return CmdTraceList("7816");
|
||||||
}
|
}
|
||||||
|
|
||||||
static command_t CommandTable[] = {
|
static command_t CommandTable[] = {
|
||||||
|
|
|
||||||
|
|
@ -66,7 +66,7 @@ int usage_hf_felica_raw(void){
|
||||||
|
|
||||||
int CmdHFFelicaList(const char *Cmd) {
|
int CmdHFFelicaList(const char *Cmd) {
|
||||||
//PrintAndLogEx(NORMAL, "Deprecated command, use 'hf list felica' instead");
|
//PrintAndLogEx(NORMAL, "Deprecated command, use 'hf list felica' instead");
|
||||||
CmdHFList("raw");
|
CmdTraceList("raw");
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -270,7 +270,7 @@ int xorbits_8(uint8_t val) {
|
||||||
|
|
||||||
int CmdHFiClassList(const char *Cmd) {
|
int CmdHFiClassList(const char *Cmd) {
|
||||||
//PrintAndLogEx(NORMAL, "Deprecated command, use 'hf list iclass' instead");
|
//PrintAndLogEx(NORMAL, "Deprecated command, use 'hf list iclass' instead");
|
||||||
CmdHFList("iclass");
|
CmdTraceList("iclass");
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1252,7 +1252,7 @@ int CmdLegicWipe(const char *Cmd){
|
||||||
}
|
}
|
||||||
|
|
||||||
int CmdLegicList(const char *Cmd) {
|
int CmdLegicList(const char *Cmd) {
|
||||||
CmdHFList("legic");
|
CmdTraceList("legic");
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -499,7 +499,7 @@ int CmdHFTopazCmdRaw(const char *Cmd) {
|
||||||
}
|
}
|
||||||
|
|
||||||
int CmdHFTopazList(const char *Cmd) {
|
int CmdHFTopazList(const char *Cmd) {
|
||||||
CmdHFList("topaz");
|
CmdTraceList("topaz");
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -13,6 +13,7 @@
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
#include "cmdmain.h"
|
||||||
#include "util_posix.h"
|
#include "util_posix.h"
|
||||||
#include "cmdparser.h"
|
#include "cmdparser.h"
|
||||||
#include "proxmark3.h"
|
#include "proxmark3.h"
|
||||||
|
|
@ -23,7 +24,7 @@
|
||||||
#include "cmddata.h"
|
#include "cmddata.h"
|
||||||
#include "cmdhw.h"
|
#include "cmdhw.h"
|
||||||
#include "cmdlf.h"
|
#include "cmdlf.h"
|
||||||
#include "cmdmain.h"
|
#include "cmdtrace.h"
|
||||||
#include "util.h"
|
#include "util.h"
|
||||||
#include "cmdscript.h"
|
#include "cmdscript.h"
|
||||||
#include "cmdcrc.h"
|
#include "cmdcrc.h"
|
||||||
|
|
@ -54,7 +55,8 @@ static command_t CommandTable[] = {
|
||||||
{"hw", CmdHW, 1, "{ Hardware commands... }"},
|
{"hw", CmdHW, 1, "{ Hardware commands... }"},
|
||||||
{"lf", CmdLF, 1, "{ Low Frequency commands... }"},
|
{"lf", CmdLF, 1, "{ Low Frequency commands... }"},
|
||||||
{"reveng", CmdRev, 1, "Crc calculations from the software reveng 1.44"},
|
{"reveng", CmdRev, 1, "Crc calculations from the software reveng 1.44"},
|
||||||
{"script", CmdScript, 1, "{ Scripting commands }"},
|
{"script", CmdScript, 1, "{ Scripting commands }"},
|
||||||
|
{"trace", CmdTrace, 1, "{ Trace manipulation... }"},
|
||||||
{"quit", CmdQuit, 1, ""},
|
{"quit", CmdQuit, 1, ""},
|
||||||
{"exit", CmdQuit, 1, "Exit program"},
|
{"exit", CmdQuit, 1, "Exit program"},
|
||||||
{NULL, NULL, 0, NULL}
|
{NULL, NULL, 0, NULL}
|
||||||
|
|
|
||||||
510
client/cmdtrace.c
Normal file
510
client/cmdtrace.c
Normal file
|
|
@ -0,0 +1,510 @@
|
||||||
|
//-----------------------------------------------------------------------------
|
||||||
|
// Copyright (C) 2018 iceman <iceman at iuse.se>
|
||||||
|
//
|
||||||
|
// This code is licensed to you under the terms of the GNU GPL, version 2 or,
|
||||||
|
// at your option, any later version. See the LICENSE.txt file for the text of
|
||||||
|
// the license.
|
||||||
|
//-----------------------------------------------------------------------------
|
||||||
|
// Trace commands
|
||||||
|
//-----------------------------------------------------------------------------
|
||||||
|
#include "cmdtrace.h"
|
||||||
|
|
||||||
|
static int CmdHelp(const char *Cmd);
|
||||||
|
|
||||||
|
int usage_trace_list(){
|
||||||
|
PrintAndLogEx(NORMAL, "List protocol data in trace buffer.");
|
||||||
|
PrintAndLogEx(NORMAL, "Usage: trace list <protocol> [f][c]");
|
||||||
|
PrintAndLogEx(NORMAL, " f - show frame delay times as well");
|
||||||
|
PrintAndLogEx(NORMAL, " c - mark CRC bytes");
|
||||||
|
PrintAndLogEx(NORMAL, "Supported <protocol> values:");
|
||||||
|
PrintAndLogEx(NORMAL, " raw - just show raw data without annotations");
|
||||||
|
PrintAndLogEx(NORMAL, " 14a - interpret data as iso14443a communications");
|
||||||
|
PrintAndLogEx(NORMAL, " mf - interpret data as iso14443a communications and decrypt crypto1 stream");
|
||||||
|
PrintAndLogEx(NORMAL, " 14b - interpret data as iso14443b communications");
|
||||||
|
PrintAndLogEx(NORMAL, " 15 - interpret data as iso15693 communications");
|
||||||
|
PrintAndLogEx(NORMAL, " des - interpret data as DESFire communications");
|
||||||
|
#ifdef WITH_EMV
|
||||||
|
PrintAndLogEx(NORMAL, " emv - interpret data as EMV / communications");
|
||||||
|
#endif
|
||||||
|
PrintAndLogEx(NORMAL, " iclass - interpret data as iclass communications");
|
||||||
|
PrintAndLogEx(NORMAL, " topaz - interpret data as topaz communications");
|
||||||
|
PrintAndLogEx(NORMAL, " 7816 - interpret data as iso7816-4 communications");
|
||||||
|
PrintAndLogEx(NORMAL, " legic - interpret data as LEGIC communications");
|
||||||
|
PrintAndLogEx(NORMAL, " felica - interpret data as ISO18092 / FeliCa communications");
|
||||||
|
PrintAndLogEx(NORMAL, "");
|
||||||
|
PrintAndLogEx(NORMAL, "Examples:");
|
||||||
|
PrintAndLogEx(NORMAL, " trace list 14a f");
|
||||||
|
PrintAndLogEx(NORMAL, " trace list iclass");
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
int usage_trace_load(){
|
||||||
|
PrintAndLogEx(NORMAL, "Load protocol data from file to trace buffer.");
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
int usage_trace_save(){
|
||||||
|
PrintAndLogEx(NORMAL, "Save protocol data from trace buffer to file.");
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool is_last_record(uint16_t tracepos, uint8_t *trace, uint16_t traceLen) {
|
||||||
|
return(tracepos + sizeof(uint32_t) + sizeof(uint16_t) + sizeof(uint16_t) >= traceLen);
|
||||||
|
}
|
||||||
|
|
||||||
|
bool next_record_is_response(uint16_t tracepos, uint8_t *trace) {
|
||||||
|
uint16_t next_records_datalen = *((uint16_t *)(trace + tracepos + sizeof(uint32_t) + sizeof(uint16_t)));
|
||||||
|
return(next_records_datalen & 0x8000);
|
||||||
|
}
|
||||||
|
|
||||||
|
bool merge_topaz_reader_frames(uint32_t timestamp, uint32_t *duration, uint16_t *tracepos, uint16_t traceLen,
|
||||||
|
uint8_t *trace, uint8_t *frame, uint8_t *topaz_reader_command, uint16_t *data_len) {
|
||||||
|
|
||||||
|
#define MAX_TOPAZ_READER_CMD_LEN 16
|
||||||
|
|
||||||
|
uint32_t last_timestamp = timestamp + *duration;
|
||||||
|
|
||||||
|
if ((*data_len != 1) || (frame[0] == TOPAZ_WUPA) || (frame[0] == TOPAZ_REQA)) return false;
|
||||||
|
|
||||||
|
memcpy(topaz_reader_command, frame, *data_len);
|
||||||
|
|
||||||
|
while (!is_last_record(*tracepos, trace, traceLen) && !next_record_is_response(*tracepos, trace)) {
|
||||||
|
uint32_t next_timestamp = *((uint32_t *)(trace + *tracepos));
|
||||||
|
*tracepos += sizeof(uint32_t);
|
||||||
|
uint16_t next_duration = *((uint16_t *)(trace + *tracepos));
|
||||||
|
*tracepos += sizeof(uint16_t);
|
||||||
|
uint16_t next_data_len = *((uint16_t *)(trace + *tracepos)) & 0x7FFF;
|
||||||
|
*tracepos += sizeof(uint16_t);
|
||||||
|
uint8_t *next_frame = (trace + *tracepos);
|
||||||
|
*tracepos += next_data_len;
|
||||||
|
if ((next_data_len == 1) && (*data_len + next_data_len <= MAX_TOPAZ_READER_CMD_LEN)) {
|
||||||
|
memcpy(topaz_reader_command + *data_len, next_frame, next_data_len);
|
||||||
|
*data_len += next_data_len;
|
||||||
|
last_timestamp = next_timestamp + next_duration;
|
||||||
|
} else {
|
||||||
|
// rewind and exit
|
||||||
|
*tracepos = *tracepos - next_data_len - sizeof(uint16_t) - sizeof(uint16_t) - sizeof(uint32_t);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
uint16_t next_parity_len = (next_data_len-1)/8 + 1;
|
||||||
|
*tracepos += next_parity_len;
|
||||||
|
}
|
||||||
|
|
||||||
|
*duration = last_timestamp - timestamp;
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
uint16_t printTraceLine(uint16_t tracepos, uint16_t traceLen, uint8_t *trace, uint8_t protocol, bool showWaitCycles, bool markCRCBytes) {
|
||||||
|
// sanity check
|
||||||
|
if (tracepos + sizeof(uint32_t) + sizeof(uint16_t) + sizeof(uint16_t) > traceLen) return traceLen;
|
||||||
|
|
||||||
|
bool isResponse;
|
||||||
|
uint16_t data_len, parity_len;
|
||||||
|
uint32_t duration, timestamp, first_timestamp, EndOfTransmissionTimestamp;
|
||||||
|
uint8_t topaz_reader_command[9];
|
||||||
|
char explanation[30] = {0};
|
||||||
|
uint8_t mfData[32] = {0};
|
||||||
|
size_t mfDataLen = 0;
|
||||||
|
|
||||||
|
|
||||||
|
first_timestamp = *((uint32_t *)(trace));
|
||||||
|
timestamp = *((uint32_t *)(trace + tracepos));
|
||||||
|
tracepos += 4;
|
||||||
|
|
||||||
|
duration = *((uint16_t *)(trace + tracepos));
|
||||||
|
tracepos += 2;
|
||||||
|
|
||||||
|
data_len = *((uint16_t *)(trace + tracepos));
|
||||||
|
tracepos += 2;
|
||||||
|
|
||||||
|
if (data_len & 0x8000) {
|
||||||
|
data_len &= 0x7fff;
|
||||||
|
isResponse = true;
|
||||||
|
} else {
|
||||||
|
isResponse = false;
|
||||||
|
}
|
||||||
|
parity_len = (data_len-1)/8 + 1;
|
||||||
|
|
||||||
|
if (tracepos + data_len + parity_len > traceLen) {
|
||||||
|
return traceLen;
|
||||||
|
}
|
||||||
|
uint8_t *frame = trace + tracepos;
|
||||||
|
tracepos += data_len;
|
||||||
|
uint8_t *parityBytes = trace + tracepos;
|
||||||
|
tracepos += parity_len;
|
||||||
|
|
||||||
|
if (protocol == TOPAZ && !isResponse) {
|
||||||
|
// topaz reader commands come in 1 or 9 separate frames with 7 or 8 Bits each.
|
||||||
|
// merge them:
|
||||||
|
if (merge_topaz_reader_frames(timestamp, &duration, &tracepos, traceLen, trace, frame, topaz_reader_command, &data_len)) {
|
||||||
|
frame = topaz_reader_command;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
//Check the CRC status
|
||||||
|
uint8_t crcStatus = 2;
|
||||||
|
|
||||||
|
if (data_len > 2) {
|
||||||
|
switch (protocol) {
|
||||||
|
case ICLASS:
|
||||||
|
crcStatus = iclass_CRC_check(isResponse, frame, data_len);
|
||||||
|
break;
|
||||||
|
case ISO_14443B:
|
||||||
|
case TOPAZ:
|
||||||
|
case FELICA:
|
||||||
|
crcStatus = iso14443B_CRC_check(frame, data_len);
|
||||||
|
break;
|
||||||
|
case PROTO_MIFARE:
|
||||||
|
crcStatus = mifare_CRC_check(isResponse, frame, data_len);
|
||||||
|
case ISO_14443A:
|
||||||
|
case MFDES:
|
||||||
|
crcStatus = iso14443A_CRC_check(isResponse, frame, data_len);
|
||||||
|
break;
|
||||||
|
case ISO_15693:
|
||||||
|
crcStatus = iso15693_CRC_check(frame, data_len);
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
//0 CRC-command, CRC not ok
|
||||||
|
//1 CRC-command, CRC ok
|
||||||
|
//2 Not crc-command
|
||||||
|
|
||||||
|
//--- Draw the data column
|
||||||
|
char line[18][110];
|
||||||
|
|
||||||
|
for (int j = 0; j < data_len && j/18 < 18; j++) {
|
||||||
|
|
||||||
|
uint8_t parityBits = parityBytes[j >> 3];
|
||||||
|
if (protocol != LEGIC &&
|
||||||
|
protocol != ISO_14443B &&
|
||||||
|
protocol != ISO_7816_4 &&
|
||||||
|
(isResponse || protocol == ISO_14443A) &&
|
||||||
|
(oddparity8(frame[j]) != ((parityBits >> (7-(j&0x0007))) & 0x01))) {
|
||||||
|
|
||||||
|
snprintf(line[j/18]+(( j % 18) * 4),110, "%02x! ", frame[j]);
|
||||||
|
} else {
|
||||||
|
snprintf(line[j/18]+(( j % 18) * 4),110, "%02x ", frame[j]);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
if (markCRCBytes) {
|
||||||
|
//CRC-command
|
||||||
|
if(crcStatus == 0 || crcStatus == 1) {
|
||||||
|
char *pos1 = line[(data_len-2)/18]+(((data_len-2) % 18) * 4);
|
||||||
|
(*pos1) = '[';
|
||||||
|
char *pos2 = line[(data_len)/18]+(((data_len) % 18) * 4);
|
||||||
|
sprintf(pos2, "%c", ']');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (data_len == 0 ) {
|
||||||
|
sprintf(line[0],"<empty trace - possible error>");
|
||||||
|
return tracepos;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Draw the CRC column
|
||||||
|
char *crc = (crcStatus == 0 ? "!crc" : (crcStatus == 1 ? " ok " : " "));
|
||||||
|
|
||||||
|
EndOfTransmissionTimestamp = timestamp + duration;
|
||||||
|
|
||||||
|
// Always annotate LEGIC read/tag
|
||||||
|
if ( protocol == LEGIC )
|
||||||
|
annotateLegic(explanation, sizeof(explanation), frame, data_len);
|
||||||
|
|
||||||
|
if ( protocol == PROTO_MIFARE )
|
||||||
|
annotateMifare(explanation, sizeof(explanation), frame, data_len, parityBytes, parity_len, isResponse);
|
||||||
|
|
||||||
|
if (!isResponse) {
|
||||||
|
switch(protocol) {
|
||||||
|
case ICLASS: annotateIclass(explanation,sizeof(explanation),frame,data_len); break;
|
||||||
|
case ISO_14443A: annotateIso14443a(explanation,sizeof(explanation),frame,data_len); break;
|
||||||
|
case MFDES: annotateMfDesfire(explanation,sizeof(explanation),frame,data_len); break;
|
||||||
|
case ISO_14443B: annotateIso14443b(explanation,sizeof(explanation),frame,data_len); break;
|
||||||
|
case TOPAZ: annotateTopaz(explanation,sizeof(explanation),frame,data_len); break;
|
||||||
|
case ISO_7816_4: annotateIso7816(explanation,sizeof(explanation),frame,data_len); break;
|
||||||
|
case ISO_15693: annotateIso15693(explanation,sizeof(explanation),frame,data_len); break;
|
||||||
|
case FELICA: annotateFelica(explanation,sizeof(explanation),frame,data_len); break;
|
||||||
|
default: break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
int num_lines = MIN((data_len - 1)/18 + 1, 18);
|
||||||
|
for (int j = 0; j < num_lines ; j++) {
|
||||||
|
if (j == 0) {
|
||||||
|
PrintAndLogEx(NORMAL, " %10u | %10u | %s |%-72s | %s| %s",
|
||||||
|
(timestamp - first_timestamp),
|
||||||
|
(EndOfTransmissionTimestamp - first_timestamp),
|
||||||
|
(isResponse ? "Tag" : "Rdr"),
|
||||||
|
line[j],
|
||||||
|
(j == num_lines-1) ? crc : " ",
|
||||||
|
(j == num_lines-1) ? explanation : "");
|
||||||
|
} else {
|
||||||
|
PrintAndLogEx(NORMAL, " | | |%-72s | %s| %s",
|
||||||
|
line[j],
|
||||||
|
(j == num_lines-1) ? crc : " ",
|
||||||
|
(j == num_lines-1) ? explanation : "");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (DecodeMifareData(frame, data_len, parityBytes, isResponse, mfData, &mfDataLen)) {
|
||||||
|
memset(explanation, 0x00, sizeof(explanation));
|
||||||
|
if (!isResponse) {
|
||||||
|
annotateIso14443a(explanation, sizeof(explanation), mfData, mfDataLen);
|
||||||
|
}
|
||||||
|
uint8_t crcc = iso14443A_CRC_check(isResponse, mfData, mfDataLen);
|
||||||
|
PrintAndLogEx(NORMAL, " | | * |%-72s | %-4s| %s",
|
||||||
|
sprint_hex_inrow_spaces(mfData, mfDataLen, 2),
|
||||||
|
(crcc == 0 ? "!crc" : (crcc == 1 ? " ok " : " ")),
|
||||||
|
explanation);
|
||||||
|
};
|
||||||
|
|
||||||
|
if (is_last_record(tracepos, trace, traceLen)) return traceLen;
|
||||||
|
|
||||||
|
if (showWaitCycles && !isResponse && next_record_is_response(tracepos, trace)) {
|
||||||
|
uint32_t next_timestamp = *((uint32_t *)(trace + tracepos));
|
||||||
|
PrintAndLogEx(NORMAL, " %10u | %10u | %s |fdt (Frame Delay Time): %d",
|
||||||
|
(EndOfTransmissionTimestamp - first_timestamp),
|
||||||
|
(next_timestamp - first_timestamp),
|
||||||
|
" ",
|
||||||
|
(next_timestamp - EndOfTransmissionTimestamp));
|
||||||
|
}
|
||||||
|
|
||||||
|
return tracepos;
|
||||||
|
}
|
||||||
|
|
||||||
|
void printFelica(uint16_t traceLen, uint8_t *trace) {
|
||||||
|
|
||||||
|
PrintAndLogEx(NORMAL, " Gap | Src | Data | CRC | Annotation |");
|
||||||
|
PrintAndLogEx(NORMAL, "--------|-----|---------------------------------|----------|-------------------|");
|
||||||
|
uint16_t tracepos = 0;
|
||||||
|
|
||||||
|
while( tracepos < traceLen) {
|
||||||
|
|
||||||
|
if (tracepos + 3 >= traceLen) break;
|
||||||
|
|
||||||
|
uint16_t gap = (uint16_t)trace[tracepos+1] + ((uint16_t)trace[tracepos] >> 8);
|
||||||
|
uint16_t crc_ok = trace[tracepos+2];
|
||||||
|
tracepos += 3;
|
||||||
|
|
||||||
|
if (tracepos + 3 >= traceLen) break;
|
||||||
|
|
||||||
|
uint16_t len = trace[tracepos+2];
|
||||||
|
|
||||||
|
//I am stripping SYNC
|
||||||
|
tracepos += 3; //skip SYNC
|
||||||
|
|
||||||
|
if( tracepos + len + 1 >= traceLen) break;
|
||||||
|
|
||||||
|
uint8_t cmd = trace[tracepos];
|
||||||
|
uint8_t isResponse = cmd&1;
|
||||||
|
|
||||||
|
char line[32][110];
|
||||||
|
for (int j = 0; j < len+1 && j/8 < 32; j++) {
|
||||||
|
snprintf(line[j/8]+(( j % 8) * 4), 110, " %02x ", trace[tracepos+j]);
|
||||||
|
}
|
||||||
|
char expbuf[50];
|
||||||
|
switch(cmd) {
|
||||||
|
case FELICA_POLL_REQ: snprintf(expbuf,49,"Poll Req");break;
|
||||||
|
case FELICA_POLL_ACK: snprintf(expbuf,49,"Poll Resp");break;
|
||||||
|
|
||||||
|
case FELICA_REQSRV_REQ: snprintf(expbuf,49,"Request Srvc Req");break;
|
||||||
|
case FELICA_REQSRV_ACK: snprintf(expbuf,49,"Request Srv Resp");break;
|
||||||
|
|
||||||
|
case FELICA_RDBLK_REQ: snprintf(expbuf,49,"Read block(s) Req");break;
|
||||||
|
case FELICA_RDBLK_ACK: snprintf(expbuf,49,"Read block(s) Resp");break;
|
||||||
|
|
||||||
|
case FELICA_WRTBLK_REQ: snprintf(expbuf,49,"Write block(s) Req");break;
|
||||||
|
case FELICA_WRTBLK_ACK: snprintf(expbuf,49,"Write block(s) Resp");break;
|
||||||
|
case FELICA_SRCHSYSCODE_REQ: snprintf(expbuf,49,"Search syscode Req");break;
|
||||||
|
case FELICA_SRCHSYSCODE_ACK: snprintf(expbuf,49,"Search syscode Resp");break;
|
||||||
|
|
||||||
|
case FELICA_REQSYSCODE_REQ: snprintf(expbuf,49,"Request syscode Req");break;
|
||||||
|
case FELICA_REQSYSCODE_ACK: snprintf(expbuf,49,"Request syscode Resp");break;
|
||||||
|
|
||||||
|
case FELICA_AUTH1_REQ: snprintf(expbuf,49,"Auth1 Req");break;
|
||||||
|
case FELICA_AUTH1_ACK: snprintf(expbuf,49,"Auth1 Resp");break;
|
||||||
|
|
||||||
|
case FELICA_AUTH2_REQ: snprintf(expbuf,49,"Auth2 Req");break;
|
||||||
|
case FELICA_AUTH2_ACK: snprintf(expbuf,49,"Auth2 Resp");break;
|
||||||
|
|
||||||
|
case FELICA_RDSEC_REQ: snprintf(expbuf,49,"Secure read Req");break;
|
||||||
|
case FELICA_RDSEC_ACK: snprintf(expbuf,49,"Secure read Resp");break;
|
||||||
|
|
||||||
|
case FELICA_WRTSEC_REQ: snprintf(expbuf,49,"Secure write Req");break;
|
||||||
|
case FELICA_WRTSEC_ACK: snprintf(expbuf,49,"Secure write Resp");break;
|
||||||
|
|
||||||
|
case FELICA_REQSRV2_REQ: snprintf(expbuf,49,"Request Srvc v2 Req");break;
|
||||||
|
case FELICA_REQSRV2_ACK: snprintf(expbuf,49,"Request Srvc v2 Resp");break;
|
||||||
|
|
||||||
|
case FELICA_GETSTATUS_REQ: snprintf(expbuf,49,"Get status Req");break;
|
||||||
|
case FELICA_GETSTATUS_ACK: snprintf(expbuf,49,"Get status Resp");break;
|
||||||
|
|
||||||
|
case FELICA_OSVER_REQ: snprintf(expbuf,49,"Get OS Version Req");break;
|
||||||
|
case FELICA_OSVER_ACK: snprintf(expbuf,49,"Get OS Version Resp");break;
|
||||||
|
|
||||||
|
case FELICA_RESET_MODE_REQ: snprintf(expbuf,49,"Reset mode Req");break;
|
||||||
|
case FELICA_RESET_MODE_ACK: snprintf(expbuf,49,"Reset mode Resp");break;
|
||||||
|
|
||||||
|
case FELICA_AUTH1V2_REQ: snprintf(expbuf,49,"Auth1 v2 Req");break;
|
||||||
|
case FELICA_AUTH1V2_ACK: snprintf(expbuf,49,"Auth1 v2 Resp");break;
|
||||||
|
|
||||||
|
case FELICA_AUTH2V2_REQ: snprintf(expbuf,49,"Auth2 v2 Req");break;
|
||||||
|
case FELICA_AUTH2V2_ACK: snprintf(expbuf,49,"Auth2 v2 Resp");break;
|
||||||
|
|
||||||
|
case FELICA_RDSECV2_REQ: snprintf(expbuf,49,"Secure read v2 Req");break;
|
||||||
|
case FELICA_RDSECV2_ACK: snprintf(expbuf,49,"Secure read v2 Resp");break;
|
||||||
|
case FELICA_WRTSECV2_REQ: snprintf(expbuf,49,"Secure write v2 Req");break;
|
||||||
|
case FELICA_WRTSECV2_ACK: snprintf(expbuf,49,"Secure write v2 Resp");break;
|
||||||
|
|
||||||
|
case FELICA_UPDATE_RNDID_REQ: snprintf(expbuf,49,"Update IDr Req");break;
|
||||||
|
case FELICA_UPDATE_RNDID_ACK: snprintf(expbuf,49,"Update IDr Resp");break;
|
||||||
|
default: snprintf(expbuf,49,"Unknown");break;
|
||||||
|
}
|
||||||
|
|
||||||
|
int num_lines = MIN((len )/16 + 1, 16);
|
||||||
|
for (int j = 0; j < num_lines ; j++) {
|
||||||
|
if (j == 0) {
|
||||||
|
PrintAndLogEx(NORMAL, "%7d | %s |%-32s |%02x %02x %s| %s",
|
||||||
|
gap,
|
||||||
|
(isResponse ? "Tag" : "Rdr"),
|
||||||
|
line[j],
|
||||||
|
trace[tracepos+len],
|
||||||
|
trace[tracepos+len+1],
|
||||||
|
(crc_ok) ? "OK" : "NG",
|
||||||
|
expbuf);
|
||||||
|
} else {
|
||||||
|
PrintAndLogEx(NORMAL, " | |%-32s | | ", line[j]);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
tracepos += len + 1;
|
||||||
|
}
|
||||||
|
PrintAndLogEx(NORMAL, "");
|
||||||
|
}
|
||||||
|
|
||||||
|
int CmdTraceList(const char *Cmd) {
|
||||||
|
clearCommandBuffer();
|
||||||
|
|
||||||
|
bool showWaitCycles = false;
|
||||||
|
bool markCRCBytes = false;
|
||||||
|
char type[10] = {0};
|
||||||
|
//int tlen = param_getstr(Cmd,0,type);
|
||||||
|
char param1 = param_getchar(Cmd, 1);
|
||||||
|
char param2 = param_getchar(Cmd, 2);
|
||||||
|
bool errors = false;
|
||||||
|
uint8_t protocol = 0;
|
||||||
|
|
||||||
|
//Validate params H or empty
|
||||||
|
if (strlen(Cmd) < 1 || param1 == 'h' || param1 == 'H') return usage_trace_list();
|
||||||
|
|
||||||
|
//Validate params F,C
|
||||||
|
if(
|
||||||
|
(param1 != 0 && param1 != 'f' && param1 != 'c') ||
|
||||||
|
(param2 != 0 && param2 != 'f' && param2 != 'c')
|
||||||
|
) {
|
||||||
|
return usage_trace_list();
|
||||||
|
}
|
||||||
|
|
||||||
|
param_getstr(Cmd, 0, type, sizeof(type) );
|
||||||
|
|
||||||
|
// validate type of output
|
||||||
|
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, "topaz") == 0) protocol = TOPAZ;
|
||||||
|
else if(strcmp(type, "7816") == 0) protocol = ISO_7816_4;
|
||||||
|
else if(strcmp(type, "des") == 0) protocol = MFDES;
|
||||||
|
else if(strcmp(type, "legic") == 0) protocol = LEGIC;
|
||||||
|
else if(strcmp(type, "15") == 0) protocol = ISO_15693;
|
||||||
|
else if(strcmp(type, "felica") == 0) protocol = FELICA;
|
||||||
|
else if(strcmp(type, "mf") == 0) protocol = PROTO_MIFARE;
|
||||||
|
else if(strcmp(type, "raw") == 0) protocol = -1;//No crc, no annotations
|
||||||
|
else errors = true;
|
||||||
|
|
||||||
|
if (errors) return usage_trace_list();
|
||||||
|
|
||||||
|
if (param1 == 'f' || param2 == 'f') showWaitCycles = true;
|
||||||
|
if (param1 == 'c' || param2 == 'c') markCRCBytes = true;
|
||||||
|
|
||||||
|
uint8_t *trace;
|
||||||
|
uint16_t tracepos = 0;
|
||||||
|
trace = malloc(USB_CMD_DATA_SIZE);
|
||||||
|
|
||||||
|
// Query for the size of the trace
|
||||||
|
UsbCommand response;
|
||||||
|
GetFromBigBuf(trace, USB_CMD_DATA_SIZE, 0);
|
||||||
|
if ( !WaitForResponseTimeout(CMD_ACK, &response, 4000) ) {
|
||||||
|
PrintAndLogEx(FAILED, "timeout while waiting for reply.");
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
uint16_t traceLen = response.arg[2];
|
||||||
|
if (traceLen > USB_CMD_DATA_SIZE) {
|
||||||
|
uint8_t *p = realloc(trace, traceLen);
|
||||||
|
if (p == NULL) {
|
||||||
|
PrintAndLogEx(FAILED, "Cannot allocate memory for trace");
|
||||||
|
free(trace);
|
||||||
|
return 2;
|
||||||
|
}
|
||||||
|
trace = p;
|
||||||
|
GetFromBigBuf(trace, traceLen, 0);
|
||||||
|
WaitForResponse(CMD_ACK, NULL);
|
||||||
|
}
|
||||||
|
|
||||||
|
PrintAndLogEx(NORMAL, "Recorded Activity (TraceLen = %d bytes)", traceLen);
|
||||||
|
PrintAndLogEx(NORMAL, "");
|
||||||
|
if (protocol == FELICA) {
|
||||||
|
printFelica(traceLen, trace);
|
||||||
|
} else {
|
||||||
|
PrintAndLogEx(NORMAL, "Start = Start of Start Bit, End = End of last modulation. Src = Source of Transfer");
|
||||||
|
if ( protocol == ISO_14443A || protocol == PROTO_MIFARE)
|
||||||
|
PrintAndLogEx(NORMAL, "iso14443a - All times are in carrier periods (1/13.56Mhz)");
|
||||||
|
if ( protocol == ICLASS )
|
||||||
|
PrintAndLogEx(NORMAL, "iClass - Timings are not as accurate");
|
||||||
|
if ( protocol == LEGIC )
|
||||||
|
PrintAndLogEx(NORMAL, "LEGIC - Timings are in ticks (1us == 1.5ticks)");
|
||||||
|
if ( protocol == ISO_15693 )
|
||||||
|
PrintAndLogEx(NORMAL, "ISO15693 - Timings are not as accurate");
|
||||||
|
if ( protocol == FELICA )
|
||||||
|
PrintAndLogEx(NORMAL, "ISO18092 / FeliCa - Timings are not as accurate");
|
||||||
|
|
||||||
|
PrintAndLogEx(NORMAL, "");
|
||||||
|
PrintAndLogEx(NORMAL, " Start | End | Src | Data (! denotes parity error) | CRC | Annotation");
|
||||||
|
PrintAndLogEx(NORMAL, "------------+------------+-----+-------------------------------------------------------------------------+-----+--------------------");
|
||||||
|
|
||||||
|
ClearAuthData();
|
||||||
|
while(tracepos < traceLen) {
|
||||||
|
tracepos = printTraceLine(tracepos, traceLen, trace, protocol, showWaitCycles, markCRCBytes);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
free(trace);
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
int CmdTraceLoad(const char *Cmd) {
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
int CmdTraceSave(const char *Cmd) {
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
static command_t CommandTable[] = {
|
||||||
|
{"help", CmdHelp, 1, "This help"},
|
||||||
|
{"list", CmdTraceList, 0, "List protocol data in trace buffer"},
|
||||||
|
{"load", CmdTraceLoad, 0, "Load trace from file"},
|
||||||
|
{"save", CmdTraceSave, 0, "Save trace buffer to file"},
|
||||||
|
{NULL, NULL, 0, NULL}
|
||||||
|
};
|
||||||
|
|
||||||
|
int CmdTrace(const char *Cmd) {
|
||||||
|
clearCommandBuffer();
|
||||||
|
CmdsParse(CommandTable, Cmd);
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
int CmdHelp(const char *Cmd) {
|
||||||
|
CmdsHelp(CommandTable);
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
40
client/cmdtrace.h
Normal file
40
client/cmdtrace.h
Normal file
|
|
@ -0,0 +1,40 @@
|
||||||
|
//-----------------------------------------------------------------------------
|
||||||
|
// Copyright (C) 2018 iceman <iceman at iuse.se>
|
||||||
|
//
|
||||||
|
// This code is licensed to you under the terms of the GNU GPL, version 2 or,
|
||||||
|
// at your option, any later version. See the LICENSE.txt file for the text of
|
||||||
|
// the license.
|
||||||
|
//-----------------------------------------------------------------------------
|
||||||
|
// Trace commands
|
||||||
|
//-----------------------------------------------------------------------------
|
||||||
|
|
||||||
|
#ifndef CMDTRACE_H__
|
||||||
|
#define CMDTRACE_H__
|
||||||
|
#include <stdio.h>
|
||||||
|
#include <stdlib.h>
|
||||||
|
#include <stdbool.h>
|
||||||
|
#include <stdint.h>
|
||||||
|
#include <string.h>
|
||||||
|
#include <limits.h>
|
||||||
|
#include "proxmark3.h"
|
||||||
|
#include "protocols.h"
|
||||||
|
#include "parity.h" // oddparity
|
||||||
|
#include "cmdhflist.h" // annotations
|
||||||
|
#include "iso15693tools.h" // ISO15693 crc
|
||||||
|
#include "util.h" // for parsing cli command utils
|
||||||
|
#include "ui.h" // for show graph controls
|
||||||
|
#include "cmdparser.h" // for getting cli commands included in cmdmain.h
|
||||||
|
#include "cmdmain.h" // for sending cmds to device
|
||||||
|
#include "data.h" // for GetFromBigBuf
|
||||||
|
|
||||||
|
extern int CmdTrace(const char *Cmd);
|
||||||
|
|
||||||
|
extern int CmdTraceList(const char *Cmd);
|
||||||
|
extern int CmdTraceLoad(const char *Cmd);
|
||||||
|
extern int CmdTraceSave(const char *Cmd);
|
||||||
|
|
||||||
|
// usages helptext
|
||||||
|
extern int usage_trace_list(void);
|
||||||
|
extern int usage_trace_load(void);
|
||||||
|
extern int usage_trace_save(void);
|
||||||
|
#endif
|
||||||
|
|
@ -830,7 +830,7 @@ int CmdHfEMVGetrng(const char *Cmd) {
|
||||||
}
|
}
|
||||||
|
|
||||||
int CmdHfEMVList(const char *Cmd) {
|
int CmdHfEMVList(const char *Cmd) {
|
||||||
return CmdHFList("7816");
|
return CmdTraceList("7816");
|
||||||
}
|
}
|
||||||
|
|
||||||
int CmdHFEMVTest(const char *cmd) {
|
int CmdHFEMVTest(const char *cmd) {
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue