chg: updated the README.txt

chg: updated the commands.lua so it is in sync with usb_cnd.c definitions.

diff --git a/README.txt b/README.txt
index 62c2992018ff3061e45be0852676ba087e68979f..05829dac22cd2123610b2982daa3d4b4b6181e03 100644 (file)
--- a/README.txt
+++ b/README.txt
@@ -7,27 +7,32 @@ The official Proxmark repository is found here: https://github.com/Proxmark/prox
 
 NEWS:      
 
 
 NEWS:      
 

-Whats in this fork?  I have scraped the web for different enhancements to the PM3 sourcecode and not all of them ever found their way to the master branch. 
+Whats in this fork?  I have scraped the web for different enhancements to the PM3 source code and not all of them ever found their way to the master branch. 

 Among the stuff is
 Among the stuff is

-       * jonor's hf 14a raw timing patch
+
+       * Jonor's hf 14a raw timing patch

        * Piwi's updates. (usually gets into the master)
        * Piwi's updates. (usually gets into the master)

-       * Holimans iclass, (usually gets into the master)
-       * Marshmellows LF fixes (will go into the master)
-       * Midnitesnakes Ultralight,  Ultralight-c enhancements
-       * My desfire, Ultralight extras, LF T55xx enhancements, bugs fixes (filelength, hf mf commands ), TNP3xxx lua scripts,  Awid26,  skidata scripts (will come)
-       * other osbscury patches like for the sammy-mode,  (offline you know), tagidentifications, defaultkeys. 
+       * Holiman's iclass, (usually gets into the master)
+       * Marshmellow's LF fixes
+       * Midnitesnake's Ultralight,  Ultralight-c enhancements
+       * Izsh's lf peak modification / iir-filtering
+       * Aspers's tips and tricks from inside the PM3-gui-tool, settings.xml and other stuff.
+       * My own desfire, Ultralight extras, LF T55xx enhancements, bugs fixes (filelength, hf mf commands ), TNP3xxx lua scripts,  Awid26,  skidata scripts (will come)
+       * other obscure patches like for the sammy-mode,  (offline you know), tagidentifications, defaultkeys. 

        
 Give me a hint, and I'll see if I can't merge in the stuff you have. 
        
 Give me a hint, and I'll see if I can't merge in the stuff you have. 

+
+I don't actually know how to make small pull-request to github :( and that is the number one reason for me not pushing a lot of things back to the PM3 master.

        
 PM3 GUI:
 
        
 PM3 GUI:
 

-I do tend to rename and move stuff around, the official PM3-GUI from Gaucho will not work so good. *sorry*     
+I do tend to rename and move stuff around, the official PM3-GUI from Gaucho will not work so well. *sorry*     

 
          
 DEVELOPMENT:
 
 This fork is adjusted to compile on windows/mingw environment with Qt5.3.1 & GCC 4.8
 
          
 DEVELOPMENT:
 
 This fork is adjusted to compile on windows/mingw environment with Qt5.3.1 & GCC 4.8

-For people with linux you will need to patch some sourcecode and some small change to one makefile.  If you are lazy, you google the forum and find asper's or holimans makefile or you find your solution below.
+For people with linux you will need to patch some source code and some small change to one makefile.  If you are lazy, you google the forum and find asper's or holimans makefile or you find your solution below.

 
 Common errors linux/macOS finds
 Error:
 
 Common errors linux/macOS finds
 Error:


@@ -55,7 +60,7 @@ Solution
                QTLDLIBS = -L$(QTDIR)/lib -lQtCore4 -lQtGui4
        
 
                QTLDLIBS = -L$(QTDIR)/lib -lQtCore4 -lQtGui4
        
 

-And old Qt4 version is found here: http://www.icesql.se/proxmark3/code/linuxmakefile.txt  but this one doesn't have all new files in it. So I don't recommend it.
+An old Qt4 version makefile is found here: http://www.icesql.se/proxmark3/code/linuxmakefile.txt  but this one doesn't have all new files in it. So I don't recommend it.

 
 
 
 
 
 

