X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/a087e9cf40bdb4d7546a7645995624a519aef2a6..aaa1a9a2dcb8b9f2b6acd937f84464daa50ecad6:/client/lualibs/commands.lua diff --git a/client/lualibs/commands.lua b/client/lualibs/commands.lua index ef9b8f18..c9488e31 100644 --- a/client/lualibs/commands.lua +++ b/client/lualibs/commands.lua @@ -20,6 +20,10 @@ local _commands = { CMD_BUFF_CLEAR = 0x0105, CMD_READ_MEM = 0x0106, CMD_VERSION = 0x0107, + CMD_STATUS = 0x0108, + CMD_PING = 0x0109, + CMD_DOWNLOAD_EML_BIGBUF = 0x0110, + CMD_DOWNLOADED_EML_BIGBUF = 0x0111, --// For low-frequency tags CMD_READ_TI_TYPE = 0x0202, @@ -43,8 +47,9 @@ local _commands = { CMD_INDALA_CLONE_TAG_L = 0x0213, CMD_T55XX_READ_BLOCK = 0x0214, CMD_T55XX_WRITE_BLOCK = 0x0215, - CMD_T55XX_READ_TRACE = 0x0216, + CMD_T55XX_RESET_READ = 0x0216, CMD_PCF7931_READ = 0x0217, + CMD_PCF7931_WRITE = 0x0223, CMD_EM4X_READ_WORD = 0x0218, CMD_EM4X_WRITE_WORD = 0x0219, CMD_IO_DEMOD_FSK = 0x021A, @@ -54,14 +59,17 @@ local _commands = { CMD_FSK_SIM_TAG = 0x021E, CMD_ASK_SIM_TAG = 0x021F, CMD_PSK_SIM_TAG = 0x0220, - + CMD_AWID_DEMOD_FSK = 0x0221, + CMD_VIKING_CLONE_TAG = 0x0222, + CMD_T55XX_WAKEUP = 0x0224, + --/* 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_ACQUIRE_RAW_ADC_SAMPLES_ISO_15693 = 0x0300, - CMD_ACQUIRE_RAW_ADC_SAMPLES_ISO_14443 = 0x0301, CMD_READ_SRI512_TAG = 0x0303, CMD_READ_SRIX4K_TAG = 0x0304, + CMD_ISO_14443B_COMMAND = 0x0305, CMD_READER_ISO_15693 = 0x0310, CMD_SIMTAG_ISO_15693 = 0x0311, CMD_RECORD_RAW_ADC_SAMPLES_ISO_15693 = 0x0312, @@ -76,9 +84,15 @@ local _commands = { CMD_SIMULATE_HITAG = 0x0371, CMD_READER_HITAG = 0x0372, - CMD_SIMULATE_TAG_HF_LISTEN = 0x0380, - CMD_SIMULATE_TAG_ISO_14443 = 0x0381, - CMD_SNOOP_ISO_14443 = 0x0382, + --// For HitagS + CMD_TEST_HITAGS_TRACES = 0x0367, + CMD_SIMULATE_HITAG_S = 0x0368, + CMD_READ_HITAG_S = 0x0373, + CMD_WR_HITAG_S = 0x0375, + CMD_EMU_HITAG_S = 0x0376, + + CMD_SIMULATE_TAG_ISO_14443B = 0x0381, + CMD_SNOOP_ISO_14443B = 0x0382, CMD_SNOOP_ISO_14443a = 0x0383, CMD_SIMULATE_TAG_ISO_14443a = 0x0384, CMD_READER_ISO_14443a = 0x0385, @@ -86,13 +100,19 @@ local _commands = { CMD_READER_LEGIC_RF = 0x0388, CMD_WRITER_LEGIC_RF = 0x0389, CMD_EPA_PACE_COLLECT_NONCE = 0x038A, - --//CMD_EPA_ = 0x038B, + CMD_EPA_PACE_REPLAY = 0x038B, + CMD_ICLASS_READCHECK = 0x038F, + CMD_ICLASS_CLONE = 0x0390, + CMD_ICLASS_DUMP = 0x0391, CMD_SNOOP_ICLASS = 0x0392, CMD_SIMULATE_TAG_ICLASS = 0x0393, CMD_READER_ICLASS = 0x0394, CMD_READER_ICLASS_REPLAY = 0x0395, - CMD_ICLASS_ISO14443A_WRITE = 0x0397, + CMD_ICLASS_READBLOCK = 0x0396, + CMD_ICLASS_WRITEBLOCK = 0x0397, + CMD_ICLASS_EML_MEMSET = 0x0398, + CMD_ICLASS_AUTHENTICATION = 0x0399, --// For measurements of the antenna tuning CMD_MEASURE_ANTENNA_TUNING = 0x0400, @@ -119,6 +139,7 @@ local _commands = { CMD_READER_MIFARE = 0x0611, CMD_MIFARE_NESTED = 0x0612, + CMD_MIFARE_ACQUIRE_ENCRYPTED_NONCES = 0x0613, CMD_MIFARE_READBL = 0x0620, CMD_MIFAREU_READBL = 0x0720, @@ -135,9 +156,9 @@ local _commands = { CMD_MIFARE_SNIFFER = 0x0630, --//ultralightC - CMD_MIFAREUC_AUTH1 = 0x0724, - CMD_MIFAREUC_AUTH2 = 0x0725, - CMD_MIFAREUC_READCARD = 0x0726, + CMD_MIFAREUC_AUTH = 0x0724, + CMD_MIFAREUC_SETPWD = 0x0727, + CMD_MIFAREU_SETUID = 0x0728, --// mifare desfire CMD_MIFARE_DESFIRE_READBL = 0x0728, @@ -147,16 +168,17 @@ local _commands = { CMD_MIFARE_DES_READER = 0x072c, CMD_MIFARE_DESFIRE_INFO = 0x072d, CMD_MIFARE_DESFIRE = 0x072e, - + CMD_HF_SNIFFER = 0x0800, + CMD_UNKNOWN = 0xFFFF, } local _reverse_lookup,k,v = {} - for k, v in pairs(_commands) do - _reverse_lookup[v] = k - end - _commands.tostring = function(command) +for k, v in pairs(_commands) do + _reverse_lookup[v] = k +end +_commands.tostring = function(command) if(type(command) == 'number') then return ("%s (%d)"):format(_reverse_lookup[command]or "ERROR UNDEFINED!", command) end @@ -172,7 +194,6 @@ Command = { self.__index = self o.cmd = o.cmd or _commands.CMD_UNKNOWN - --o.arg1 = "test" o.arg1 = o.arg1 or 0 o.arg2 = o.arg2 or 0 o.arg3 = o.arg3 or 0 @@ -194,14 +215,14 @@ Command = { else print(("WARNING; data was NOT a (hex-) string, but was %s"):format(type(data))) end - o.data = data - + o.data = data return o end, - parse = function (packet) - local count,cmd,arg1,arg2,arg3,data = bin.unpack('LLLLH512',packet) + parse = function(packet) + local count, cmd, arg1, arg2, arg3, data = bin.unpack('LLLLH511', packet) return Command:new{cmd = cmd, arg1 = arg1, arg2 = arg2, arg3 = arg3, data = data} - end, + end + } function Command:__tostring() local output = ("%s\r\nargs : (%s, %s, %s)\r\ndata:\r\n%s\r\n"):format( @@ -217,6 +238,6 @@ function Command:getBytes() local data = self.data local cmd = self.cmd local arg1, arg2, arg3 = self.arg1, self.arg2, self.arg3 - return bin.pack("LLLLH",cmd, arg1, arg2, arg3,data); + return bin.pack("LLLLH",cmd, arg1, arg2, arg3, data); end return _commands