X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/7838f4beba79370f94c7a3de2cf34278f5d481c8..ab7bb4947515be233282a404fe2e84549aca9579:/client/lualibs/commands.lua
diff --git a/client/lualibs/commands.lua b/client/lualibs/commands.lua
index 1d4bd806..92fc9bb0 100644
--- a/client/lualibs/commands.lua
+++ b/client/lualibs/commands.lua
@@ -44,8 +44,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,
@@ -56,13 +57,16 @@ local _commands = {
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_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,
@@ -88,11 +92,17 @@ local _commands = {
CMD_EPA_PACE_COLLECT_NONCE = 0x038A,
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 +129,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,
@@ -147,16 +158,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 +184,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 +205,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(