From a82dba61fa82c408c3c7cee989a8d5559e3a7cc0 Mon Sep 17 00:00:00 2001 From: Philippe Teuwen Date: Wed, 23 Sep 2020 01:00:05 +0200 Subject: [PATCH] Rename offline mf conversion scripts --- ...data_mfc_accessdecode.lua => data_mf_accessdecode.lua} | 4 ++-- .../{hf_mf_dumptoemulator.lua => data_mf_bin2eml.lua} | 4 ++-- .../{data_dumptohtml.lua => data_mf_bin2html.lua} | 4 ++-- .../{data_emulatortodump.lua => data_mf_eml2bin.lua} | 8 ++++---- .../{data_emulatortohtml.lua => data_mf_eml2html.lua} | 4 ++-- client/luascripts/hf_mf_autopwn.lua | 4 ++-- doc/cheatsheet.md | 8 ++++---- 7 files changed, 18 insertions(+), 18 deletions(-) rename client/luascripts/{data_mfc_accessdecode.lua => data_mf_accessdecode.lua} (97%) rename client/luascripts/{hf_mf_dumptoemulator.lua => data_mf_bin2eml.lua} (96%) rename client/luascripts/{data_dumptohtml.lua => data_mf_bin2html.lua} (95%) rename client/luascripts/{data_emulatortodump.lua => data_mf_eml2bin.lua} (90%) rename client/luascripts/{data_emulatortohtml.lua => data_mf_eml2html.lua} (95%) diff --git a/client/luascripts/data_mfc_accessdecode.lua b/client/luascripts/data_mf_accessdecode.lua similarity index 97% rename from client/luascripts/data_mfc_accessdecode.lua rename to client/luascripts/data_mf_accessdecode.lua index 9c65036bb..551080b5d 100644 --- a/client/luascripts/data_mfc_accessdecode.lua +++ b/client/luascripts/data_mf_accessdecode.lua @@ -8,10 +8,10 @@ desc = [[ This script tries to decode Mifare Classic Access bytes ]] example = [[ - 1. script run data_mfc_accessdecode -a 7F0F0869 + 1. script run data_mf_accessdecode -a 7F0F0869 ]] usage = [[ -script run data_mfc_accessdecode [-h] [-a ] +script run data_mf_accessdecode [-h] [-a ] ]] arguments = [[ -h : this help diff --git a/client/luascripts/hf_mf_dumptoemulator.lua b/client/luascripts/data_mf_bin2eml.lua similarity index 96% rename from client/luascripts/hf_mf_dumptoemulator.lua rename to client/luascripts/data_mf_bin2eml.lua index 2c7106928..ef48ead16 100644 --- a/client/luascripts/hf_mf_dumptoemulator.lua +++ b/client/luascripts/data_mf_bin2eml.lua @@ -12,10 +12,10 @@ This script takes a dumpfile from 'hf mf dump' and converts it to a format that by the emulator ]] example = [[ - script run hf_mf_dumptoemulator -i dumpdata-foobar.bin + script run data_mf_bin2eml -i dumpdata-foobar.bin ]] usage = [[ -script run hf_mf_dumptoemulator [-i ] [-o ] +script run data_mf_bin2eml [-i ] [-o ] ]] arguments = [[ -h This help diff --git a/client/luascripts/data_dumptohtml.lua b/client/luascripts/data_mf_bin2html.lua similarity index 95% rename from client/luascripts/data_dumptohtml.lua rename to client/luascripts/data_mf_bin2html.lua index 0a6f9b1d1..c33b4782b 100644 --- a/client/luascripts/data_dumptohtml.lua +++ b/client/luascripts/data_mf_bin2html.lua @@ -13,10 +13,10 @@ This script takes a dumpfile and produces a html based dump, which is a bit more easily analyzed. ]] example = [[ - script run data_dumptohtml -o mifarecard_foo.html + script run data_mf_bin2html -o mifarecard_foo.html ]] usage = [[ -script run data_dumptohtml [-i ] [-o ] +script run data_mf_bin2html [-i ] [-o ] ]] arguments = [[ -h This help diff --git a/client/luascripts/data_emulatortodump.lua b/client/luascripts/data_mf_eml2bin.lua similarity index 90% rename from client/luascripts/data_emulatortodump.lua rename to client/luascripts/data_mf_eml2bin.lua index e40875529..d31b58418 100644 --- a/client/luascripts/data_emulatortodump.lua +++ b/client/luascripts/data_mf_eml2bin.lua @@ -10,12 +10,12 @@ desc =[[ This script takes an dumpfile in EML (ASCII) format and converts it to the PM3 dumpbin file to be used with `hf mf restore` ]] example =[[ - 1. script run data_emulatortodump - 2. script run data_emulatortodump -i myfile.eml - 3. script run data_emulatortodump -i myfile.eml -o myfile.bin + 1. script run data_mf_eml2bin + 2. script run data_mf_eml2bin -i myfile.eml + 3. script run data_mf_eml2bin -i myfile.eml -o myfile.bin ]] usage = [[ -script run data_emulatortodump [-i ] [-o ] +script run data_mf_eml2bin [-i ] [-o ] ]] arguments = [[ -h This help diff --git a/client/luascripts/data_emulatortohtml.lua b/client/luascripts/data_mf_eml2html.lua similarity index 95% rename from client/luascripts/data_emulatortohtml.lua rename to client/luascripts/data_mf_eml2html.lua index 19e57493d..9b2edbe87 100644 --- a/client/luascripts/data_emulatortohtml.lua +++ b/client/luascripts/data_mf_eml2html.lua @@ -13,10 +13,10 @@ This script takes a dumpfile on EML (ASCII) format and produces a html based dum bit more easily analyzed. ]] example = [[ - script run data_emulatortohtml -o dumpdata.eml + script run data_mf_eml2html -o dumpdata.eml ]] usage = [[ -script run data_emulatortohtml [-i ] [-o ] +script run data_mf_eml2html [-i ] [-o ] ]] arguments = [[ -h This help diff --git a/client/luascripts/hf_mf_autopwn.lua b/client/luascripts/hf_mf_autopwn.lua index a08406bbb..f7ea2a832 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 data_dumptohtml script + -- Set the arguments for data_mf_bin2html script args =('-i %s.bin -o %s.html'):format(dumpfile, dumpfile) -- call it - require('data_dumptohtml') + require('data_mf_bin2html') -- Set back args. Not that it's used, just for the karma... args = myargs diff --git a/doc/cheatsheet.md b/doc/cheatsheet.md index e2c4e9326..7da56cbcd 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 hf_mf_dumptoemulator -i dumpdata.bin +pm3 --> script run data_mf_bin2eml -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 hf_mf_dumptoemulator -i dumpdata.bin +pm3 --> script run data_mf_bin2eml -i dumpdata.bin pm3 --> hf mf eload 353C2AA6 pm3 --> hf mf sim u 353c2aa6 ``` @@ -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 hf_mf_dumptoemulator -i xxxxxxxxxxxxxx.bin +pm3 --> script run data_mf_bin2eml -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 data_emulatortohtml -i myfile.eml -o myfile.bin +pm3 --> script run data_mf_eml2bin -i myfile.eml -o myfile.bin ``` Format Mifare card