#include <stdlib.h>
#include <string.h>
#include <limits.h>
-//#include "proxusb.h"
#include "proxmark3.h"
#include "data.h"
#include "graph.h"
#include "cmdparser.h"
#include "cmdmain.h"
#include "cmddata.h"
+#include "util.h"
#include "cmdlf.h"
#include "cmdlfhid.h"
#include "cmdlfti.h"
GraphBuffer[start] = 2;
GraphBuffer[start+1] = -2;
+ uint8_t bits[64] = {0x00};
- uint8_t bits[64];
-
- int bit;
+ int bit, sum;
i = start;
for (bit = 0; bit < 64; bit++) {
- int j;
- int sum = 0;
- for (j = 0; j < 16; j++) {
+ sum = 0;
+ for (int j = 0; j < 16; j++) {
sum += GraphBuffer[i++];
}
- if (sum > 0) {
- bits[bit] = 1;
- } else {
- bits[bit] = 0;
- }
+
+ bits[bit] = (sum > 0) ? 1 : 0;
+
PrintAndLog("bit %d sum %d", bit, sum);
}
}
}
+ // HACK writing back to graphbuffer.
GraphTraceLen = 32*64;
i = 0;
int phase = 0;
for (bit = 0; bit < 64; bit++) {
- if (bits[bit] == 0) {
- phase = 0;
- } else {
- phase = 1;
- }
+
+ phase = (bits[bit] == 0) ? 0 : 1;
+
int j;
for (j = 0; j < 32; j++) {
GraphBuffer[i++] = phase;
int state = -1;
int count = 0;
int i, j;
+
// worst case with GraphTraceLen=64000 is < 4096
// under normal conditions it's < 2048
+
uint8_t rawbits[4096];
int rawbit = 0;
int worst = 0, worstPos = 0;
- PrintAndLog("Expecting a bit less than %d raw bits", GraphTraceLen / 32);
+ // PrintAndLog("Expecting a bit less than %d raw bits", GraphTraceLen / 32);
for (i = 0; i < GraphTraceLen-1; i += 2) {
count += 1;
if ((GraphBuffer[i] > GraphBuffer[i + 1]) && (state != 1)) {
count = 0;
}
}
- PrintAndLog("Recovered %d raw bits", rawbit);
- PrintAndLog("worst metric (0=best..7=worst): %d at pos %d", worst, worstPos);
+
+ if (rawbit>0){
+ PrintAndLog("Recovered %d raw bits, expected: %d", rawbit, GraphTraceLen/32);
+ PrintAndLog("worst metric (0=best..7=worst): %d at pos %d", worst, worstPos);
+ } else {
+ return 0;
+ }
// Finding the start of a UID
int uidlen, long_wait;
uidlen = 64;
long_wait = 29;
}
+
int start;
int first = 0;
for (start = 0; start <= rawbit - uidlen; start++) {
break;
}
}
+
if (start == rawbit - uidlen + 1) {
PrintAndLog("nothing to wait for");
return 0;
}
// Dumping UID
- uint8_t bits[224];
- char showbits[225];
- showbits[uidlen]='\0';
+ uint8_t bits[224] = {0x00};
+ char showbits[225] = {0x00};
int bit;
i = start;
int times = 0;
+
if (uidlen > rawbit) {
PrintAndLog("Warning: not enough raw bits to get a full UID");
for (bit = 0; bit < rawbit; bit++) {
//convert UID to HEX
uint32_t uid1, uid2, uid3, uid4, uid5, uid6, uid7;
int idx;
- uid1=0;
- uid2=0;
+ uid1 = uid2 = 0;
+
if (uidlen==64){
for( idx=0; idx<64; idx++) {
if (showbits[idx] == '0') {
PrintAndLog("UID=%s (%x%08x)", showbits, uid1, uid2);
}
else {
- uid3=0;
- uid4=0;
- uid5=0;
- uid6=0;
- uid7=0;
+ uid3 = uid4 = uid5 = uid6 = uid7 = 0;
+
for( idx=0; idx<224; idx++) {
uid1=(uid1<<1)|(uid2>>31);
uid2=(uid2<<1)|(uid3>>31);
uid4=(uid4<<1)|(uid5>>31);
uid5=(uid5<<1)|(uid6>>31);
uid6=(uid6<<1)|(uid7>>31);
- if (showbits[idx] == '0') uid7=(uid7<<1)|0;
- else uid7=(uid7<<1)|1;
+
+ if (showbits[idx] == '0')
+ uid7 = (uid7<<1) | 0;
+ else
+ uid7 = (uid7<<1) | 1;
}
PrintAndLog("UID=%s (%x%08x%08x%08x%08x%08x%08x)", showbits, uid1, uid2, uid3, uid4, uid5, uid6, uid7);
}
// Checking UID against next occurrences
- for (; i + uidlen <= rawbit;) {
int failed = 0;
+ for (; i + uidlen <= rawbit;) {
+ failed = 0;
for (bit = 0; bit < uidlen; bit++) {
if (bits[bit] != rawbits[i++]) {
failed = 1;
}
times += 1;
}
+
PrintAndLog("Occurrences: %d (expected %d)", times, (rawbit - start) / uidlen);
// Remodulating for tag cloning
+ // HACK: 2015-01-04 this will have an impact on our new way of seening lf commands (demod)
+ // since this changes graphbuffer data.
GraphTraceLen = 32*uidlen;
i = 0;
int phase = 0;
}
RepaintGraphWindow();
- return 0;
+ return 1;
}
int CmdIndalaClone(const char *Cmd)
{
- unsigned int uid1, uid2, uid3, uid4, uid5, uid6, uid7;
UsbCommand c;
- uid1=0;
- uid2=0;
- uid3=0;
- uid4=0;
- uid5=0;
- uid6=0;
- uid7=0;
+ unsigned int uid1, uid2, uid3, uid4, uid5, uid6, uid7;
+
+ uid1 = uid2 = uid3 = uid4 = uid5 = uid6 = uid7 = 0;
int n = 0, i = 0;
if (strchr(Cmd,'l') != 0) {
c.d.asDwords[4] = uid5;
c.d.asDwords[5] = uid6;
c.d.asDwords[6] = uid7;
- }
- else
- {
+ } else {
while (sscanf(&Cmd[i++], "%1x", &n ) == 1) {
uid1 = (uid1 << 4) | (uid2 >> 28);
uid2 = (uid2 << 4) | (n & 0xf);
int CmdLFRead(const char *Cmd)
{
UsbCommand c = {CMD_ACQUIRE_RAW_ADC_SAMPLES_125K};
+
// 'h' means higher-low-frequency, 134 kHz
if(*Cmd == 'h') {
c.arg[0] = 1;
} else if (*Cmd == '\0') {
c.arg[0] = 0;
} else if (sscanf(Cmd, "%"lli, &c.arg[0]) != 1) {
- PrintAndLog("use 'read' or 'read h', or 'read <divisor>'");
+ PrintAndLog("Samples 1: 'lf read'");
+ PrintAndLog(" 2: 'lf read h'");
+ PrintAndLog(" 3: 'lf read <divisor>'");
return 0;
}
SendCommand(&c);
int i;
/* convert to bitstream if necessary */
- for (i = 0; i < (int)(GraphTraceLen / 2); i++)
- {
- if (GraphBuffer[i] > 1 || GraphBuffer[i] < 0)
- {
+ for (i = 0; i < (int)(GraphTraceLen / 2); i++){
+ if (GraphBuffer[i] > 1 || GraphBuffer[i] < 0) {
CmdBitstream(str);
break;
}
}
}
-
+//appears to attempt to simulate manchester
int CmdLFSim(const char *Cmd)
{
- int i;
+ int i,j;
static int gap;
sscanf(Cmd, "%i", &gap);
/* convert to bitstream if necessary */
ChkBitstream(Cmd);
- PrintAndLog("Sending data, please wait...");
- for (i = 0; i < GraphTraceLen; i += 48) {
+ printf("Sending [%d bytes]", GraphTraceLen);
+ for (i = 0; i < GraphTraceLen; i += USB_CMD_DATA_SIZE) {
UsbCommand c={CMD_DOWNLOADED_SIM_SAMPLES_125K, {i, 0, 0}};
- int j;
- for (j = 0; j < 48; j++) {
+
+ for (j = 0; j < USB_CMD_DATA_SIZE; j++) {
c.d.asBytes[j] = GraphBuffer[i+j];
}
SendCommand(&c);
WaitForResponse(CMD_ACK,NULL);
+ printf(".");
}
- PrintAndLog("Starting simulator...");
+ printf("\n");
+ PrintAndLog("Starting to simulate");
UsbCommand c = {CMD_SIMULATE_TAG_125K, {GraphTraceLen, gap, 0}};
SendCommand(&c);
return 0;
int CmdLFSimBidir(const char *Cmd)
{
- /* Set ADC to twice the carrier for a slight supersampling */
+ // Set ADC to twice the carrier for a slight supersampling
+ // HACK: not implemented in ARMSRC.
+ PrintAndLog("Not implemented yet.");
UsbCommand c = {CMD_LF_SIMULATE_BIDIR, {47, 384, 0}};
SendCommand(&c);
return 0;
static int clock, gap;
static char data[1024], gapstring[8];
- /* get settings/bits */
sscanf(Cmd, "%i %s %i", &clock, &data[0], &gap);
- /* clear our graph */
ClearGraph(0);
- /* fill it with our bitstream */
for (int i = 0; i < strlen(data) ; ++i)
AppendGraph(0, clock, data[i]- '0');
- /* modulate */
CmdManchesterMod("");
- /* show what we've done */
RepaintGraphWindow();
- /* simulate */
sprintf(&gapstring[0], "%i", gap);
CmdLFSim(gapstring);
return 0;
int CmdLFSnoop(const char *Cmd)
{
UsbCommand c = {CMD_LF_SNOOP_RAW_ADC_SAMPLES};
+
// 'h' means higher-low-frequency, 134 kHz
c.arg[0] = 0;
c.arg[1] = -1;
- if (*Cmd == 0) {
- // empty
- } else if (*Cmd == 'l') {
+
+ if (*Cmd == 'l') {
sscanf(Cmd, "l %"lli, &c.arg[1]);
} else if(*Cmd == 'h') {
c.arg[0] = 1;
sscanf(Cmd, "h %"lli, &c.arg[1]);
} else if (sscanf(Cmd, "%"lli" %"lli, &c.arg[0], &c.arg[1]) < 1) {
- PrintAndLog("use 'snoop' or 'snoop {l,h} [trigger threshold]', or 'snoop <divisor> [trigger threshold]'");
+ PrintAndLog("usage 1: snoop");
+ PrintAndLog(" 2: snoop <l|h> [trigger threshold]");
+ PrintAndLog(" 3: snoop <divisor> [trigger threshold]");
+ PrintAndLog("");
+ PrintAndLog("Sample: lf snoop l 200");
+ PrintAndLog(" : lf snoop 95 200");
return 0;
}
+
SendCommand(&c);
WaitForResponse(CMD_ACK,NULL);
return 0;
return 0;
}
+//by marshmellow
+int CmdLFfind(const char *Cmd)
+{
+ int ans=0;
+ char cmdp = param_getchar(Cmd, 0);
+
+ if (strlen(Cmd) > 1 || cmdp == 'h' || cmdp == 'H') {
+ PrintAndLog("Usage: lf search <0|1>");
+ PrintAndLog(" <use data from Graphbuffer>, if not set, try reading data from tag.");
+ PrintAndLog("");
+ PrintAndLog(" sample: lf search");
+ PrintAndLog(" : lf search 1");
+ return 0;
+ }
+
+ if (!offline && (cmdp != '1')){
+ ans=CmdLFRead("");
+ ans=CmdSamples("20000");
+ } else if (GraphTraceLen < 1000) {
+ PrintAndLog("Data in Graphbuffer was too small.");
+ return 0;
+ }
+
+ PrintAndLog("NOTE: some demods output possible binary\n if it finds something that looks like a tag");
+ PrintAndLog("\nChecking for known tags:\n");
+ ans=CmdFSKdemodIO("");
+ if (ans>0) {
+ PrintAndLog("\nValid IO Prox ID Found!");
+ return 1;
+ }
+ ans=CmdFSKdemodPyramid("");
+ if (ans>0) {
+ PrintAndLog("\nValid Pyramid ID Found!");
+ return 1;
+ }
+ ans=CmdFSKdemodParadox("");
+ if (ans>0) {
+ PrintAndLog("\nValid Paradox ID Found!");
+ return 1;
+ }
+ ans=CmdFSKdemodAWID("");
+ if (ans>0) {
+ PrintAndLog("\nValid AWID ID Found!");
+ return 1;
+ }
+ ans=CmdFSKdemodHID("");
+ if (ans>0) {
+ PrintAndLog("\nValid HID Prox ID Found!");
+ return 1;
+ }
+ //add psk and indala
+ ans=CmdIndalaDecode("");
+ if (ans>0) {
+ PrintAndLog("\nValid Indala ID Found!");
+ return 1;
+ }
+ ans=Cmdaskmandemod("");
+ if (ans>0) {
+ PrintAndLog("\nValid EM410x ID Found!");
+ return 1;
+ }
+ PrintAndLog("No Known Tags Found!\n");
+ return 0;
+}
+
static command_t CommandTable[] =
{
{"help", CmdHelp, 1, "This help"},
{"em4x", CmdLFEM4X, 1, "{ EM4X RFIDs... }"},
{"flexdemod", CmdFlexdemod, 1, "Demodulate samples for FlexPass"},
{"hid", CmdLFHID, 1, "{ HID RFIDs... }"},
- {"io", CmdLFIO, 1, "{ ioProx tags... }"},
+ {"io", CmdLFIO, 1, "{ ioProx tags... }"},
{"indalademod", CmdIndalaDemod, 1, "['224'] -- Demodulate samples for Indala 64 bit UID (option '224' for 224 bit)"},
- {"indalaclone", CmdIndalaClone, 1, "<UID> ['l']-- Clone Indala to T55x7 (tag must be in antenna)(UID in HEX)(option 'l' for 224 UID"},
+ {"indalaclone", CmdIndalaClone, 0, "<UID> ['l']-- Clone Indala to T55x7 (tag must be in antenna)(UID in HEX)(option 'l' for 224 UID"},
{"read", CmdLFRead, 0, "['h' or <divisor>] -- Read 125/134 kHz LF ID-only tag (option 'h' for 134, alternatively: f=12MHz/(divisor+1))"},
+ {"search", CmdLFfind, 1, "Read and Search for valid known tag (in offline mode it you can load first then search)"},
{"sim", CmdLFSim, 0, "[GAP] -- Simulate LF tag from buffer with optional GAP (in microseconds)"},
{"simbidir", CmdLFSimBidir, 0, "Simulate LF tag (with bidirectional data transmission between reader and tag)"},
{"simman", CmdLFSimManchester, 0, "<Clock> <Bitstream> [GAP] Simulate arbitrary Manchester LF tag"},
projects / proxmark3-svn / blobdiff