Merge branch 'master' of https://github.com/Proxmark/proxmark3

Conflicts: armsrc/epa.c
2015-02-12 09:54:21 +01:00
parent 0310364d23 8b9393d3bd
commit 31b3689f0b
9 changed files with 78 additions and 35 deletions
--- a/client/Makefile
+++ b/client/Makefile
@@ -12,9 +12,9 @@ CXX=g++
 VPATH = ../common
 OBJDIR = obj

-LDLIBS = -L/opt/local/lib -L/usr/local/lib ../liblua/liblua.a -lreadline -lpthread -lm
+LDLIBS =  -L/mingw/lib -L/opt/local/lib -L/usr/local/lib ../liblua/liblua.a -lm -lreadline -lpthread -lgdi32
 LDFLAGS = $(COMMON_FLAGS)
-CFLAGS = -std=c99 -I. -I../include -I../common -I/opt/local/include -I../liblua -Wall $(COMMON_FLAGS) -g -O4
+CFLAGS = -std=c99 -I. -I../include -I../common -I/mingw/include -I/opt/local/include -I../liblua -Wall $(COMMON_FLAGS) -g -O4
 LUAPLATFORM = generic
 ifneq (,$(findstring MINGW,$(platform)))
 CXXFLAGS = -I$(QTDIR)/include -I$(QTDIR)/include/QtCore -I$(QTDIR)/include/QtGui
@@ -146,6 +146,17 @@ clean:
 tarbin: $(BINS)
 	$(TAR) $(TARFLAGS) ../proxmark3-$(platform)-bin.tar $(BINS:%=client/%)

+# must be run as root
+install_kext: Info.plist
+	mkdir -p /System/Library/Extensions/Proxmark3.kext/Contents
+	cp Info.plist /System/Library/Extensions/Proxmark3.kext/Contents
+	chown -R root:wheel /System/Library/Extensions/Proxmark3.kext
+	chmod 755 /System/Library/Extensions/Proxmark3.kext /System/Library/Extensions/Proxmark3.kext/Contents
+	chmod 644 /System/Library/Extensions/Proxmark3.kext/Contents/Info.plist
+	rm -rf /System/Library/Caches/com.apple.kext.caches
+	touch /System/Library/Extensions
+	@echo "*** You may need to reboot for the kext to take effect."
+
 lua_build:
 	@echo Compiling liblua, using platform $(LUAPLATFORM)
 	cd ../liblua && make $(LUAPLATFORM)
--- a/client/cmdhf14a.c
+++ b/client/cmdhf14a.c
@@ -129,11 +129,6 @@ int CmdHF14AList(const char *Cmd)
 	return 0;
 }

