dash/proxmark3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

make style

Browse Source
This commit is contained in:
Philippe Teuwen
2019-03-10 00:00:59 +01:00
parent 0d9223a547
commit 0373696662
483 changed files with 56514 additions and 52451 deletions
Download Patch File Download Diff File Expand all files Collapse all files

426
client/cmdtrace.c
View File

@@ -15,7 +15,8 @@ static int CmdHelp(const char *Cmd);
static uint8_t *trace;
long traceLen = 0;
int usage_trace_list(){
int usage_trace_list()
{
PrintAndLogEx(NORMAL, "List protocol data in trace buffer.");
PrintAndLogEx(NORMAL, "Usage: trace list <protocol> [f][c| <0|1>");
PrintAndLogEx(NORMAL, " f - show frame delay times as well");
@@ -42,14 +43,16 @@ int usage_trace_list(){
PrintAndLogEx(NORMAL, " trace list iclass");
return 0;
}
int usage_trace_load(){
int usage_trace_load()
{
PrintAndLogEx(NORMAL, "Load protocol data from file to trace buffer.");
PrintAndLogEx(NORMAL, "Usage: trace load <filename>");
PrintAndLogEx(NORMAL, "Examples:");
PrintAndLogEx(NORMAL, " trace load mytracefile.bin");
return 0;
}
int usage_trace_save(){
int usage_trace_save()
{
PrintAndLogEx(NORMAL, "Save protocol data from trace buffer to file.");
PrintAndLogEx(NORMAL, "Usage: trace save <filename>");
PrintAndLogEx(NORMAL, "Examples:");
@@ -57,17 +60,20 @@ int usage_trace_save(){
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 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) {
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);
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) {
uint8_t *trace, uint8_t *frame, uint8_t *topaz_reader_command, uint16_t *data_len)
{
#define MAX_TOPAZ_READER_CMD_LEN 16
@@ -95,7 +101,7 @@ bool merge_topaz_reader_frames(uint32_t timestamp, uint32_t *duration, uint16_t
*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;
uint16_t next_parity_len = (next_data_len - 1) / 8 + 1;
*tracepos += next_parity_len;
}
@@ -104,7 +110,8 @@ bool merge_topaz_reader_frames(uint32_t timestamp, uint32_t *duration, uint16_t
return true;
}
uint16_t printTraceLine(uint16_t tracepos, uint16_t traceLen, uint8_t *trace, uint8_t protocol, bool showWaitCycles, bool markCRCBytes) {
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;
@@ -133,7 +140,7 @@ uint16_t printTraceLine(uint16_t tracepos, uint16_t traceLen, uint8_t *trace, ui
} else {
isResponse = false;
}
parity_len = (data_len-1)/8 + 1;
parity_len = (data_len - 1) / 8 + 1;
if (tracepos + data_len + parity_len > traceLen) {
return traceLen;
@@ -186,34 +193,34 @@ uint16_t printTraceLine(uint16_t tracepos, uint16_t traceLen, uint8_t *trace, ui
//--- Draw the data column
char line[18][110];
for (int j = 0; j < data_len && j/18 < 18; j++) {
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))) {
(oddparity8(frame[j]) != ((parityBits >> (7 - (j & 0x0007))) & 0x01))) {
snprintf(line[j/18]+(( j % 18) * 4),110, "%02x! ", frame[j]);
snprintf(line[j / 18] + ((j % 18) * 4), 110, "%02x! ", frame[j]);
} else {
snprintf(line[j/18]+(( j % 18) * 4),110, "%02x ", frame[j]);
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);
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);
char *pos2 = line[(data_len) / 18] + (((data_len) % 18) * 4);
sprintf(pos2, "%c", ']');
}
}
if (data_len == 0 ) {
sprintf(line[0],"<empty trace - possible error>");
if (data_len == 0) {
sprintf(line[0], "<empty trace - possible error>");
return tracepos;
}
@@ -223,41 +230,58 @@ uint16_t printTraceLine(uint16_t tracepos, uint16_t traceLen, uint8_t *trace, ui
EndOfTransmissionTimestamp = timestamp + duration;
// Always annotate LEGIC read/tag
if ( protocol == LEGIC )
if (protocol == LEGIC)
annotateLegic(explanation, sizeof(explanation), frame, data_len);
if ( protocol == PROTO_MIFARE )
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;
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);
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 : "");
(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 : "");
line[j],
(j == num_lines - 1) ? crc : " ",
(j == num_lines - 1) ? explanation : "");
}
}
@@ -268,127 +292,206 @@ uint16_t printTraceLine(uint16_t tracepos, uint16_t traceLen, uint8_t *trace, ui
}
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);
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));
}
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) {
void printFelica(uint16_t traceLen, uint8_t *trace)
{
PrintAndLogEx(NORMAL, "ISO18092 / FeliCa - Timings are not as accurate");
PrintAndLogEx(NORMAL, " Gap | Src | Data | CRC | Annotation |");
PrintAndLogEx(NORMAL, "--------|-----|---------------------------------|----------|-------------------|");
uint16_t tracepos = 0;
while( tracepos < traceLen) {
while (tracepos < traceLen) {
if (tracepos + 3 >= traceLen) break;
uint16_t gap = *((uint16_t *)(trace + tracepos));
uint8_t crc_ok = trace[tracepos+2];
uint8_t crc_ok = trace[tracepos + 2];
tracepos += 3;
if (tracepos + 3 >= traceLen) break;
uint16_t len = trace[tracepos+2];
uint16_t len = trace[tracepos + 2];
//I am stripping SYNC
tracepos += 3; //skip SYNC
if( tracepos + len + 1 >= traceLen) break;
if (tracepos + len + 1 >= traceLen) break;
uint8_t cmd = trace[tracepos];
uint8_t isResponse = cmd&1;
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]);
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;
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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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;
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);
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);
gap,
(isResponse ? "Tag" : "Rdr"),
line[j],
trace[tracepos + len],
trace[tracepos + len + 1],
(crc_ok) ? "OK" : "NG",
expbuf);
} else {
PrintAndLogEx(NORMAL, " | |%-32s | | ", line[j]);
}
@@ -409,7 +512,8 @@ static int SanityOfflineCheck( bool useTraceBuffer ){
}
*/
int CmdTraceList(const char *Cmd) {
int CmdTraceList(const char *Cmd)
{
clearCommandBuffer();
@@ -427,32 +531,32 @@ int CmdTraceList(const char *Cmd) {
char cmdp = 0;
while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
int slen = param_getstr(Cmd, cmdp, type, sizeof(type) );
if ( slen == 1) {
int slen = param_getstr(Cmd, cmdp, type, sizeof(type));
if (slen == 1) {
switch ( tolower(param_getchar(Cmd, cmdp))) {
case 'h':
return usage_trace_list();
case 'f':
showWaitCycles = true;
cmdp++;
break;
case 'c':
markCRCBytes = true;
cmdp++;
break;
case '0':
isOnline = true;
cmdp++;
break;
case '1':
isOnline = false;
cmdp++;
break;
default:
PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
errors = true;
break;
switch (tolower(param_getchar(Cmd, cmdp))) {
case 'h':
return usage_trace_list();
case 'f':
showWaitCycles = true;
cmdp++;
break;
case 'c':
markCRCBytes = true;
cmdp++;
break;
case '0':
isOnline = true;
cmdp++;
break;
case '1':
isOnline = false;
cmdp++;
break;
default:
PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
errors = true;
break;
}
} else {
@@ -461,16 +565,16 @@ int CmdTraceList(const char *Cmd) {
// 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 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;
cmdp++;
@@ -488,10 +592,10 @@ int CmdTraceList(const char *Cmd) {
if (!trace)
trace = calloc(USB_CMD_DATA_SIZE, sizeof(uint8_t));
if ( isOnline ) {
if (isOnline) {
// Query for the size of the trace, downloading USB_CMD_DATA_SIZE
UsbCommand response;
if ( !GetFromDevice(BIG_BUF, trace, USB_CMD_DATA_SIZE, 0, &response, 4000, true)) {
if (!GetFromDevice(BIG_BUF, trace, USB_CMD_DATA_SIZE, 0, &response, 4000, true)) {
PrintAndLogEx(WARNING, "timeout while waiting for reply.");
return 1;
}
@@ -505,7 +609,7 @@ int CmdTraceList(const char *Cmd) {
return 2;
}
trace = p;
if ( !GetFromDevice(BIG_BUF, trace, traceLen, 0, NULL, 2500, false)) {
if (!GetFromDevice(BIG_BUF, trace, traceLen, 0, NULL, 2500, false)) {
PrintAndLogEx(WARNING, "command execution time out");
free(trace);
return 3;
@@ -519,16 +623,16 @@ int CmdTraceList(const char *Cmd) {
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)
if (protocol == ISO_14443A || protocol == PROTO_MIFARE)
PrintAndLogEx(NORMAL, "iso14443a - All times are in carrier periods (1/13.56Mhz)");
if ( protocol == ICLASS )
if (protocol == ICLASS)
PrintAndLogEx(NORMAL, "iClass - Timings are not as accurate");
if ( protocol == LEGIC )
if (protocol == LEGIC)
PrintAndLogEx(NORMAL, "LEGIC - Reader Mode: Timings are in ticks (1us == 1.5ticks)\n"
" Tag Mode: Timings are in sub carrier periods (1/212 kHz == 4.7us)");
if ( protocol == ISO_15693 )
" Tag Mode: Timings are in sub carrier periods (1/212 kHz == 4.7us)");
if (protocol == ISO_15693)
PrintAndLogEx(NORMAL, "ISO15693 - Timings are not as accurate");
if ( protocol == ISO_7816_4 )
if (protocol == ISO_7816_4)
PrintAndLogEx(NORMAL, "ISO7816-4 / Smartcard - Timings N/A yet");
PrintAndLogEx(NORMAL, "");
@@ -543,7 +647,8 @@ int CmdTraceList(const char *Cmd) {
return 0;
}
int CmdTraceLoad(const char *Cmd) {
int CmdTraceLoad(const char *Cmd)
{
FILE *f = NULL;
char filename[FILE_PATH_SIZE];
@@ -567,13 +672,13 @@ int CmdTraceLoad(const char *Cmd) {
fclose(f);
return 3;
}
if (fsize < 4 ) {
if (fsize < 4) {
PrintAndLogEx(FAILED, "error, file is too small");
fclose(f);
return 4;
}
if ( trace )
if (trace)
free(trace);
trace = calloc(fsize, sizeof(uint8_t));
@@ -590,9 +695,10 @@ int CmdTraceLoad(const char *Cmd) {
return 0;
}
int CmdTraceSave(const char *Cmd) {
int CmdTraceSave(const char *Cmd)
{
if (traceLen == 0 ) {
if (traceLen == 0) {
PrintAndLogEx(WARNING, "trace is empty, exiting...");
return 0;
}
@@ -614,13 +720,15 @@ static command_t CommandTable[] = {
{NULL, NULL, 0, NULL}
};
int CmdTrace(const char *Cmd) {
int CmdTrace(const char *Cmd)
{
clearCommandBuffer();
CmdsParse(CommandTable, Cmd);
return 0;
}
int CmdHelp(const char *Cmd) {
int CmdHelp(const char *Cmd)
{
CmdsHelp(CommandTable);
return 0;
}