X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/bf8328e92802fd5f2b63a038ac0b3fc0eeac8581..d3521ae609658fa00955c8fd57f69eb84ce7a7cd:/client/cmdhf.c
diff --git a/client/cmdhf.c b/client/cmdhf.c
index 550f8e86..6d25cac0 100644
--- a/client/cmdhf.c
+++ b/client/cmdhf.c
@@ -1,5 +1,6 @@
//-----------------------------------------------------------------------------
// Copyright (C) 2010 iZsh <izsh at fail0verflow.com>
+// Merlok - 2017
//
// 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
@@ -8,13 +9,14 @@
// High frequency commands
//-----------------------------------------------------------------------------
-#include <stdio.h>
-#include <string.h>
-#include "proxmark3.h"
-#include "graph.h"
+#include "cmdhf.h"
+
+#include <math.h>
+#include "usb_cmd.h"
+#include "comms.h"
#include "ui.h"
#include "cmdparser.h"
-#include "cmdhf.h"
+#include "cliparser/cliparser.h"
#include "cmdhf14a.h"
#include "cmdhf14b.h"
#include "cmdhf15.h"
@@ -22,6 +24,14 @@
#include "cmdhflegic.h"
#include "cmdhficlass.h"
#include "cmdhfmf.h"
+#include "cmdhfmfp.h"
+#include "cmdhfmfu.h"
+#include "cmdhftopaz.h"
+#include "cmdhflist.h"
+#include "cmdhffido.h"
+#include "cmddata.h"
+#include "graph.h"
+#include "fpga.h"
static int CmdHelp(const char *Cmd);
@@ -31,299 +41,125 @@ int CmdHFTune(const char *Cmd)
SendCommand(&c);
return 0;
}
-// for the time being. Need better Bigbuf handling.
-#define TRACE_SIZE 3000
-#define ICLASS_CMD_ACTALL 0x0A
-#define ICLASS_CMD_IDENTIFY 0x0C
-#define ICLASS_CMD_READ 0x0C
-#define ICLASS_CMD_SELECT 0x81
-#define ICLASS_CMD_PAGESEL 0x84
-#define ICLASS_CMD_READCHECK 0x88
-#define ICLASS_CMD_CHECK 0x05
-#define ICLASS_CMD_SOF 0x0F
-#define ICLASS_CMD_HALT 0x00
-
-#define iso14443_CMD_WUPA 0x52
-#define iso14443_CMD_SELECT 0x93
-#define iso14443_CMD_SELECT_2 0x95
-#define iso14443_CMD_REQ 0x26
-#define iso14443_CMD_READBLOCK 0x30
-#define iso14443_CMD_WRITEBLOCK 0xA0
-#define iso14443_CMD_INC 0xC0
-#define iso14443_CMD_DEC 0xC1
-#define iso14443_CMD_RESTORE 0xC2
-#define iso14443_CMD_TRANSFER 0xB0
-#define iso14443_CMD_HALT 0x50
-#define iso14443_CMD_RATS 0xE0
-
-
-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_SELECT:{
- if(cmdsize > 2)
- {
- snprintf(exp,size,"SELECT_UID"); break;
- }else
- {
- snprintf(exp,size,"SELECT_ALL"); break;
- }
- }
- case iso14443_CMD_SELECT_2: snprintf(exp,size,"SELECT_2"); break;
- case iso14443_CMD_REQ: snprintf(exp,size,"REW"); 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_INC: snprintf(exp,size,"INC(%d)",cmd[1]); break;
- case iso14443_CMD_DEC: snprintf(exp,size,"DEC(%d)",cmd[1]); break;
- case iso14443_CMD_RESTORE: snprintf(exp,size,"RESTORE(%d)",cmd[1]); break;
- case iso14443_CMD_TRANSFER: snprintf(exp,size,"TRANSFER(%d)",cmd[1]); break;
- case iso14443_CMD_HALT: snprintf(exp,size,"HALT"); break;
- case iso14443_CMD_RATS: snprintf(exp,size,"RATS"); break;
- default: snprintf(exp,size,"?"); break;
- }
- return;
+int CmdHFSearch(const char *Cmd){
+ int ans = 0;
+ PrintAndLog("");
+ ans = CmdHF14AInfo("s");
+ if (ans > 0) {
+ PrintAndLog("\nValid ISO14443A Tag Found - Quiting Search\n");
+ return ans;
+ }
+ ans = HFiClassReader("", false, false);
+ if (ans) {
+ PrintAndLog("\nValid iClass Tag (or PicoPass Tag) Found - Quiting Search\n");
+ return ans;
+ }
+ ans = HF15Reader("", false);
+ if (ans) {
+ PrintAndLog("\nValid ISO15693 Tag Found - Quiting Search\n");
+ return ans;
+ }
+ //14b is longest test currently (and rarest chip type) ... put last
+ ans = HF14BInfo(false);
+ if (ans) {
+ PrintAndLog("\nValid ISO14443B Tag Found - Quiting Search\n");
+ return ans;
+ }
+ ans = CmdLegicRFRead("");
+ if (ans == 0) {
+ PrintAndLog("\nValid Legic Tag Found - Quiting Search\n");
+ return ans;
+ }
+ PrintAndLog("\nno known/supported 13.56 MHz tags found\n");
+ return 0;
}
-void annotateIclass(char *exp, size_t size, uint8_t* cmd, uint8_t cmdsize)
+int CmdHFSnoop(const char *Cmd)
{
-
- if(cmdsize > 1 && cmd[0] == ICLASS_CMD_READ)
- {
- snprintf(exp,size,"READ(%d)",cmd[1]);
- return;
- }
-
- switch(cmd[0])
- {
- case ICLASS_CMD_ACTALL: snprintf(exp,size,"ACTALL"); break;
- case ICLASS_CMD_IDENTIFY: snprintf(exp,size,"IDENTIFY"); break;
- case ICLASS_CMD_SELECT: snprintf(exp,size,"SELECT"); break;
- case ICLASS_CMD_PAGESEL: snprintf(exp,size,"PAGESEL"); break;
- case ICLASS_CMD_READCHECK: snprintf(exp,size,"READCHECK"); break;
- case ICLASS_CMD_CHECK: snprintf(exp,size,"CHECK"); break;
- case ICLASS_CMD_SOF: snprintf(exp,size,"SOF"); break;
- case ICLASS_CMD_HALT: snprintf(exp,size,"HALT"); break;
- default: snprintf(exp,size,"?"); break;
- }
- return;
+ char * pEnd;
+ UsbCommand c = {CMD_HF_SNIFFER, {strtol(Cmd, &pEnd,0),strtol(pEnd, &pEnd,0),0}};
+ SendCommand(&c);
+ return 0;
}
-
-uint16_t printTraceLine(uint16_t tracepos, uint8_t* trace, bool iclass, bool showWaitCycles)
+// static void InterpolateShannon(int *source, size_t source_len, int *dest, size_t dest_len)
+// {
+ // int *buf = (int*)malloc(source_len * sizeof(int));
+ // memcpy(buf, source, source_len * sizeof(int));
+ // for (int i = 0; i < source_len; i++) {
+ // buf[i] += 128;
+ // }
+ // for (int i = 0; i < dest_len; i++) {
+ // float value = 0.0;
+ // for (int j = 0; j < source_len; j++) {
+ // if (i * source_len == j * dest_len) { // sin(0) / 0 = 1
+ // value += (float)buf[j];
+ // } else {
+ // value += (float)buf[j] * sin(((float)i*source_len/dest_len-j)*3.1415) / (((float)i*source_len/dest_len-j)*3.1415);
+ // }
+ // }
+ // dest[i] = value - 128;
+ // }
+ // free(buf);
+// }
+
+
+static int CmdHFPlot(const char *Cmd)
{
- bool isResponse;
- uint16_t duration, data_len,parity_len;
-
- uint32_t timestamp, first_timestamp, EndOfTransmissionTimestamp;
- char explanation[30] = {0};
-
- first_timestamp = *((uint32_t *)(trace));
- timestamp = *((uint32_t *)(trace + tracepos));
- // Break and stick with current result if buffer was not completely full
- if (timestamp == 0x44444444) return TRACE_SIZE;
-
- 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 >= 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];
- for (int j = 0; j < data_len; j++) {
- int oddparity = 0x01;
- int k;
-
- for (k=0 ; k<8 ; k++) {
- oddparity ^= (((frame[j] & 0xFF) >> k) & 0x01);
- }
-
- uint8_t parityBits = parityBytes[j>>3];
-
- if (isResponse && (oddparity != ((parityBits >> (7-(j&0x0007))) & 0x01))) {
- sprintf(line[j/16]+((j%16)*4), "%02x! ", frame[j]);
- } else {
- sprintf(line[j/16]+((j%16)*4), "%02x ", frame[j]);
+ CLIParserInit("hf plot",
+ "Plots HF signal after RF signal path and A/D conversion.",
+ "This can be used after any hf command and will show the last few milliseconds of the HF signal.\n"
+ "Note: If the last hf command terminated because of a timeout you will most probably see nothing.\n");
+ void* argtable[] = {
+ arg_param_begin,
+ arg_param_end
+ };
+ CLIExecWithReturn(Cmd, argtable, true);
+
+ uint8_t buf[FPGA_TRACE_SIZE];
+
+ if (GetFromFpgaRAM(buf, FPGA_TRACE_SIZE)) {
+ for (size_t i = 0; i < FPGA_TRACE_SIZE; i++) {
+ GraphBuffer[i] = (int)buf[i] - 128;
}
- }
- //--- Draw the CRC column
- bool crcError = false;
-
- if (data_len > 2) {
- uint8_t b1, b2;
- if(iclass)
- {
- if(!isResponse && data_len == 4 ) {
- // Rough guess that this is a command from the reader
- // For iClass the command byte is not part of the CRC
- ComputeCrc14443(CRC_ICLASS, &frame[1], data_len-3, &b1, &b2);
- }
- else {
- // For other data.. CRC might not be applicable (UPDATE commands etc.)
- ComputeCrc14443(CRC_ICLASS, frame, data_len-2, &b1, &b2);
- }
-
- if (b1 != frame[data_len-2] || b2 != frame[data_len-1]) {
- crcError = true;
- }
-
- }else{//Iso 14443a
-
- ComputeCrc14443(CRC_14443_A, frame, data_len-2, &b1, &b2);
-
- if (b1 != frame[data_len-2] || b2 != frame[data_len-1]) {
- if(!(isResponse & (data_len < 6)))
- {
- crcError = true;
- }
- }
- }
-
- }
- char *crc = crcError ? "!crc" :" ";
-
- EndOfTransmissionTimestamp = timestamp + duration;
-
- if(!isResponse)
- {
- if(iclass) annotateIclass(explanation,sizeof(explanation),frame,data_len);
- else annotateIso14443a(explanation,sizeof(explanation),frame,data_len);
- }
-
- int num_lines = (data_len - 1)/16 + 1;
- for (int j = 0; j < num_lines; j++) {
- if (j == 0) {
- PrintAndLog(" %9d | %9d | %s | %-64s| %s| %s",
- (timestamp - first_timestamp),
- (EndOfTransmissionTimestamp - first_timestamp),
- (isResponse ? "Tag" : "Rdr"),
- line[j],
- (j == num_lines-1) ? crc : " ",
- (j == num_lines-1) ? explanation : "");
- } else {
- PrintAndLog(" | | | %-64s| %s| %s",
- line[j],
- (j == num_lines-1)?crc:" ",
- (j == num_lines-1) ? explanation : "");
- }
- }
-
- 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) {
- PrintAndLog(" %9d | %9d | %s | fdt (Frame Delay Time): %d",
- (EndOfTransmissionTimestamp - first_timestamp),
- (next_timestamp - first_timestamp),
- " ",
- (next_timestamp - EndOfTransmissionTimestamp));
- }
- }
- return tracepos;
-}
-
-int CmdHFList(const char *Cmd)
-{
- bool showWaitCycles = false;
- char type[40] = {0};
- int tlen = param_getstr(Cmd,0,type);
- char param = param_getchar(Cmd, 1);
- bool errors = false;
- bool iclass = false;
- //Validate params
- if(tlen == 0 || (strcmp(type, "iclass") != 0 && strcmp(type,"14a") != 0))
- {
- errors = true;
- }
- if(param == 'h' || (param !=0 && param != 'f'))
- {
- errors = true;
- }
-
- if (errors) {
- PrintAndLog("List protocol data in trace buffer.");
- PrintAndLog("Usage: hf list [14a|iclass] [f]");
- PrintAndLog(" 14a - interpret data as iso14443a communications");
- PrintAndLog(" iclass - interpret data as iclass communications");
- 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;
- }
-
-
- uint8_t trace[TRACE_SIZE];
- 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");
- PrintAndLog("iso14443a - All times are in carrier periods (1/13.56Mhz)");
- PrintAndLog("iClass - Timings are not as accurate");
- PrintAndLog("");
- PrintAndLog(" Start | End | Src | Data (! denotes parity error) | CRC | Annotation |");
- PrintAndLog("-----------|-----------|-----|-----------------------------------------------------------------|-----|--------------------|");
-
- while(tracepos < TRACE_SIZE)
- {
- tracepos = printTraceLine(tracepos, trace, iclass, showWaitCycles);
+ GraphTraceLen = FPGA_TRACE_SIZE;
+ // InterpolateShannon(GraphBuffer, FPGA_TRACE_SIZE, GraphBuffer, FPGA_TRACE_SIZE*8/7);
+ // GraphTraceLen = FPGA_TRACE_SIZE*8/7;
+ ShowGraphWindow();
+ RepaintGraphWindow();
}
return 0;
}
-static command_t CommandTable[] =
+static command_t CommandTable[] =
{
- {"help", CmdHelp, 1, "This help"},
- {"14a", CmdHF14A, 1, "{ ISO14443A RFIDs... }"},
- {"14b", CmdHF14B, 1, "{ ISO14443B RFIDs... }"},
- {"15", CmdHF15, 1, "{ ISO15693 RFIDs... }"},
- {"epa", CmdHFEPA, 1, "{ German Identification Card... }"},
- {"legic", CmdHFLegic, 0, "{ LEGIC RFIDs... }"},
- {"iclass", CmdHFiClass, 1, "{ ICLASS RFIDs... }"},
- {"mf", CmdHFMF, 1, "{ MIFARE RFIDs... }"},
- {"tune", CmdHFTune, 0, "Continuously measure HF antenna tuning"},
- {"list", CmdHFList, 1, "List protocol data in trace buffer"},
- {NULL, NULL, 0, NULL}
+ {"help", CmdHelp, 1, "This help"},
+ {"14a", CmdHF14A, 0, "{ ISO14443A RFIDs... }"},
+ {"14b", CmdHF14B, 0, "{ ISO14443B RFIDs... }"},
+ {"15", CmdHF15, 1, "{ ISO15693 RFIDs... }"},
+ {"epa", CmdHFEPA, 0, "{ German Identification Card... }"},
+ {"legic", CmdHFLegic, 0, "{ LEGIC RFIDs... }"},
+ {"iclass", CmdHFiClass, 1, "{ ICLASS RFIDs... }"},
+ {"mf", CmdHFMF, 1, "{ MIFARE RFIDs... }"},
+ {"mfu", CmdHFMFUltra, 1, "{ MIFARE Ultralight RFIDs... }"},
+ {"mfp", CmdHFMFP, 0, "{ MIFARE Plus RFIDs... }"},
+ {"topaz", CmdHFTopaz, 0, "{ TOPAZ (NFC Type 1) RFIDs... }"},
+ {"fido", CmdHFFido, 0, "{ FIDO and FIDO2 authenticators... }"},
+ {"tune", CmdHFTune, 0, "Continuously measure HF antenna tuning"},
+ {"list", CmdHFList, 1, "List protocol data in trace buffer"},
+ {"plot", CmdHFPlot, 0, "Plot signal"},
+ {"search", CmdHFSearch, 0, "Search for known HF tags [preliminary]"},
+ {"snoop", CmdHFSnoop, 0, "<samples to skip (10000)> <triggers to skip (1)> Generic HF Snoop"},
+ {NULL, NULL, 0, NULL}
};
int CmdHF(const char *Cmd)
{
CmdsParse(CommandTable, Cmd);
- return 0;
+ return 0;
}
int CmdHelp(const char *Cmd)