-void iso14a_set_timeout(uint32_t timeout) {
-	UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_SET_TIMEOUT, 0, timeout}};
-	SendCommand(&c);
-}
-
 int CmdHF14AReader(const char *Cmd)
 {
 	UsbCommand c = {CMD_READER_ISO_14443a, {ISO14A_CONNECT | ISO14A_NO_DISCONNECT, 0, 0}};
@@ -346,7 +341,7 @@ int CmdHF14AReader(const char *Cmd)
 	SendCommand(&c);
 	WaitForResponse(CMD_ACK,&resp);
 	uint8_t isOK  = resp.arg[0] & 0xff;
-	PrintAndLog(" Answers to chinese magic backdoor commands: %s", (isOK ? "YES" : "NO") );
+	PrintAndLog("Answers to chinese magic backdoor commands: %s", (isOK ? "YES" : "NO") );
 	
 	// disconnect
 	c.cmd = CMD_READER_ISO_14443a;
@@ -510,12 +505,13 @@ int CmdHF14ACmdRaw(const char *cmd) {
    uint8_t active=0;
    uint8_t active_select=0;
    uint16_t numbits=0;
-	uint16_t timeout=0;
+	uint32_t timeout=0;
 	uint8_t bTimeout=0;
    char buf[5]="";
    int i=0;
    uint8_t data[USB_CMD_DATA_SIZE];
-    unsigned int datalen=0, temp;
+	uint16_t datalen=0;
+	uint32_t temp;

    if (strlen(cmd)<2) {
        PrintAndLog("Usage: hf 14a raw [-r] [-c] [-p] [-f] [-b] [-t] <number of bits> <0A 0B 0C ... hex>");
@@ -525,7 +521,7 @@ int CmdHF14ACmdRaw(const char *cmd) {
        PrintAndLog("       -a    active signal field ON without select");
        PrintAndLog("       -s    active signal field ON with select");
        PrintAndLog("       -b    number of bits to send. Useful for send partial byte");
-		PrintAndLog("       -t    timeout");
+		PrintAndLog("       -t    timeout in ms");
        return 0;
    }

@@ -561,7 +557,7 @@ int CmdHF14ACmdRaw(const char *cmd) {
 				case 't':
 					bTimeout=1;
 					sscanf(cmd+i+2,"%d",&temp);
-					timeout = temp & 0xFFFF;
+					timeout = temp;
 					i+=3;
 					while(cmd[i]!=' ' && cmd[i]!='\0') { i++; }
 					i+=2;
@@ -610,13 +606,13 @@ int CmdHF14ACmdRaw(const char *cmd) {
            c.arg[0] |= ISO14A_NO_SELECT;
    }
 	if(bTimeout){
-	    #define MAX_TIMEOUT 624*105 // max timeout is 624 ms
+	    #define MAX_TIMEOUT 40542464 	// (2^32-1) * (8*16) / 13560000Hz * 1000ms/s = 
        c.arg[0] |= ISO14A_SET_TIMEOUT;
-        c.arg[2] = timeout * 105; // each bit is about 9.4 us
-        if(c.arg[2]>MAX_TIMEOUT) {
-            c.arg[2] = MAX_TIMEOUT;
-            PrintAndLog("Set timeout to 624 ms. The max we can wait for response");
+        if(timeout > MAX_TIMEOUT) {
+            timeout = MAX_TIMEOUT;
+            PrintAndLog("Set timeout to 40542 seconds (11.26 hours). The max we can wait for response");
        }
+        c.arg[2] = 13560000 / 1000 / (8*16) * timeout; // timeout in ETUs (time to transfer 1 bit, approx. 9.4 us)
 	}
    if(power)
        c.arg[0] |= ISO14A_NO_DISCONNECT;
--- a/client/cmdlf.c
+++ b/client/cmdlf.c
@@ -756,12 +756,18 @@ int CmdLFfind(const char *Cmd)
 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... }"},
-  {"config",      CmdLFSetConfig,     0, "Set config for LF sampling, bit/sample, decimation, frequency"},
-  {"flexdemod",   CmdFlexdemod,       1, "Demodulate samples for FlexPass"},
  {"hid",         CmdLFHID,           1, "{ HID RFIDs... }"},
-  {"io",       	  CmdLFIO,	          1, "{ ioProx tags... }"},
+  {"hitag",       CmdLFHitag,         1, "{ HITAG RFIDs... }"},
+  {"io",       	  CmdLFIO,	          1, "{ IOPROX RFIDs... }"},
+  {"pcf7931",     CmdLFPCF7931,       1, "{ PCF7931 RFIDs... }"},
+  {"ti",          CmdLFTI,            1, "{ TI RFIDs... }"},
+  {"t55xx",       CmdLFT55XX,         1, "{ T55X7 RFIDs... }"},
+
+  {"config",      CmdLFSetConfig,     0, "Set config for LF sampling, bit/sample, decimation, frequency"},
+ 
+  {"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)"},
+  {"flexdemod",   CmdFlexdemod,       1, "Demodulate samples for FlexPass"},
  {"indalademod", CmdIndalaDemod,     1, "['224'] -- Demodulate samples for Indala 64 bit UID (option '224' for 224 bit)"},
  {"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, "Read 125/134 kHz LF ID-only tag. Do 'lf read h' for help"},
@@ -770,11 +776,7 @@ static command_t CommandTable[] =
  {"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"},
  {"snoop",       CmdLFSnoop,         0, "['l'|'h'|<divisor>] [trigger threshold]-- Snoop LF (l:125khz, h:134khz)"},
-  {"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...}"},
  {NULL, NULL, 0, NULL}
 };

--- a/client/cmdlft55xx.c
+++ b/client/cmdlft55xx.c
@@ -76,6 +76,19 @@ int usage_t55xx_dump(){

 static int CmdHelp(const char *Cmd);

+/*
+FSK1 / FSK1a
+size = fskdemod(dest, size, 32, 0, 8, 10);  // fsk1 RF/32 
+size = fskdemod(dest, size, 32, 1, 8, 10);  // fsk1a RF/32 
+
+FSK2 / FSK2a
+size = fskdemod(dest, size, 32, 0, 10, 8);  // fsk2 RF/32 
+size = fskdemod(dest, size, 32, 1, 10, 8);  // fsk2a RF/32 
+size = fskdemod(dest, size, 50, 1, 10, 8);  // fsk2a RF/50 
+size = fskdemod(dest, size, 64, 1, 10, 8);  // FSK2a RF/64 
+
+*/
+
 int CmdReadBlk(const char *Cmd)
 {
 	int invert = 0;