#include <stdlib.h>
#include <string.h>
#include <limits.h>
-//#include "proxusb.h"
#include "proxmark3.h"
#include "data.h"
#include "graph.h"
#include "cmdmain.h"
#include "cmddata.h"
#include "cmdlf.h"
+#include "cmdlfawid26.h"
#include "cmdlfhid.h"
#include "cmdlfti.h"
#include "cmdlfem4x.h"
#include "cmdlfhitag.h"
#include "cmdlft55xx.h"
#include "cmdlfpcf7931.h"
+#include "cmdlfio.h"
static int CmdHelp(const char *Cmd);
RepaintGraphWindow();
return 0;
}
-
+
int CmdIndalaDemod(const char *Cmd)
{
// Usage: recover 64bit UID by default, specify "224" as arg to recover a 224bit UID
count = 0;
}
}
- PrintAndLog("Recovered %d raw bits", rawbit);
+ 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;
if (strcmp(Cmd, "224") == 0) {
PrintAndLog("UID=%s (%x%08x%08x%08x%08x%08x%08x)", showbits, uid1, uid2, uid3, uid4, uid5, uid6, uid7);
}
- // Checking UID against next occurences
+ // Checking UID against next occurrences
for (; i + uidlen <= rawbit;) {
int failed = 0;
for (bit = 0; bit < uidlen; bit++) {
}
times += 1;
}
- PrintAndLog("Occurences: %d (expected %d)", times, (rawbit - start) / uidlen);
+ PrintAndLog("Occurrences: %d (expected %d)", times, (rawbit - start) / uidlen);
// Remodulating for tag cloning
GraphTraceLen = 32*uidlen;
}
RepaintGraphWindow();
- return 0;
+ return 1;
}
int CmdIndalaClone(const char *Cmd)
c.arg[0] = 1;
} else if (*Cmd == '\0') {
c.arg[0] = 0;
- } else {
- PrintAndLog("use 'read' or 'read h'");
+ } else if (sscanf(Cmd, "%"lli, &c.arg[0]) != 1) {
+ PrintAndLog("Samples 1: 'lf read'");
+ PrintAndLog(" 2: 'lf read h'");
+ PrintAndLog(" 3: 'lf read <divisor>'");
return 0;
}
SendCommand(&c);
WaitForResponse(CMD_ACK,NULL);
+
+ // load samples
+ CmdSamples("");
return 0;
}
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;
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') {
+ 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]'");
+ return 0;
+ }
+ SendCommand(&c);
+ WaitForResponse(CMD_ACK,NULL);
+
+ size_t BUFF_SIZE = 8000;
+ uint8_t data[BUFF_SIZE];
+
+ GetFromBigBuf(data,BUFF_SIZE,3560); //3560 -- should be offset..
+ WaitForResponseTimeout(CMD_ACK,NULL, 1500);
+
+ for (int j = 0; j < BUFF_SIZE; j++) {
+ GraphBuffer[j] = ((int)data[j]);
+ }
+ GraphTraceLen = BUFF_SIZE;
+
+ return 0;
+}
+
int CmdVchDemod(const char *Cmd)
{
// Is this the entire sync pattern, or does this also include some
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 [use data from Graphbuffer]");
+ 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("");
+ } else if (GraphTraceLen<1000) {
+ PrintAndLog("Data in Graphbuffer was too small.");
+ return 0;
+ }
+
+ PrintAndLog("Checking for known tags:");
+
+ ans=Cmdaskmandemod("");
+ PrintAndLog("ASK_MAN: %s", (ans)?"YES":"NO" );
+
+ ans=CmdFSKdemodHID("");
+ PrintAndLog("HID: %s", (ans)?"YES":"NO" );
+
+ ans=CmdFSKdemodIO("");
+ PrintAndLog("IO prox: %s", (ans)?"YES":"NO" );
+
+ ans=CmdIndalaDemod("");
+ PrintAndLog("Indala (64): %s", (ans)?"YES":"NO" );
+
+ ans=CmdIndalaDemod("224");
+ PrintAndLog("Indala (224): %s", (ans)?"YES":"NO" );
+
+ if (!ans)
+ PrintAndLog("No Known Tags Found!\n");
+
+ return 0;
+}
+
static command_t CommandTable[] =
{
{"help", CmdHelp, 1, "This help"},
{"cmdread", CmdLFCommandRead, 0, "<off period> <'0' period> <'1' period> <command> ['h'] -- Modulate LF reader field to send command before read (all periods in microseconds) (option 'h' for 134)"},
- {"em4x", CmdLFEM4X, 1, "{ EM4X RFIDs... }"},
+
{"flexdemod", CmdFlexdemod, 1, "Demodulate samples for FlexPass"},
- {"hid", CmdLFHID, 1, "{ HID RFIDs... }"},
{"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"},
- {"read", CmdLFRead, 0, "['h'] -- Read 125/134 kHz LF ID-only tag (option 'h' for 134)"},
+ {"indalaclone", CmdIndalaClone, 0, "<UID> ['l']-- Clone Indala to T55x7 (UID in HEX)(option 'l' for 224 UID"},
+ {"vchdemod", CmdVchDemod, 1, "['clone'] -- Demodulate samples for VeriChip"},
+
+
+ {"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"},
- {"ti", CmdLFTI, 1, "{ TI RFIDs... }"},
- {"hitag", CmdLFHitag, 1, "{ Hitag tags and transponders... }"},
- {"vchdemod", CmdVchDemod, 1, "['clone'] -- Demodulate samples for VeriChip"},
- {"t55xx", CmdLFT55XX, 1, "{ T55xx RFIDs... }"},
- {"pcf7931", CmdLFPCF7931, 1, "{PCF7931 RFIDs...}"},
+ {"snoop", CmdLFSnoop, 0, "['l'|'h'|<divisor>] [trigger threshold]-- Snoop LF (l:125khz, h:134khz)"},
+
+ {"awid26", CmdLFAWID26, 1, "{ AWID26 tags }"},
+ {"em4x", CmdLFEM4X, 1, "{ EM4X tags }"},
+ {"hid", CmdLFHID, 1, "{ HID tags }"},
+ {"hitag", CmdLFHitag, 1, "{ Hitag tags and transponders }"},
+ {"io", CmdLFIO, 1, "{ ioProx tags }"},
+ {"pcf7931", CmdLFPCF7931, 1, "{ PCF7931 tags }"},
+ {"ti", CmdLFTI, 1, "{ TI tags }"},
+ {"t55xx", CmdLFT55XX, 1, "{ T55xx tags }"},
+
{NULL, NULL, 0, NULL}
};
projects / proxmark3-svn / blobdiff