X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/b915fda392487a876ccc7b0c8b79a1b31ca5e398..e1c6e9e8f1d6e0266f79b5ec40a0bd93cd96b14a:/client/lualibs/commands.lua?ds=sidebyside
diff --git a/client/lualibs/commands.lua b/client/lualibs/commands.lua
index 13b9c8e7..4e98bd28 100644
--- a/client/lualibs/commands.lua
+++ b/client/lualibs/commands.lua
@@ -48,13 +48,18 @@ local _commands = {
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_IO_CLONE_TAG = 0x021B,
+ CMD_EM410X_DEMOD = 0x021c,
+ CMD_SET_LF_SAMPLING_CONFIG = 0x021d,
+ CMD_FSK_SIM_TAG = 0x021E,
+ CMD_ASK_SIM_TAG = 0x021F,
+ CMD_PSK_SIM_TAG = 0x0220,
+ CMD_AWID_DEMOD_FSK = 0x0221,
+
--/* 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_READER_ISO_15693 = 0x0310,
@@ -71,9 +76,8 @@ 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,
+ 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,
@@ -83,11 +87,17 @@ local _commands = {
CMD_EPA_PACE_COLLECT_NONCE = 0x038A,
--//CMD_EPA_ = 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_READER_ICLASS_REPLAY = 0x0395,
+ 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,
@@ -130,9 +140,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,
@@ -148,10 +158,10 @@ local _commands = {
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
@@ -212,7 +222,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
\ No newline at end of file
+return _commands