projects
/
proxmark3-svn
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
FIX: @Aczid suggested this to fix a Coverity scan warning.
[proxmark3-svn]
/
client
/
lualibs
/
commands.lua
diff --git
a/client/lualibs/commands.lua
b/client/lualibs/commands.lua
index 4c7bc638319d39066227f769c4ee662720a58707..afdba7e701a03d14e4fcc2a87452cf5ee3f079c9 100644
(file)
--- 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_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,
--// 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_INDALA_CLONE_TAG_L = 0x0213,
CMD_T55XX_READ_BLOCK = 0x0214,
CMD_T55XX_WRITE_BLOCK = 0x0215,
- CMD_T55XX_RE
AD_TRACE
= 0x0216,
+ CMD_T55XX_RE
SET_READ
= 0x0216,
CMD_PCF7931_READ = 0x0217,
CMD_PCF7931_READ = 0x0217,
+ CMD_PCF7931_WRITE = 0x0223,
CMD_EM4X_READ_WORD = 0x0218,
CMD_EM4X_WRITE_WORD = 0x0219,
CMD_IO_DEMOD_FSK = 0x021A,
CMD_EM4X_READ_WORD = 0x0218,
CMD_EM4X_WRITE_WORD = 0x0219,
CMD_IO_DEMOD_FSK = 0x021A,
@@
-54,13
+59,16
@@
local _commands = {
CMD_FSK_SIM_TAG = 0x021E,
CMD_ASK_SIM_TAG = 0x021F,
CMD_PSK_SIM_TAG = 0x0220,
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_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_SRI
512_TAG =
0x0303,
- CMD_
READ_SRIX4K_TAG = 0x0304
,
+ CMD_READ_SRI
_TAG =
0x0303,
+ CMD_
ISO_14443B_COMMAND = 0x0305
,
CMD_READER_ISO_15693 = 0x0310,
CMD_SIMTAG_ISO_15693 = 0x0311,
CMD_RECORD_RAW_ADC_SAMPLES_ISO_15693 = 0x0312,
CMD_READER_ISO_15693 = 0x0310,
CMD_SIMTAG_ISO_15693 = 0x0311,
CMD_RECORD_RAW_ADC_SAMPLES_ISO_15693 = 0x0312,
@@
-75,6
+83,13
@@
local _commands = {
CMD_SIMULATE_HITAG = 0x0371,
CMD_READER_HITAG = 0x0372,
CMD_SIMULATE_HITAG = 0x0371,
CMD_READER_HITAG = 0x0372,
+ --// 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_14443B = 0x0381,
CMD_SNOOP_ISO_14443B = 0x0382,
CMD_SNOOP_ISO_14443a = 0x0383,
@@
-84,13
+99,19
@@
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_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_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,
--// For measurements of the antenna tuning
CMD_MEASURE_ANTENNA_TUNING = 0x0400,
@@
-117,6
+138,7
@@
local _commands = {
CMD_READER_MIFARE = 0x0611,
CMD_MIFARE_NESTED = 0x0612,
CMD_READER_MIFARE = 0x0611,
CMD_MIFARE_NESTED = 0x0612,
+ CMD_MIFARE_ACQUIRE_ENCRYPTED_NONCES = 0x0613,
CMD_MIFARE_READBL = 0x0620,
CMD_MIFAREU_READBL = 0x0720,
CMD_MIFARE_READBL = 0x0620,
CMD_MIFAREU_READBL = 0x0720,
@@
-134,8
+156,8
@@
local _commands = {
--//ultralightC
CMD_MIFAREUC_AUTH = 0x0724,
--//ultralightC
CMD_MIFAREUC_AUTH = 0x0724,
- CMD_MIFAREUC_SETPWD = 0x0727,
- CMD_MIFAREU_SETUID = 0x0728,
+ CMD_MIFAREUC_SETPWD =
0x0727,
+ CMD_MIFAREU_SETUID =
0x0728,
--// mifare desfire
CMD_MIFARE_DESFIRE_READBL = 0x0728,
--// mifare desfire
CMD_MIFARE_DESFIRE_READBL = 0x0728,
@@
-145,16
+167,17
@@
local _commands = {
CMD_MIFARE_DES_READER = 0x072c,
CMD_MIFARE_DESFIRE_INFO = 0x072d,
CMD_MIFARE_DESFIRE = 0x072e,
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 = {}
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
if(type(command) == 'number') then
return ("%s (%d)"):format(_reverse_lookup[command]or "ERROR UNDEFINED!", command)
end
@@
-170,7
+193,6
@@
Command = {
self.__index = self
o.cmd = o.cmd or _commands.CMD_UNKNOWN
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
o.arg1 = o.arg1 or 0
o.arg2 = o.arg2 or 0
o.arg3 = o.arg3 or 0
@@
-192,14
+214,14
@@
Command = {
else
print(("WARNING; data was NOT a (hex-) string, but was %s"):format(type(data)))
end
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,
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}
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(
}
function Command:__tostring()
local output = ("%s\r\nargs : (%s, %s, %s)\r\ndata:\r\n%s\r\n"):format(
@@
-215,6
+237,6
@@
function Command:getBytes()
local data = self.data
local cmd = self.cmd
local arg1, arg2, arg3 = self.arg1, self.arg2, self.arg3
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
end
return _commands
Impressum
,
Datenschutz