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

diff --git a/README.md b/README.md
index 1d6776b0c9d81d88ad711657015c6810a97b1b03..7f3b327d75ce2ef52e1c3ca538c14f455f50069a 100644 (file)
--- a/README.md
+++ b/README.md
@@ -178,7 +178,9 @@ Use only container tag [1.6.1]
 ##Buying a proxmark3
 The Proxmark 3 device is available for purchase (assembled and tested) from the following locations:
 
-   * http://www.elechouse.com  (new and revised hardware package 2015)  
+   * http://proxmark3.tictail.com/ (For buyers in EU, most likely in Sweden)
+ 
+   * http://www.elechouse.com/  (new and revised hardware package 2015, located in China)  
 
    I recommend you to buy this version. 
 

diff --git a/client/Makefile b/client/Makefile
index 616a2a7446d6cd5e4e6007922b8a37e2e0141fd2..7b9a65fdf4defad29e478722b49d05343030315f 100644 (file)
--- a/client/Makefile
+++ b/client/Makefile
@@ -58,6 +58,7 @@ else
     CXXFLAGS = $(shell pkg-config --cflags QtCore QtGui 2>/dev/null) -Wall -O3
     QTLDLIBS = $(shell pkg-config --libs QtCore QtGui 2>/dev/null)
     LUALIB +=  -ldl
+    LDLIBS +=  -ltermcap -lncurses
     MOC = $(shell pkg-config --variable=moc_location QtCore)
     # Below is a variant you can use if you have problems compiling with QT5 on ubuntu. see http://www.proxmark.org/forum/viewtopic.php?id=1661 for more info. 
     #MOC = /usr/lib/x86_64-linux-gnu/qt4/bin/moc

