-p refs - unify param

This commit is contained in:
Philippe Teuwen 2020-10-01 00:29:24 +02:00
commit beadecf7eb
5 changed files with 39 additions and 39 deletions

View file

@ -11,10 +11,10 @@ This is a script to allow raw 14443a commands to be sent and received.
]] ]]
example = [[ example = [[
# 1. Connect and don't disconnect # 1. Connect and don't disconnect
script run hf_14a_raw -p script run hf_14a_raw -k
# 2. Send mf auth, read response (nonce) # 2. Send mf auth, read response (nonce)
script run hf_14a_raw -o -x 6000F57b -p script run hf_14a_raw -o -x 6000F57b -k
# 3. disconnect # 3. disconnect
script run hf_14a_raw -o script run hf_14a_raw -o
@ -26,10 +26,10 @@ usage = [[
script run hf_14a_raw -x 6000F57b script run hf_14a_raw -x 6000F57b
]] ]]
arguments = [[ arguments = [[
-o do not connect - use this only if you previously used -p to stay connected -o do not connect - use this only if you previously used -k to stay connected
-r do not read response -r do not read response
-c calculate and append CRC -c calculate and append CRC
-p stay connected - dont inactivate the field -k stay connected - dont inactivate the field
-x <payload> Data to send (NO SPACES!) -x <payload> Data to send (NO SPACES!)
-d Debug flag -d Debug flag
-t Topaz mode -t Topaz mode
@ -187,8 +187,8 @@ function selftest()
DEBUG = true DEBUG = true
dbg('Performing test') dbg('Performing test')
main() main()
main('-p') main('-k')
main(' -o -x 6000F57b -p') main(' -o -x 6000F57b -k')
main('-o') main('-o')
main('-x 6000F57b') main('-x 6000F57b')
dbg('Tests done') dbg('Tests done')

View file

@ -135,13 +135,13 @@ function main(args)
end end
-- Original loop -- Original loop
-- core.console("hf 14a raw -a -p -b 7 45") -- core.console("hf 14a raw -a -k -b 7 45")
-- local cmd_select = string.format("hf 14a raw -c -p 9370%s", serial_number) -- local cmd_select = string.format("hf 14a raw -c -k 9370%s", serial_number)
-- core.console(cmd_select) -- core.console(cmd_select)
-- for i = 0, 254 do -- for i = 0, 254 do
-- local cmd_rd_blk = string.format("hf 14a raw -c -p 30 %02x", i) -- local cmd_rd_blk = string.format("hf 14a raw -c -k 30 %02x", i)
-- core.console(cmd_rd_blk) -- core.console(cmd_rd_blk)
-- core.console("hf 14a raw -p 80") -- core.console("hf 14a raw -k 80")
-- end -- end
-- core.console("hf 14a raw -r") -- core.console("hf 14a raw -r")

View file

@ -59,24 +59,24 @@ end
local function cmdUltralight() local function cmdUltralight()
return { return {
[0] = 'hf 14a raw -p -a -b 7 40', [0] = 'hf 14a raw -k -a -b 7 40',
[1] = 'hf 14a raw -p -a 43', [1] = 'hf 14a raw -k -a 43',
[2] = 'hf 14a raw -c -a A2005380712A', [2] = 'hf 14a raw -c -a A2005380712A',
[3] = 'hf 14a raw -p -a -b 7 40', [3] = 'hf 14a raw -k -a -b 7 40',
[4] = 'hf 14a raw -p -a 43', [4] = 'hf 14a raw -k -a 43',
[5] = 'hf 14a raw -c -a A2010200D980', [5] = 'hf 14a raw -c -a A2010200D980',
[6] = 'hf 14a raw -p -a -b 7 40', [6] = 'hf 14a raw -k -a -b 7 40',
[7] = 'hf 14a raw -p -a 43', [7] = 'hf 14a raw -k -a 43',
[8] = 'hf 14a raw -c -a A2025B480000', [8] = 'hf 14a raw -c -a A2025B480000',
[9] = 'hf 14a raw -c -a 5000', [9] = 'hf 14a raw -c -a 5000',
} }
end end
local function cmdClassic() local function cmdClassic()
return { return {
[0] = 'hf 14a raw -p -a -b 7 40', [0] = 'hf 14a raw -k -a -b 7 40',
[1] = 'hf 14a raw -p -a 43', [1] = 'hf 14a raw -k -a 43',
[2] = 'hf 14a raw -c -p -a A000', [2] = 'hf 14a raw -c -k -a A000',
[3] = 'hf 14a raw -c -p -a 01020304049802000000000000001001', [3] = 'hf 14a raw -c -k -a 01020304049802000000000000001001',
[4] = 'hf 14a raw -c -a 5000', [4] = 'hf 14a raw -c -a 5000',
} }
end end

View file

@ -70,18 +70,18 @@ function magicUID(b0, b1, b2)
print('Using backdoor Magic tag function') print('Using backdoor Magic tag function')
-- write block 0 -- write block 0
core.console('hf 14a raw -p -a -b 7 40') core.console('hf 14a raw -k -a -b 7 40')
core.console('hf 14a raw -p -a 43') core.console('hf 14a raw -k -a 43')
core.console('hf 14a raw -c -a A200'..b0) core.console('hf 14a raw -c -a A200'..b0)
-- write block 1 -- write block 1
core.console('hf 14a raw -p -a -b 7 40') core.console('hf 14a raw -k -a -b 7 40')
core.console('hf 14a raw -p -a 43') core.console('hf 14a raw -k -a 43')
core.console('hf 14a raw -c -a A201'..b1) core.console('hf 14a raw -c -a A201'..b1)
-- write block 2 -- write block 2
core.console('hf 14a raw -p -a -b 7 40') core.console('hf 14a raw -k -a -b 7 40')
core.console('hf 14a raw -p -a 43') core.console('hf 14a raw -k -a 43')
core.console('hf 14a raw -c -a A202'..b2) core.console('hf 14a raw -c -a A202'..b2)
end end
-- --
@ -90,16 +90,16 @@ function brickableUID(b0, b1, b2)
print('Using BRICKABLE Magic tag function') print('Using BRICKABLE Magic tag function')
core.console('hf 14a raw -p -s -3') core.console('hf 14a raw -k -s -3')
-- write block 0 -- write block 0
core.console('hf 14a raw -p -c A200'..b0) core.console('hf 14a raw -k -c A200'..b0)
-- write block 1 -- write block 1
core.console('hf 14a raw -p -c A201'..b1) core.console('hf 14a raw -k -c A201'..b1)
-- write block 2 -- write block 2
core.console('hf 14a raw -p -c A202'..b2) core.console('hf 14a raw -k -c A202'..b2)
end end
--- ---
-- The main entry point -- The main entry point

View file

@ -200,14 +200,14 @@ script run run hf_mf_magicrevive
To execute commands manually: To execute commands manually:
``` ```
hf 14a raw -a -p -b 7 40 hf 14a raw -a -k -b 7 40
hf 14a raw -p 43 hf 14a raw -k 43
hf 14a raw -p -c A000 hf 14a raw -k -c A000
hf 14a raw -c -t 1000 11223344440804006263646566676869 hf 14a raw -c -t 1000 11223344440804006263646566676869
``` ```
wipe: wipe:
``` ```
hf 14a raw -a -p -b 7 40 hf 14a raw -a -k -b 7 40
hf 14a raw -t 1000 41 hf 14a raw -t 1000 41
``` ```
@ -383,9 +383,9 @@ Same as MIFARE Classic DirectWrite, but block0 can be locked with special comman
To lock definitively block0: To lock definitively block0:
``` ```
hf 14a raw -a -p -b 7 40 hf 14a raw -a -k -b 7 40
hf 14a raw -p 43 hf 14a raw -k 43
hf 14a raw -p -c e000 hf 14a raw -k -c e000
hf 14a raw -c 85000000000000000000000000000008 hf 14a raw -c 85000000000000000000000000000008
``` ```
@ -581,8 +581,8 @@ hf mfu setuid
Equivalent: don't use `hf mfu wrbl` as you need to write three blocks in a row, but do, with proper BCCx: Equivalent: don't use `hf mfu wrbl` as you need to write three blocks in a row, but do, with proper BCCx:
``` ```
hf 14a raw -s -c -p a2 00 041122bf hf 14a raw -s -c -k a2 00 041122bf
hf 14a raw -c -p a2 01 33445566 hf 14a raw -c -k a2 01 33445566
hf 14a raw -c a2 02 44480000 hf 14a raw -c a2 02 44480000
``` ```