From 610b456a97cfcc41338c8db92fa02a8a2b41456e Mon Sep 17 00:00:00 2001 From: Philippe Teuwen Date: Wed, 23 Sep 2020 00:11:11 +0200 Subject: [PATCH] fix lau scripts renaming --- armsrc/Standalone/hf_aveful.c | 2 +- armsrc/Standalone/hf_bog.c | 4 ++-- client/luascripts/data_example_parameters.lua | 4 ++-- client/luascripts/data_readpwdmem.lua | 2 +- client/luascripts/hf_lf_multi_bruteforce.lua | 4 ++-- client/luascripts/hf_mf_autopwn.lua | 4 ++-- client/luascripts/hf_mf_dump-laundromat.lua | 4 ++-- client/luascripts/hf_mf_keycheck.lua | 4 ++-- client/luascripts/hf_mf_magicrevive.lua | 2 +- client/luascripts/hf_mfc_uidbruteforce.lua | 4 ++-- client/luascripts/hf_ntag-3d.lua | 4 ++-- client/luascripts/lf_hid_bulkclone.lua | 2 +- client/luascripts/lf_t55xx_writetest.lua | 2 +- client/src/cmdhfmfu.c | 2 +- client/src/scripting.c | 2 +- doc/cheatsheet.md | 16 ++++++++-------- doc/magic_cards_notes.md | 8 ++++---- 17 files changed, 35 insertions(+), 35 deletions(-) diff --git a/armsrc/Standalone/hf_aveful.c b/armsrc/Standalone/hf_aveful.c index b59f1a34a..9a56be82c 100644 --- a/armsrc/Standalone/hf_aveful.c +++ b/armsrc/Standalone/hf_aveful.c @@ -187,7 +187,7 @@ void RunMod(void) { read_successful = false; break; } - // We're skipping 14 blocks (56 bytes) here, as that "[...] has version/signature/counter data here" according to comments on dumptoemul-mfu + // We're skipping 14 blocks (56 bytes) here, as that "[...] has version/signature/counter data here" according to comments on hf_mfu_dumptoemulator // When converting a bin, it's almost all 0 other than one 0x0F byte, and functionality seems to be unaffected if that byte is set to 0x00. emlSetMem_xt(dataout, 14 + i, 1, 4); Dbhexdump(4, dataout, 0); diff --git a/armsrc/Standalone/hf_bog.c b/armsrc/Standalone/hf_bog.c index 50e1d824f..d0cca6888 100644 --- a/armsrc/Standalone/hf_bog.c +++ b/armsrc/Standalone/hf_bog.c @@ -15,7 +15,7 @@ The retrieved sniffing session can be acquired by connecting the device to a client that supports the reconnect capability and issue 'hf 14a list'. In order to view the grabbed authentication attempts in the flash mem, -you can simply run 'script run read_pwd_mem' or just 'mem dump p l 256' +you can simply run 'script run data_readpwdmem' or just 'mem dump p l 256' from the client to view the stored quadlets. */ @@ -249,5 +249,5 @@ void RunMod(void) { LEDsoff(); SpinDelay(300); Dbprintf("- [ End ] -> You can take shell back ..."); - Dbprintf("- [ ! ] -> use 'script run read_pwd_mem_spiffs' to print passwords"); + Dbprintf("- [ ! ] -> use 'script run data_read_pwd_mem_spiffs' to print passwords"); } diff --git a/client/luascripts/data_example_parameters.lua b/client/luascripts/data_example_parameters.lua index f31bb607c..01555ca6a 100644 --- a/client/luascripts/data_example_parameters.lua +++ b/client/luascripts/data_example_parameters.lua @@ -4,7 +4,7 @@ local getopt = require('getopt') local ansicolors = require('ansicolors') copyright = '' -usage = 'script run parameters.lua -a 1 -blala -c -de' +usage = 'script run data_example_parameters.lua -a 1 -blala -c -de' author = 'Martin Holst Swende' version = 'v1.0.2' desc = [[ @@ -52,7 +52,7 @@ local function main(args) 5 parameters; two with values and three flags. The following should be valid: - script run parameters.lua -a 1 -blala -c -de + script run data_example_parameters.lua -a 1 -blala -c -de Notice two things: 1. 'blala' works just like 'b lala', both set 'b' to 'lala' diff --git a/client/luascripts/data_readpwdmem.lua b/client/luascripts/data_readpwdmem.lua index 29cd087fa..0f943e1ac 100644 --- a/client/luascripts/data_readpwdmem.lua +++ b/client/luascripts/data_readpwdmem.lua @@ -9,7 +9,7 @@ desc = [[ This script will read the flash memory of RDV4 and print the stored passwords/keys. It was meant to be used as a help tool after using the BogRun standalone mode before SPIFFS. -You should now use read_pwd_mem_spiffs instead after the updated BogRun standalone mode. +You should now use data_read_pwd_mem_spiffs instead after the updated BogRun standalone mode. (Iceman) script adapted to read and print keys in the default dictionary flashmemory sections. ]] diff --git a/client/luascripts/hf_lf_multi_bruteforce.lua b/client/luascripts/hf_lf_multi_bruteforce.lua index 733c3feab..69c3990f8 100644 --- a/client/luascripts/hf_lf_multi_bruteforce.lua +++ b/client/luascripts/hf_lf_multi_bruteforce.lua @@ -26,7 +26,7 @@ It uses both LF and HF simulations. -- Author note -- I wrote this as i was doing a PACS audit. This is far from complete, but is easily expandable. -- The idea was based on proxbrute, but i needed more options, and support for different readers. - -- I dont know LUA, so I used Brian Redbeards lf_bulk_program.lua script as a starting point, sorry if its kludgy. + -- I dont know LUA, so I used Brian Redbeards lf_hid_bulkclone.lua script as a starting point, sorry if its kludgy. ]] example = [[ @@ -110,7 +110,7 @@ local function isempty(s) return s == nil or s == '' end --- The code below was blatantly stolen from Brian Redbeard's lf_bulk_program.lua script +-- The code below was blatantly stolen from Brian Redbeard's lf_hid_bulkclone.lua script local function toBits(num, bits) bits = bits or math.max(1, select(2, math.frexp(num))) local t = {} diff --git a/client/luascripts/hf_mf_autopwn.lua b/client/luascripts/hf_mf_autopwn.lua index 831a1111e..a08406bbb 100644 --- a/client/luascripts/hf_mf_autopwn.lua +++ b/client/luascripts/hf_mf_autopwn.lua @@ -128,10 +128,10 @@ local function dump_tag(uid, numsectors) -- Save the global args, those are *our* arguments local myargs = args - -- Set the arguments for htmldump script + -- Set the arguments for data_dumptohtml script args =('-i %s.bin -o %s.html'):format(dumpfile, dumpfile) -- call it - require('htmldump') + require('data_dumptohtml') -- Set back args. Not that it's used, just for the karma... args = myargs diff --git a/client/luascripts/hf_mf_dump-laundromat.lua b/client/luascripts/hf_mf_dump-laundromat.lua index 7614bded4..64bbc0a66 100644 --- a/client/luascripts/hf_mf_dump-laundromat.lua +++ b/client/luascripts/hf_mf_dump-laundromat.lua @@ -1,7 +1,7 @@ --- -- This Lua script is designed to run with Iceman/RRG Proxmark3 fork --- Just copy luxeodump.lua to client/luascripts/ --- and run "script run luxeodump" +-- Just copy hf_mf_dump-laundromat.lua to client/luascripts/ +-- and run "script run hf_mf_dump-laundromat" -- requirements local cmds = require('commands') diff --git a/client/luascripts/hf_mf_keycheck.lua b/client/luascripts/hf_mf_keycheck.lua index d50bb00f9..59680cbe4 100644 --- a/client/luascripts/hf_mf_keycheck.lua +++ b/client/luascripts/hf_mf_keycheck.lua @@ -60,7 +60,7 @@ end -- waits for answer from pm3 device local function checkCommand(response) if not response then - print("Timeout while waiting for response. Increase TIMEOUT in mfckeys.lua to wait longer") + print("Timeout while waiting for response. Increase TIMEOUT in hf_mf_keycheck.lua to wait longer") return nil, "Timeout while waiting for device to respond" end @@ -237,7 +237,7 @@ local function perform_check(uid, numsectors) local end_time = os.time() print('') - print('[+] mfckeys - Checkkey execution time: '..os.difftime(end_time, start_time)..' sec') + print('[+] hf_mf_keycheck - Checkkey execution time: '..os.difftime(end_time, start_time)..' sec') core.fast_push_mode(false) diff --git a/client/luascripts/hf_mf_magicrevive.lua b/client/luascripts/hf_mf_magicrevive.lua index dcbb886e1..abbb45576 100644 --- a/client/luascripts/hf_mf_magicrevive.lua +++ b/client/luascripts/hf_mf_magicrevive.lua @@ -19,7 +19,7 @@ script run hf_mf_magicrevive [-h] [-u] ]] arguments = [[ -h this help - -u remagic a Ultralight tag w 7 bytes UID. + -u try to revive a bricked magic Ultralight tag w 7 bytes UID. ]] --- -- A debug printout-function diff --git a/client/luascripts/hf_mfc_uidbruteforce.lua b/client/luascripts/hf_mfc_uidbruteforce.lua index 17a731e3a..d1183e443 100644 --- a/client/luascripts/hf_mfc_uidbruteforce.lua +++ b/client/luascripts/hf_mfc_uidbruteforce.lua @@ -1,5 +1,5 @@ --- Run me like this (connected via USB): ./pm3 -l hf_bruteforce.lua --- Run me like this (connected via Blueshark addon): ./client/proxmark3 /dev/rfcomm0 -l ./hf_bruteforce.lua +-- Run me like this (connected via USB): ./pm3 -l hf_mfc_uidbruteforce.lua +-- Run me like this (connected via Blueshark addon): ./client/proxmark3 /dev/rfcomm0 -l ./hf_mfc_uidbruteforce.lua local getopt = require('getopt') local ansicolors = require('ansicolors') diff --git a/client/luascripts/hf_ntag-3d.lua b/client/luascripts/hf_ntag-3d.lua index 9b87d34ff..e46705bd1 100644 --- a/client/luascripts/hf_ntag-3d.lua +++ b/client/luascripts/hf_ntag-3d.lua @@ -221,13 +221,13 @@ local function configure_magic_ntag(uid) local pwd, pack = core.keygen_algo_d(uid) - -- Set the arguments for mfu_magic script v1.0.8 + -- Set the arguments for hf_mfu_magicwrite script v1.0.8 -- -t 12 == configure NTAG213F -- -u == set UID -- -p == set pwd -- -a == set pack args =('-t 12 -u %s -p %08X -a %04X'):format(uid, pwd, pack) - require('mfu_magic') + require('hf_mfu_magicwrite') -- Set back args. Not that it's used, just for the karma... args = myargs diff --git a/client/luascripts/lf_hid_bulkclone.lua b/client/luascripts/lf_hid_bulkclone.lua index 14af4b553..dae59a53c 100644 --- a/client/luascripts/lf_hid_bulkclone.lua +++ b/client/luascripts/lf_hid_bulkclone.lua @@ -1,5 +1,5 @@ -- --- lf_bulk.lua - A tool to clone a large number of tags at once. +-- lf_hid_bulkclone.lua - A tool to clone a large number of tags at once. -- Updated 2017-04-18 -- Updated 2018-02-20 iceman local getopt = require('getopt') diff --git a/client/luascripts/lf_t55xx_writetest.lua b/client/luascripts/lf_t55xx_writetest.lua index c7caaffda..cfe46d565 100644 --- a/client/luascripts/lf_t55xx_writetest.lua +++ b/client/luascripts/lf_t55xx_writetest.lua @@ -35,7 +35,7 @@ example = [[ 3. script run lf_t55xx_writetest -t PSK1 ]] usage = [[ -script run test_t55x7 [-h] [-t +script run lf_t55xx_writetest [-h] [-t ]] arguments = [[ -h this help diff --git a/client/src/cmdhfmfu.c b/client/src/cmdhfmfu.c index a9b03cb46..021063566 100644 --- a/client/src/cmdhfmfu.c +++ b/client/src/cmdhfmfu.c @@ -136,7 +136,7 @@ static int usage_hf_mfu_wrbl(void) { static int usage_hf_mfu_eload(void) { PrintAndLogEx(NORMAL, "It loads emul dump from the file " _YELLOW_("`filename.eml`")); - PrintAndLogEx(NORMAL, "Hint: See " _YELLOW_("`script run dumptoemul-mfu`") " to convert the .bin to the eml"); + PrintAndLogEx(NORMAL, "Hint: See " _YELLOW_("`script run hf_mfu_dumptoemulator`") " to convert the .bin to the eml"); PrintAndLogEx(NORMAL, "Usage: hf mfu eload u [numblocks]"); PrintAndLogEx(NORMAL, " Options:"); PrintAndLogEx(NORMAL, " h : this help"); diff --git a/client/src/scripting.c b/client/src/scripting.c index 64dd0f84a..fed896970 100644 --- a/client/src/scripting.c +++ b/client/src/scripting.c @@ -55,7 +55,7 @@ static int l_clearCommandBuffer(lua_State *L) { } /** - * Enable / Disable fast push mode for lua scripts like mfckeys + * Enable / Disable fast push mode for lua scripts like hf_mf_keycheck * The following params expected: * *@brief l_fast_push_mode diff --git a/doc/cheatsheet.md b/doc/cheatsheet.md index a032d620d..856203092 100644 --- a/doc/cheatsheet.md +++ b/doc/cheatsheet.md @@ -233,7 +233,7 @@ Options --- i : Specifies the dump-file (input). If omitted, 'dumpdata.bin' is used -pm3 --> script run dumptoemul -i dumpdata.bin +pm3 --> script run hf_mf_dumptoemulator -i dumpdata.bin ``` Write to MIFARE block @@ -285,7 +285,7 @@ Simulate MIFARE Sequence ``` pm3 --> hf mf chk *1 ? d mfc_default_keys pm3 --> hf mf dump 1 -pm3 --> script run dumptoemul -i dumpdata.bin +pm3 --> script run hf_mf_dumptoemulator -i dumpdata.bin pm3 --> hf mf eload 353C2AA6 pm3 --> hf mf sim u 353c2aa6 ``` @@ -305,19 +305,19 @@ pm3 --> hf mfu info Clone MIFARE Ultralight EV1 Sequence ``` pm3 --> hf mfu dump k FFFFFFFF -pm3 --> script run dumptoemul-mfu -i hf-mfu-XXXX-dump.bin -o hf-mfu-XXXX-dump.eml +pm3 --> script run hf_mfu_dumptoemulator -i hf-mfu-XXXX-dump.bin -o hf-mfu-XXXX-dump.eml pm3 --> hf mfu eload u hf-mfu-XXXX-dump.eml pm3 --> hf mfu sim t 7 u hf-mfu-XXXX-dump.eml ``` Bruteforce MIFARE Classic card numbers from 11223344 to 11223346 ``` -pm3 --> script run hf_bruteforce -s 0x11223344 -e 0x11223346 -t 1000 -x mfc +pm3 --> script run hf_mfc_uidbruteforce -s 0x11223344 -e 0x11223346 -t 1000 -x mfc ``` Bruteforce MIFARE Ultralight EV1 card numbers from 11223344556677 to 11223344556679 ``` -pm3 --> script run hf_bruteforce -s 0x11223344556677 -e 0x11223344556679 -t 1000 -x mfu +pm3 --> script run hf_mfc_uidbruteforce -s 0x11223344556677 -e 0x11223344556679 -t 1000 -x mfu ``` ## Wiegand manipulation @@ -563,7 +563,7 @@ Options -i Specifies the dump-file (input). If omitted, 'dumpdata.bin' is used -o Specifies the output file. If omitted, .eml is used -pm3 --> script run dumptoemul -i xxxxxxxxxxxxxx.bin +pm3 --> script run hf_mf_dumptoemulator -i xxxxxxxxxxxxxx.bin ``` Convert .eml to .bin @@ -573,7 +573,7 @@ Options -i Specifies the dump-file (input). If omitted, 'dumpdata.eml' is used -o Specifies the output file. If omitted, .bin is used -pm3 --> script run emul2dump -i myfile.eml -o myfile.bin +pm3 --> script run data_emulatortohtml -i myfile.eml -o myfile.bin ``` Format Mifare card @@ -585,7 +585,7 @@ Options -a The new access bytes that will be written to the card -x Execute the commands aswell -pm3 --> script run formatMifare -k FFFFFFFFFFFF -n FFFFFFFFFFFF -x +pm3 --> script run hf_mf_format -k FFFFFFFFFFFF -n FFFFFFFFFFFF -x ``` ## Memory diff --git a/doc/magic_cards_notes.md b/doc/magic_cards_notes.md index c02b59e53..2fc63a1d2 100644 --- a/doc/magic_cards_notes.md +++ b/doc/magic_cards_notes.md @@ -195,7 +195,7 @@ hf mf csetuid 11223344 0044 18 ``` ``` -script run remagic +script run run hf_mf_magicrevive ``` To execute commands manually: @@ -518,14 +518,14 @@ Only 7b versions ### Proxmark3 commands ``` -script run ul_uid -h +script run hf_mfu_setuid -h ``` When "soft-bricked" (by writing invalid data in block0), these ones may help: ``` hf 14a config h -script run remagic -u +script run run hf_mf_magicrevive -u ``` ## MIFARE Ultralight DirectWrite @@ -723,7 +723,7 @@ Emulates partially UL EV1 48k/128k, NTAG210, NTAG212, NTAGI2C 1K/2K, NTAGI2C 1K ### Proxmark3 commands ``` -script run mfu_magic -h +script run hf_mfu_magicwrite -h ``` # DESFire