diff --git a/client/cmdlfhid.c b/client/cmdlfhid.c
index 5bdeea6d9efe01e3772a128ccd793f110aecf71d..00a4722a395d7912e23e3494a90b987a286fe07a 100644 (file)
--- a/client/cmdlfhid.c
+++ b/client/cmdlfhid.c
@@ -22,26 +22,26 @@
 static int CmdHelp(const char *Cmd);
 
 int usage_lf_hid_wiegand(void){
-       PrintAndLog("Usage: lf hid wiegand [h] [oem] [FacilityCode] [cardnumber]");
-       PrintAndLog("This command converts FC/Cardnum to wiegand code");
+       PrintAndLog("Usage: lf hid wiegand [h] [OEM] [FC] [CN]");
+       PrintAndLog("This command converts facility code/card number to Wiegand code");
        PrintAndLog("Options:");
-       PrintAndLog("       h                   - This help");
-       PrintAndLog("       oem                 - Oem number");
-       PrintAndLog("       facilitynum - Facility number");
-       PrintAndLog("       cardnum             - Card number");
+       PrintAndLog("       h             - This help");
+       PrintAndLog("       OEM           - OEM number");
+       PrintAndLog("       FC            - facility code");
+       PrintAndLog("       CN            - card number");
        PrintAndLog("Examples:");
        PrintAndLog("      lf hid wiegand 0 101 2001");
        return 0;
 }
 int usage_lf_hid_brute(void){
-       PrintAndLog("Enables bruteforce of HID readers with specified facility-code.");
+       PrintAndLog("Enables bruteforce of HID readers with specified facility code.");
        PrintAndLog("Different formatlength is supported");
        PrintAndLog("This is a incremental attack against reader.");
        PrintAndLog("");
-       PrintAndLog("Usage:  lf hid brute <formatlength> <Facility-Code>");
+       PrintAndLog("Usage:  lf hid brute <format length> <facility code>");
        PrintAndLog("Options :");
-       PrintAndLog("  <formatlength>   - 26|33|34|35|37|40|44|84");
-       PrintAndLog("  <Facility-Code>  - 8-bit value HID facility code");
+       PrintAndLog("  <format length>  - 26|33|34|35|37|40|44|84");
+       PrintAndLog("  <facility code>  - 8-bit value HID facility code");
        PrintAndLog("");
        PrintAndLog("Sample  : lf hid brute 26 224");
        return 0;
@@ -303,7 +303,7 @@ int CmdHIDWiegand(const char *Cmd) {
        uint8_t ftmlen[] = {26,33,34,35,37,38,40};
        for (uint8_t i = 0; i < sizeof(ftmlen); i++){
                calcWiegand( ftmlen[i], fc, cardnum, &hi, &lo);
-               PrintAndLog("HID %d bit | FC: %d CN: %llu | Wiegand Code: %08X%08X", ftmlen[i], fc, cardnum, hi, lo);
+               PrintAndLog("HID %d bit | OEM: %d FC: %d CN: %llu | Wiegand code: %08X%08X", ftmlen[i], oem, fc, cardnum, hi, lo);
        }
        return 0;
 }
@@ -332,7 +332,7 @@ int CmdHIDBrute(const char *Cmd){
        fc =  param_get8(Cmd, 1);
        if ( fc == 0) return usage_lf_hid_brute();
        
-       PrintAndLog("Bruteforceing HID Reader");
+       PrintAndLog("Brute-forcing HID reader");
        PrintAndLog("Press pm3-button to abort simulation or run another command");
 
        for ( uint16_t cn = 1; cn < 0xFFFF; ++cn){
@@ -362,13 +362,13 @@ int CmdHIDBrute(const char *Cmd){
 }
 
 static command_t CommandTable[] = {
-       {"help",        CmdHelp,                1, "This help"},
-       //{"demod",     CmdHIDDemod,    1, "Demodulate HID Prox Card II (not optimal)"},
-       {"fskdemod",CmdHIDDemodFSK,     0, "['1'] Realtime HID FSK demodulator (option '1' for one tag only)"},
-       {"sim",         CmdHIDSim,              0, "<ID> -- HID tag simulator"},
-       {"clone",       CmdHIDClone,    0, "<ID> ['l'] -- Clone HID to T55x7 (tag must be in antenna)(option 'l' for 84bit ID)"},
-       {"wiegand",     CmdHIDWiegand,  0, "<oem> <fc> <cardnum> -- convert facilitycode, cardnumber to Wiegand code"},
-       {"brute",       CmdHIDBrute,    0, "<formatlength> <Facility-Code> -- bruteforce card number"},
+       {"help",    CmdHelp,        1, "This help"},
+//     {"demod",   CmdHIDDemod,    1, "Demodulate HID Prox Card II (not optimal)"},
+       {"fskdemod",CmdHIDDemodFSK, 0, "['1'] Realtime HID FSK demodulator (option '1' for one tag only)"},
+       {"sim",     CmdHIDSim,      0, "<ID> -- HID tag simulator"},
+       {"clone",   CmdHIDClone,    0, "<ID> ['l'] -- Clone HID to T55x7 (tag must be in antenna)(option 'l' for 84bit ID)"},
+       {"wiegand", CmdHIDWiegand,  0, "<OEM> <facility code> <card number> -- convert facility code/card number to Wiegand code"},
+       {"brute",   CmdHIDBrute, 0, "<format length> <facility code> -- brute force card number"},
        {NULL, NULL, 0, NULL}
 };
 

diff --git a/liblua/Makefile b/liblua/Makefile
index 12be8e83d01caef5d58bd7890627d0fd644cb5ca..89a11e71f972410186b5a0f16b799add60fb0b41 100644 (file)
--- a/liblua/Makefile
+++ b/liblua/Makefile
@@ -103,7 +103,7 @@ freebsd:
 generic: $(ALL)
 
 linux:
-       $(MAKE) $(ALL) SYSCFLAGS="-DLUA_USE_LINUX" SYSLIBS="-Wl,-E -ldl -lreadline"
+       $(MAKE) $(ALL) SYSCFLAGS="-DLUA_USE_LINUX" SYSLIBS="-Wl,-E -ldl -lreadline -ltermcap -lncurses"
 
 macosx:
        $(MAKE) $(ALL) SYSCFLAGS="-DLUA_USE_MACOSX" SYSLIBS="-lreadline"