X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/1569d97730d80a0a303b74b714bb59272349c3b2..bea2a8660edd6cabce704207548d669761ef4a6d:/winsrc/command.cpp?ds=inline
diff --git a/winsrc/command.cpp b/winsrc/command.cpp
index b186d217..08feb3dd 100644
--- a/winsrc/command.cpp
+++ b/winsrc/command.cpp
@@ -12,6 +12,7 @@
#include "prox.h"
#include "../common/iso14443_crc.c"
+#include "../common/crc16.c"
#define arraylen(x) (sizeof(x)/sizeof((x)[0]))
#define BIT(x) GraphBuffer[x * clock]
@@ -300,17 +301,19 @@ static void CmdEM4x50read(char *str)
while(i < GraphTraceLen)
{
// measure from low to low
- while(GraphBuffer[i] > low)
+ while((GraphBuffer[i] > low) && (i<GraphTraceLen))
++i;
start= i;
- while(GraphBuffer[i] < high)
+ while((GraphBuffer[i] < high) && (i<GraphTraceLen))
++i;
- while(GraphBuffer[i] > low)
+ while((GraphBuffer[i] > low) && (i<GraphTraceLen))
++i;
+ if (j>(MAX_GRAPH_TRACE_LEN/64)) {
+ break;
+ }
tmpbuff[j++]= i - start;
}
-
/* look for data start - should be 2 pairs of LW (pulses of 192,128) */
start= -1;
skip= 0;
@@ -330,7 +333,7 @@ static void CmdEM4x50read(char *str)
/* skip over the remainder of the LW */
skip += tmpbuff[i+1]+tmpbuff[i+2];
- while(GraphBuffer[skip] > low)
+ while(skip < MAX_GRAPH_TRACE_LEN && GraphBuffer[skip] > low)
++skip;
skip += 8;
@@ -1394,45 +1397,6 @@ static void CmdHi15demod(char *str)
PrintToScrollback("CRC=%04x", Iso15693Crc(outBuf, k-2));
}
-static void CmdTiread(char *str)
-{
- UsbCommand c;
- c.cmd = CMD_ACQUIRE_RAW_BITS_TI_TYPE;
- SendCommand(&c, FALSE);
-}
-
-static void CmdTibits(char *str)
-{
- int cnt = 0;
- int i;
-// for(i = 0; i < 1536; i += 12) {
- for(i = 0; i < 4000; i += 12) {
- UsbCommand c;
- c.cmd = CMD_DOWNLOAD_RAW_BITS_TI_TYPE;
- c.ext1 = i;
- SendCommand(&c, FALSE);
- ReceiveCommand(&c);
- if(c.cmd != CMD_DOWNLOADED_RAW_BITS_TI_TYPE) {
- PrintToScrollback("bad resp");
- return;
- }
- int j;
- for(j = 0; j < 12; j++) {
- int k;
- for(k = 31; k >= 0; k--) {
- if(c.d.asDwords[j] & (1 << k)) {
- GraphBuffer[cnt++] = 1;
- } else {
- GraphBuffer[cnt++] = -1;
- }
- }
- }
- }
-// GraphTraceLen = 1536*32;
- GraphTraceLen = 4000*32;
- RepaintGraphWindow();
-}
-
static void CmdFSKdemod(char *cmdline)
{
static const int LowTone[] = {
@@ -1451,13 +1415,13 @@ static void CmdFSKdemod(char *cmdline)
1, 1, 1, 1, -1, -1, -1, -1, -1,
};
- int convLen = max(arraylen(HighTone), arraylen(LowTone));
+ int lowLen = sizeof(LowTone)/sizeof(int);
+ int highLen = sizeof(HighTone)/sizeof(int);
+ int convLen = (highLen>lowLen)?highLen:lowLen;
DWORD hi = 0, lo = 0;
int i, j;
int minMark=0, maxMark=0;
- int lowLen = arraylen(LowTone);
- int highLen = arraylen(HighTone);
for(i = 0; i < GraphTraceLen - convLen; i++) {
int lowSum = 0, highSum = 0;
@@ -1496,10 +1460,10 @@ static void CmdFSKdemod(char *cmdline)
int max = 0, maxPos = 0;
for(i = 0; i < 6000; i++) {
int dec = 0;
- for(j = 0; j < 3*arraylen(LowTone); j++) {
+ for(j = 0; j < 3*lowLen; j++) {
dec -= GraphBuffer[i+j];
}
- for(; j < 3*(arraylen(LowTone) + arraylen(HighTone) ); j++) {
+ for(; j < 3*(lowLen + highLen ); j++) {
dec += GraphBuffer[i+j];
}
if(dec > max) {
@@ -1519,7 +1483,7 @@ static void CmdFSKdemod(char *cmdline)
GraphBuffer[maxPos+1] = minMark;
PrintToScrollback("actual data bits start at sample %d", maxPos);
- PrintToScrollback("length %d/%d", arraylen(HighTone), arraylen(LowTone));
+ PrintToScrollback("length %d/%d", highLen, lowLen);
BYTE bits[46];
bits[sizeof(bits)-1] = '\0';
@@ -1527,10 +1491,10 @@ static void CmdFSKdemod(char *cmdline)
// find bit pairs and manchester decode them
for(i = 0; i < arraylen(bits)-1; i++) {
int dec = 0;
- for(j = 0; j < arraylen(LowTone); j++) {
+ for(j = 0; j < lowLen; j++) {
dec -= GraphBuffer[maxPos+j];
}
- for(; j < arraylen(LowTone) + arraylen(HighTone); j++) {
+ for(; j < lowLen + highLen; j++) {
dec += GraphBuffer[maxPos+j];
}
maxPos += j;
@@ -1553,7 +1517,30 @@ static void CmdFSKdemod(char *cmdline)
PrintToScrollback("hex: %08x %08x", hi, lo);
}
-static void CmdTidemod(char *cmdline)
+// read a TI tag and return its ID
+static void CmdTIRead(char *str)
+{
+ UsbCommand c;
+ c.cmd = CMD_READ_TI_TYPE;
+ SendCommand(&c, FALSE);
+}
+
+// write new data to a r/w TI tag
+static void CmdTIWrite(char *str)
+{
+ UsbCommand c;
+ int res=0;
+
+ c.cmd = CMD_WRITE_TI_TYPE;
+ res = sscanf(str, "0x%x 0x%x 0x%x ", &c.ext1, &c.ext2, &c.ext3);
+ if (res == 2) c.ext3=0;
+ if (res<2)
+ PrintToScrollback("Please specify the data as two hex strings, optionally the CRC as a third");
+ else
+ SendCommand(&c, FALSE);
+}
+
+static void CmdTIDemod(char *cmdline)
{
/* MATLAB as follows:
f_s = 2000000; % sampling frequency
@@ -1569,52 +1556,57 @@ h = 2*pi*ones(1, floor(f_s*T_h))*(f_h/f_s);
l = sign(sin(cumsum(l)));
h = sign(sin(cumsum(h)));
*/
+
+// 2M*16/134.2k = 238
static const int LowTone[] = {
- 1, 1, 1, 1, 1, 1, 1, 1, -1, -1, -1, -1, -1, -1, -1, -1,
- 1, 1, 1, 1, 1, 1, 1, 1, -1, -1, -1, -1, -1, -1, -1, -1,
- 1, 1, 1, 1, 1, 1, 1, 1, -1, -1, -1, -1, -1, -1, -1, -1,
- 1, 1, 1, 1, 1, 1, 1, 1, -1, -1, -1, -1, -1, -1, -1, -1,
- 1, 1, 1, 1, 1, 1, 1, 1, 1, -1, -1, -1, -1, -1, -1, -1, -1,
- 1, 1, 1, 1, 1, 1, 1, 1, -1, -1, -1, -1, -1, -1, -1, -1,
- 1, 1, 1, 1, 1, 1, 1, 1, -1, -1, -1, -1, -1, -1, -1, -1,
- 1, 1, 1, 1, 1, 1, 1, 1, -1, -1, -1, -1, -1, -1, -1, -1,
- 1, 1, 1, 1, 1, 1, 1, 1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- 1, 1, 1, 1, 1, 1, 1, 1, -1, -1, -1, -1, -1, -1, -1, -1,
- 1, 1, 1, 1, 1, 1, 1, 1, -1, -1, -1, -1, -1, -1, -1, -1,
- 1, 1, 1, 1, 1, 1, 1, 1, -1, -1, -1, -1, -1, -1, -1, -1,
- 1, 1, 1, 1, 1, 1, 1, 1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- 1, 1, 1, 1, 1, 1, 1, 1, -1, -1, -1, -1, -1, -1, -1, -1,
- 1, 1, 1, 1, 1, 1, 1, 1, -1, -1, -1,
+ 1, 1, 1, 1, 1, 1, 1, 1, 1, -1, -1, -1, -1, -1, -1, -1, -1,
+ 1, 1, 1, 1, 1, 1, 1, 1, -1, -1, -1, -1, -1, -1, -1, -1,
+ 1, 1, 1, 1, 1, 1, 1, 1, -1, -1, -1, -1, -1, -1, -1, -1,
+ 1, 1, 1, 1, 1, 1, 1, 1, -1, -1, -1, -1, -1, -1, -1, -1,
+ 1, 1, 1, 1, 1, 1, 1, 1, 1, -1, -1, -1, -1, -1, -1, -1, -1,
+ 1, 1, 1, 1, 1, 1, 1, 1, -1, -1, -1, -1, -1, -1, -1, -1,
+ 1, 1, 1, 1, 1, 1, 1, 1, -1, -1, -1, -1, -1, -1, -1, -1,
+ 1, 1, 1, 1, 1, 1, 1, 1, -1, -1, -1, -1, -1, -1, -1, -1,
+ 1, 1, 1, 1, 1, 1, 1, 1, 1, -1, -1, -1, -1, -1, -1, -1, -1,
+ 1, 1, 1, 1, 1, 1, 1, 1, -1, -1, -1, -1, -1, -1, -1, -1,
+ 1, 1, 1, 1, 1, 1, 1, 1, -1, -1, -1, -1, -1, -1, -1, -1,
+ 1, 1, 1, 1, 1, 1, 1, 1, -1, -1, -1, -1, -1, -1, -1, -1,
+ 1, 1, 1, 1, 1, 1, 1, 1, 1, -1, -1, -1, -1, -1, -1, -1, -1,
+ 1, 1, 1, 1, 1, 1, 1, 1, -1, -1, -1, -1, -1, -1, -1, -1,
+ 1, 1, 1, 1, 1, 1, 1, 1, -1, -1
};
+// 2M*16/123.2k = 260
static const int HighTone[] = {
- 1, 1, 1, 1, 1, 1, 1, -1, -1, -1, -1, -1, -1, -1,
- 1, 1, 1, 1, 1, 1, 1, 1, -1, -1, -1, -1, -1, -1, -1,
- 1, 1, 1, 1, 1, 1, 1, 1, -1, -1, -1, -1, -1, -1, -1,
- 1, 1, 1, 1, 1, 1, 1, 1, -1, -1, -1, -1, -1, -1, -1,
- 1, 1, 1, 1, 1, 1, 1, 1, -1, -1, -1, -1, -1, -1, -1,
- 1, 1, 1, 1, 1, 1, 1, -1, -1, -1, -1, -1, -1, -1, -1,
- 1, 1, 1, 1, 1, 1, 1, -1, -1, -1, -1, -1, -1, -1, -1,
- 1, 1, 1, 1, 1, 1, 1, -1, -1, -1, -1, -1, -1, -1, -1,
- 1, 1, 1, 1, 1, 1, 1, -1, -1, -1, -1, -1, -1, -1, -1,
- 1, 1, 1, 1, 1, 1, 1, -1, -1, -1, -1, -1, -1, -1, -1,
- 1, 1, 1, 1, 1, 1, 1, -1, -1, -1, -1, -1, -1, -1,
- 1, 1, 1, 1, 1, 1, 1, 1, -1, -1, -1, -1, -1, -1, -1,
- 1, 1, 1, 1, 1, 1, 1, 1, -1, -1, -1, -1, -1, -1, -1,
- 1, 1, 1, 1, 1, 1, 1, 1, -1, -1, -1, -1, -1, -1, -1,
- 1, 1, 1, 1, 1, 1, 1, 1, -1, -1, -1, -1, -1, -1, -1,
- 1, 1, 1, 1, 1, 1, 1, -1, -1, -1, -1, -1, -1, -1, -1,
- 1, 1, 1, 1, 1, 1, 1, -1, -1, -1, -1, -1, -1, -1, -1,
- 1, 1, 1, 1, 1, 1, 1,
+ 1, 1, 1, 1, 1, 1, 1, 1, -1, -1, -1, -1, -1, -1, -1,
+ 1, 1, 1, 1, 1, 1, 1, 1, -1, -1, -1, -1, -1, -1, -1,
+ 1, 1, 1, 1, 1, 1, 1, -1, -1, -1, -1, -1, -1, -1, -1,
+ 1, 1, 1, 1, 1, 1, 1, -1, -1, -1, -1, -1, -1, -1, -1,
+ 1, 1, 1, 1, 1, 1, 1, -1, -1, -1, -1, -1, -1, -1, -1,
+ 1, 1, 1, 1, 1, 1, 1, -1, -1, -1, -1, -1, -1, -1,
+ 1, 1, 1, 1, 1, 1, 1, 1, -1, -1, -1, -1, -1, -1, -1,
+ 1, 1, 1, 1, 1, 1, 1, 1, -1, -1, -1, -1, -1, -1, -1,
+ 1, 1, 1, 1, 1, 1, 1, -1, -1, -1, -1, -1, -1, -1, -1,
+ 1, 1, 1, 1, 1, 1, 1, -1, -1, -1, -1, -1, -1, -1, -1,
+ 1, 1, 1, 1, 1, 1, 1, -1, -1, -1, -1, -1, -1, -1,
+ 1, 1, 1, 1, 1, 1, 1, 1, -1, -1, -1, -1, -1, -1, -1,
+ 1, 1, 1, 1, 1, 1, 1, 1, -1, -1, -1, -1, -1, -1, -1,
+ 1, 1, 1, 1, 1, 1, 1, 1, -1, -1, -1, -1, -1, -1, -1,
+ 1, 1, 1, 1, 1, 1, 1, -1, -1, -1, -1, -1, -1, -1, -1,
+ 1, 1, 1, 1, 1, 1, 1, -1, -1, -1, -1, -1, -1, -1, -1,
+ 1, 1, 1, 1, 1, 1, 1, -1, -1, -1, -1, -1, -1, -1,
+ 1, 1, 1, 1, 1, 1, 1, 1
};
+ int lowLen = sizeof(LowTone)/sizeof(int);
+ int highLen = sizeof(HighTone)/sizeof(int);
+ int convLen = (highLen>lowLen)?highLen:lowLen;
+ WORD crc;
+ int i, j, TagType;
+ int lowSum = 0, highSum = 0;;
+ int lowTot = 0, highTot = 0;
- int convLen = max(arraylen(HighTone), arraylen(LowTone));
-
- int i;
for(i = 0; i < GraphTraceLen - convLen; i++) {
- int j;
- int lowSum = 0, highSum = 0;;
- int lowLen = arraylen(LowTone);
- int highLen = arraylen(HighTone);
+ lowSum = 0;
+ highSum = 0;;
for(j = 0; j < lowLen; j++) {
lowSum += LowTone[j]*GraphBuffer[i+j];
@@ -1624,12 +1616,15 @@ h = sign(sin(cumsum(h)));
}
lowSum = abs((100*lowSum) / lowLen);
highSum = abs((100*highSum) / highLen);
+ lowSum = (lowSum<0)?-lowSum:lowSum;
+ highSum = (highSum<0)?-highSum:highSum;
+
GraphBuffer[i] = (highSum << 16) | lowSum;
}
for(i = 0; i < GraphTraceLen - convLen - 16; i++) {
- int j;
- int lowTot = 0, highTot = 0;
+ lowTot = 0;
+ highTot = 0;
// 16 and 15 are f_s divided by f_l and f_h, rounded
for(j = 0; j < 16; j++) {
lowTot += (GraphBuffer[i+j] & 0xffff);
@@ -1644,17 +1639,29 @@ h = sign(sin(cumsum(h)));
RepaintGraphWindow();
- // Okay, so now we have unsliced soft decisions; find bit-sync, and then
- // get some bits.
+ // TI tag data format is 16 prebits, 8 start bits, 64 data bits,
+ // 16 crc CCITT bits, 8 stop bits, 15 end bits
+
+ // the 16 prebits are always low
+ // the 8 start and stop bits of a tag must match
+ // the start/stop prebits of a ro tag are 01111110
+ // the start/stop prebits of a rw tag are 11111110
+ // the 15 end bits of a ro tag are all low
+ // the 15 end bits of a rw tag match bits 15-1 of the data bits
+ // Okay, so now we have unsliced soft decisions;
+ // find bit-sync, and then get some bits.
+ // look for 17 low bits followed by 6 highs (common pattern for ro and rw tags)
int max = 0, maxPos = 0;
for(i = 0; i < 6000; i++) {
int j;
int dec = 0;
- for(j = 0; j < 8*arraylen(LowTone); j++) {
+ // searching 17 consecutive lows
+ for(j = 0; j < 17*lowLen; j++) {
dec -= GraphBuffer[i+j];
}
- for(; j < 8*arraylen(LowTone) + 8*arraylen(HighTone); j++) {
+ // searching 7 consecutive highs
+ for(; j < 17*lowLen + 6*highLen; j++) {
dec += GraphBuffer[i+j];
}
if(dec > max) {
@@ -1662,58 +1669,113 @@ h = sign(sin(cumsum(h)));
maxPos = i;
}
}
- GraphBuffer[maxPos] = 800;
- GraphBuffer[maxPos+1] = -800;
- maxPos += 8*arraylen(LowTone);
+ // place a marker in the buffer to visually aid location
+ // of the start of sync
GraphBuffer[maxPos] = 800;
GraphBuffer[maxPos+1] = -800;
- maxPos += 8*arraylen(HighTone);
+ // advance pointer to start of actual data stream (after 16 pre and 8 start bits)
+ maxPos += 17*lowLen;
+ maxPos += 6*highLen;
+
+ // place a marker in the buffer to visually aid location
+ // of the end of sync
GraphBuffer[maxPos] = 800;
GraphBuffer[maxPos+1] = -800;
PrintToScrollback("actual data bits start at sample %d", maxPos);
- PrintToScrollback("length %d/%d", arraylen(HighTone), arraylen(LowTone));
+ PrintToScrollback("length %d/%d", highLen, lowLen);
- BYTE bits[64+16+8+1];
+ BYTE bits[1+64+16+8+16];
bits[sizeof(bits)-1] = '\0';
- for(i = 0; i < arraylen(bits); i++) {
+ DWORD shift3 = 0x7e000000, shift2 = 0, shift1 = 0, shift0 = 0;
+
+ for(i = 0; i < arraylen(bits)-1; i++) {
int high = 0;
int low = 0;
int j;
- for(j = 0; j < arraylen(LowTone); j++) {
+ for(j = 0; j < lowLen; j++) {
low -= GraphBuffer[maxPos+j];
}
- for(j = 0; j < arraylen(HighTone); j++) {
+ for(j = 0; j < highLen; j++) {
high += GraphBuffer[maxPos+j];
}
+
if(high > low) {
bits[i] = '1';
- maxPos += arraylen(HighTone);
+ maxPos += highLen;
+ // bitstream arrives lsb first so shift right
+ shift3 |= (1<<31);
} else {
bits[i] = '.';
- maxPos += arraylen(LowTone);
+ maxPos += lowLen;
}
+
+ // 128 bit right shift register
+ shift0 = (shift0>>1) | (shift1 << 31);
+ shift1 = (shift1>>1) | (shift2 << 31);
+ shift2 = (shift2>>1) | (shift3 << 31);
+ shift3 >>= 1;
+
+ // place a marker in the buffer between bits to visually aid location
GraphBuffer[maxPos] = 800;
GraphBuffer[maxPos+1] = -800;
}
- PrintToScrollback("bits: '%s'", bits);
+ PrintToScrollback("Info: raw tag bits = %s", bits);
- DWORD h = 0, l = 0;
- for(i = 0; i < 32; i++) {
- if(bits[i] == '1') {
- l |= (1<<i);
- }
+ TagType = (shift3>>8)&0xff;
+ if ( TagType != ((shift0>>16)&0xff) ) {
+ PrintToScrollback("Error: start and stop bits do not match!");
+ return;
+ }
+ else if (TagType == 0x7e) {
+ PrintToScrollback("Info: Readonly TI tag detected.");
+ return;
}
- for(i = 32; i < 64; i++) {
- if(bits[i] == '1') {
- h |= (1<<(i-32));
+ else if (TagType == 0xfe) {
+ PrintToScrollback("Info: Rewriteable TI tag detected.");
+
+ // put 64 bit data into shift1 and shift0
+ shift0 = (shift0>>24) | (shift1 << 8);
+ shift1 = (shift1>>24) | (shift2 << 8);
+
+ // align 16 bit crc into lower half of shift2
+ shift2 = ((shift2>>24) | (shift3 << 8)) & 0x0ffff;
+
+ // align 16 bit "end bits" or "ident" into lower half of shift3
+ shift3 >>= 16;
+
+ // only 15 bits compare, last bit of ident is not valid
+ if ( (shift3^shift0)&0x7fff ) {
+ PrintToScrollback("Error: Ident mismatch!");
+ }
+ // WARNING the order of the bytes in which we calc crc below needs checking
+ // i'm 99% sure the crc algorithm is correct, but it may need to eat the
+ // bytes in reverse or something
+ // calculate CRC
+ crc=0;
+ crc = update_crc16(crc, (shift0)&0xff);
+ crc = update_crc16(crc, (shift0>>8)&0xff);
+ crc = update_crc16(crc, (shift0>>16)&0xff);
+ crc = update_crc16(crc, (shift0>>24)&0xff);
+ crc = update_crc16(crc, (shift1)&0xff);
+ crc = update_crc16(crc, (shift1>>8)&0xff);
+ crc = update_crc16(crc, (shift1>>16)&0xff);
+ crc = update_crc16(crc, (shift1>>24)&0xff);
+ PrintToScrollback("Info: Tag data = %08X%08X", shift1, shift0);
+ if (crc != (shift2&0xffff)) {
+ PrintToScrollback("Error: CRC mismatch, calculated %04X, got ^04X", crc, shift2&0xffff);
+ } else {
+ PrintToScrollback("Info: CRC %04X is good", crc);
}
}
- PrintToScrollback("hex: %08x %08x", h, l);
+ else {
+ PrintToScrollback("Unknown tag type.");
+ return;
+ }
}
static void CmdNorm(char *str)
@@ -2777,9 +2839,9 @@ static struct {
{"scale", CmdScale, 1, "<int> -- Set cursor display scale"},
{"setlfdivisor", CmdSetDivisor, 0, "<19 - 255> -- Drive LF antenna at 12Mhz/(divisor+1)"},
{"sri512read", CmdSri512read, 0, "<int> -- Read contents of a SRI512 tag"},
- {"tibits", CmdTibits, 0, "Get raw bits for TI-type LF tag"},
- {"tidemod", CmdTidemod, 1, "Demodulate raw bits for TI-type LF tag"},
- {"tiread", CmdTiread, 0, "Read a TI-type 134 kHz tag"},
+ {"tidemod", CmdTIDemod, 1, "Demodulate raw bits for TI-type LF tag"},
+ {"tiread", CmdTIRead, 0, "Read and decode a TI 134 kHz tag"},
+ {"tiwrite", CmdTIWrite, 0, "Write new data to a r/w TI 134 kHz tag"},
{"threshold", CmdThreshold, 1, "Maximize/minimize every value in the graph window depending on threshold"},
{"tune", CmdTune, 0, "Measure antenna tuning"},
{"vchdemod", CmdVchdemod, 0, "['clone'] -- Demodulate samples for VeriChip"},