diff --git a/client/lualibs/commands.lua b/client/lualibs/commands.lua
index f88eeae2c40991384e548506f525c4380f547bea..d2acb3be4dfc9d488ccd8908cc6de19a9ebe426c 100644 (file)
--- a/client/lualibs/commands.lua
+++ b/client/lualibs/commands.lua
@@ -47,6 +47,9 @@ local _commands = {
        CMD_PCF7931_READ =                                                   0x0217,
        CMD_EM4X_READ_WORD =                                                 0x0218,
        CMD_EM4X_WRITE_WORD =                                                0x0219,
        CMD_PCF7931_READ =                                                   0x0217,
        CMD_EM4X_READ_WORD =                                                 0x0218,
        CMD_EM4X_WRITE_WORD =                                                0x0219,

+       CMD_IO_DEMOD_FSK =                                                   0x021A,
+       CMD_IO_CLONE_TAG =                                                   0x021B,
+       CMD_EM410X_DEMOD =                                                                                                   0x021c,

        --/* CMD_SET_ADC_MUX: ext1 is 0 for lopkd, 1 for loraw, 2 for hipkd, 3 for hiraw */
 
        --// For the 13.56 MHz tags
        --/* CMD_SET_ADC_MUX: ext1 is 0 for lopkd, 1 for loraw, 2 for hipkd, 3 for hiraw */
 
        --// For the 13.56 MHz tags


@@ -61,6 +64,7 @@ local _commands = {
        CMD_ISO_15693_COMMAND_DONE =                                         0x0314,
        CMD_ISO_15693_FIND_AFI =                                             0x0315,
        CMD_ISO_15693_DEBUG =                                                0x0316,
        CMD_ISO_15693_COMMAND_DONE =                                         0x0314,
        CMD_ISO_15693_FIND_AFI =                                             0x0315,
        CMD_ISO_15693_DEBUG =                                                0x0316,

+       CMD_LF_SNOOP_RAW_ADC_SAMPLES =                                       0x0317,

 
        --// For Hitag2 transponders
        CMD_SNOOP_HITAG =                                                    0x0370,
 
        --// For Hitag2 transponders
        CMD_SNOOP_HITAG =                                                    0x0370,


@@ -77,10 +81,13 @@ local _commands = {
        CMD_READER_LEGIC_RF =                                                0x0388,
        CMD_WRITER_LEGIC_RF =                                                0x0389,
        CMD_EPA_PACE_COLLECT_NONCE =                                         0x038A,
        CMD_READER_LEGIC_RF =                                                0x0388,
        CMD_WRITER_LEGIC_RF =                                                0x0389,
        CMD_EPA_PACE_COLLECT_NONCE =                                         0x038A,

+       --//CMD_EPA_ =                                                         0x038B,

 
        CMD_SNOOP_ICLASS =                                                   0x0392,
        CMD_SIMULATE_TAG_ICLASS =                                            0x0393,
        CMD_READER_ICLASS =                                                  0x0394,
 
        CMD_SNOOP_ICLASS =                                                   0x0392,
        CMD_SIMULATE_TAG_ICLASS =                                            0x0393,
        CMD_READER_ICLASS =                                                  0x0394,

+       CMD_READER_ICLASS_REPLAY =                                                                                       0x0395,
+       CMD_ICLASS_ISO14443A_WRITE =                                                                             0x0397,

 
        --// For measurements of the antenna tuning
        CMD_MEASURE_ANTENNA_TUNING =                                         0x0400,
 
        --// For measurements of the antenna tuning
        CMD_MEASURE_ANTENNA_TUNING =                                         0x0400,


@@ -97,21 +104,45 @@ local _commands = {
        CMD_MIFARE_EML_MEMSET =                                              0x0602,
        CMD_MIFARE_EML_MEMGET =                                              0x0603,
        CMD_MIFARE_EML_CARDLOAD =                                            0x0604,
        CMD_MIFARE_EML_MEMSET =                                              0x0602,
        CMD_MIFARE_EML_MEMGET =                                              0x0603,
        CMD_MIFARE_EML_CARDLOAD =                                            0x0604,

-       CMD_MIFARE_EML_CSETBLOCK =                                           0x0605,
-       CMD_MIFARE_EML_CGETBLOCK =                                           0x0606,
-
+       
+       --// magic chinese card commands
+       CMD_MIFARE_CSETBLOCK =                                               0x0605,
+       CMD_MIFARE_CGETBLOCK =                                               0x0606,
+       CMD_MIFARE_CIDENT =                                                  0x0607,
+       

        CMD_SIMULATE_MIFARE_CARD =                                           0x0610,
 
        CMD_READER_MIFARE =                                                  0x0611,
        CMD_MIFARE_NESTED =                                                  0x0612,
 
        CMD_MIFARE_READBL =                                                  0x0620,
        CMD_SIMULATE_MIFARE_CARD =                                           0x0610,
 
        CMD_READER_MIFARE =                                                  0x0611,
        CMD_MIFARE_NESTED =                                                  0x0612,
 
        CMD_MIFARE_READBL =                                                  0x0620,

+       CMD_MIFAREU_READBL =                                                 0x0720,
+       

        CMD_MIFARE_READSC =                                                  0x0621,
        CMD_MIFARE_READSC =                                                  0x0621,

+       CMD_MIFAREU_READCARD =                                               0x0721,
+       

        CMD_MIFARE_WRITEBL =                                                 0x0622,
        CMD_MIFARE_WRITEBL =                                                 0x0622,

+       CMD_MIFAREU_WRITEBL =                                                0x0722,
+       CMD_MIFAREU_WRITEBL_COMPAT =                                         0x0723,
+       

        CMD_MIFARE_CHKKEYS =                                                 0x0623,
 
        CMD_MIFARE_SNIFFER =                                                 0x0630,
 
        CMD_MIFARE_CHKKEYS =                                                 0x0623,
 
        CMD_MIFARE_SNIFFER =                                                 0x0630,
 

+       --//ultralightC
+       CMD_MIFAREUC_AUTH1 =                                                                     0x0724,
+       CMD_MIFAREUC_AUTH2 =                                                                     0x0725,
+       CMD_MIFAREUC_READCARD =                                                                      0x0726,
+
+       --// mifare desfire
+       CMD_MIFARE_DESFIRE_READBL =                                          0x0728,
+       CMD_MIFARE_DESFIRE_WRITEBL =                                         0x0729,
+       CMD_MIFARE_DESFIRE_AUTH1 =                                           0x072a,
+       CMD_MIFARE_DESFIRE_AUTH2 =                                           0x072b,
+       CMD_MIFARE_DES_READER =                                              0x072c,
+       CMD_MIFARE_DESFIRE_INFO =                                            0x072d,
+       CMD_MIFARE_DESFIRE =                                                 0x072e,
+       

        CMD_UNKNOWN =                                                        0xFFFF,
 }
 
        CMD_UNKNOWN =                                                        0xFFFF,
 }
 

diff --git a/include/usb_cmd.h b/include/usb_cmd.h
index 18e54e33331121c2a28bdb1bb8cd230e2578d97f..111f7ec7693272610e4cc7426ecbe8ec581be0cc 100644 (file)
--- a/include/usb_cmd.h
+++ b/include/usb_cmd.h
@@ -114,7 +114,6 @@ typedef struct {
 #define CMD_SIMULATE_TAG_LEGIC_RF                                         0x0387
 #define CMD_READER_LEGIC_RF                                               0x0388
 #define CMD_WRITER_LEGIC_RF                                               0x0389
 #define CMD_SIMULATE_TAG_LEGIC_RF                                         0x0387
 #define CMD_READER_LEGIC_RF                                               0x0388
 #define CMD_WRITER_LEGIC_RF                                               0x0389

-

 #define CMD_EPA_PACE_COLLECT_NONCE                                        0x038A
 //#define CMD_EPA_                                                          0x038B
 
 #define CMD_EPA_PACE_COLLECT_NONCE                                        0x038A
 //#define CMD_EPA_                                                          0x038B
 


@@ -157,9 +156,9 @@ typedef struct {
 #define CMD_MIFAREU_READCARD                                                                 0x0721
 
 #define CMD_MIFARE_WRITEBL                                                0x0622
 #define CMD_MIFAREU_READCARD                                                                 0x0721
 
 #define CMD_MIFARE_WRITEBL                                                0x0622

-#define CMD_MIFAREU_WRITEBL_COMPAT                                                           0x0722
+#define CMD_MIFAREU_WRITEBL                                                                      0x0722
+#define CMD_MIFAREU_WRITEBL_COMPAT                                                           0x0723

 
 

-#define CMD_MIFAREU_WRITEBL                                                                      0x0723

 #define CMD_MIFARE_CHKKEYS                                                0x0623
 
 #define CMD_MIFARE_SNIFFER                                                0x0630
 #define CMD_MIFARE_CHKKEYS                                                0x0623
 
 #define CMD_MIFARE_SNIFFER                                                0x0630