diff --git a/client/luascripts/14araw.lua b/client/luascripts/14araw.lua index 30ab5e497..e6a180bfb 100644 --- a/client/luascripts/14araw.lua +++ b/client/luascripts/14araw.lua @@ -1,10 +1,11 @@ local cmds = require('commands') local getopt = require('getopt') local lib14a = require('read14a') +local ansicolors = require('ansicolors') copyright = '' author = "Martin Holst Swende" -version = 'v1.0.1' +version = 'v1.0.2' desc = [[ This is a script to allow raw 1444a commands to be sent and received. ]] @@ -23,8 +24,8 @@ example = [[ ]] usage = [[ script run 14araw -x 6000F57b - -Arguments: +]] +arguments = [[ -o do not connect - use this only if you previously used -p to stay connected -r do not read response -c calculate and append CRC @@ -79,9 +80,12 @@ local function help() print(author) print(version) print(desc) - print('Example usage') - print(example) + print(ansicolors.cyan..'Usage'..ansicolors.reset) print(usage) + print(ansicolors.cyan..'Arguments'..ansicolors.reset) + print(arguments) + print(ansicolors.cyan..'Example usage'..ansicolors.reset) + print(example) end --- -- The main entry point diff --git a/client/luascripts/brutesim.lua b/client/luascripts/brutesim.lua index 4d58c5c52..4d8ba7d57 100644 --- a/client/luascripts/brutesim.lua +++ b/client/luascripts/brutesim.lua @@ -1,8 +1,9 @@ local getopt = require('getopt') +local ansicolors = require('ansicolors') copyright = '' author = 'Kenzy Carey' -version = 'v1.0.1' +version = 'v1.0.2' desc = [[ .-----------------------------------------------------------------. @@ -34,10 +35,9 @@ example = [[ script run brutesim -r pyramid -f 10 -b 1000 -c 10 -t 1 -d down ]] usage = [[ - script run brutesim -r rfid_tag -f facility_code -b base_card_number -c count -t timeout -d direction - -Arguments: +]] +arguments = [[ -h this help -r *see below RFID Tag: the RFID tag to emulate pyramid @@ -89,9 +89,12 @@ local function help() print(author) print(version) print(desc) - print('Example usage') - print(example) + print(ansicolors.cyan..'Usage'..ansicolors.reset) print(usage) + print(ansicolors.cyan..'Arguments'..ansicolors.reset) + print(arguments) + print(ansicolors.cyan..'Example usage'..ansicolors.reset) + print(example) end -- -- Exit message diff --git a/client/luascripts/calc_di.lua b/client/luascripts/calc_di.lua index d2e712563..737d993af 100644 --- a/client/luascripts/calc_di.lua +++ b/client/luascripts/calc_di.lua @@ -2,10 +2,11 @@ local bin = require('bin') local getopt = require('getopt') local lib14a = require('read14a') local utils = require('utils') +local ansicolors = require('ansicolors') copyright = '' author = "Iceman" -version = 'v1.0.0' +version = 'v1.0.1' desc = [[ This script calculates mifare keys based on uid diversification for DI. Algo not found by me. @@ -19,8 +20,8 @@ example = [[ ]] usage = [[ script run calc_di -h -u - -Arguments: +]] +arguments = [[ -h : this help -u : UID ]] @@ -57,9 +58,12 @@ local function help() print(author) print(version) print(desc) - print('Example usage') - print(example) + print(ansicolors.cyan..'Usage'..ansicolors.reset) print(usage) + print(ansicolors.cyan..'Arguments'..ansicolors.reset) + print(arguments) + print(ansicolors.cyan..'Example usage'..ansicolors.reset) + print(example) end --- -- Exit message diff --git a/client/luascripts/calc_ev1_it.lua b/client/luascripts/calc_ev1_it.lua index c5cc5d110..2e333d147 100644 --- a/client/luascripts/calc_ev1_it.lua +++ b/client/luascripts/calc_ev1_it.lua @@ -2,10 +2,11 @@ local bin = require('bin') local getopt = require('getopt') local lib14a = require('read14a') local utils = require('utils') +local ansicolors = require('ansicolors') copyright = '' author = "Iceman" -version = 'v1.0.0' +version = 'v1.0.1' desc = [[ This script calculates mifare Ultralight-EV1 pwd based on uid diversification for an Italian ticketsystem Algo not found by me. @@ -19,8 +20,8 @@ example =[[ ]] usage = [[ script run calc_ev1_it -h -u " - -Arguments: +]] +arguments = [[ -h : this help -u : UID ]] @@ -55,9 +56,12 @@ local function help() print(author) print(version) print(desc) - print("Example usage") - print(example) + print(ansicolors.cyan..'Usage'..ansicolors.reset) print(usage) + print(ansicolors.cyan..'Arguments'..ansicolors.reset) + print(arguments) + print(ansicolors.cyan..'Example usage'..ansicolors.reset) + print(example) end -- -- Exit message diff --git a/client/luascripts/calc_mizip.lua b/client/luascripts/calc_mizip.lua index bff493131..79fbae75f 100644 --- a/client/luascripts/calc_mizip.lua +++ b/client/luascripts/calc_mizip.lua @@ -2,10 +2,11 @@ local bin = require('bin') local getopt = require('getopt') local lib14a = require('read14a') local utils = require('utils') +local ansicolors = require('ansicolors') copyright = '' author = 'Iceman' -version = 'v1.0.1' +version = 'v1.0.2' desc = [[ This script calculates mifare keys based on uid diversification for mizip. Algo not found by me. @@ -19,8 +20,8 @@ example = [[ ]] usage = [[ script run calc_mizip -h -u - -Arguments: +]] +arguments = [[ -h : this help -u : UID ]] @@ -62,9 +63,12 @@ local function help() print(author) print(version) print(desc) - print("Example usage") - print(example) + print(ansicolors.cyan..'Usage'..ansicolors.reset) print(usage) + print(ansicolors.cyan..'Arguments'..ansicolors.reset) + print(arguments) + print(ansicolors.cyan..'Example usage'..ansicolors.reset) + print(example) end -- -- Exit message diff --git a/client/luascripts/calypso.lua b/client/luascripts/calypso.lua index afb466109..de72f41c6 100644 --- a/client/luascripts/calypso.lua +++ b/client/luascripts/calypso.lua @@ -3,10 +3,11 @@ local getopt = require('getopt') local lib14b = require('read14b') local utils = require('utils') local iso7816 = require('7816_error') +local ansicolors = require('ansicolors') copyright = '' author = 'Iceman' -version = 'v1.0.1' +version = 'v1.0.2' desc = [[ This is a script to communicate with a CALYSPO / 14443b tag using the '14b raw' commands ]] @@ -16,8 +17,8 @@ example = [[ ]] usage = [[ script run calypso -h -b - -Arguments: +]] +arguments = [[ h this helptext b raw bytes to send ]] @@ -66,9 +67,12 @@ local function help() print(author) print(version) print(desc) - print('Example usage') - print(example) + print(ansicolors.cyan..'Usage'..ansicolors.reset) print(usage) + print(ansicolors.cyan..'Arguments'..ansicolors.reset) + print(arguments) + print(ansicolors.cyan..'Example usage'..ansicolors.reset) + print(example) end -- -- helper function, give current count of items in lua-table. diff --git a/client/luascripts/didump.lua b/client/luascripts/didump.lua index a9228c7b5..39207151e 100644 --- a/client/luascripts/didump.lua +++ b/client/luascripts/didump.lua @@ -6,10 +6,11 @@ local utils = require('utils') local lib14a = require('read14a') local json = require('dkjson') local toys = require('default_toys_di') +local ansicolors = require('ansicolors') copyright = '' author = 'Iceman' -version = 'v1.0.1' +version = 'v1.0.2' desc = [[ This is a script to dump and decrypt the data of a specific type of Mifare Mini token. The dump is decrypted. If a raw dump is wanted, use the -r parameter @@ -28,8 +29,8 @@ example = [[ ]] usage = [[ script run didump -h -t -r -d -e -v -i dumpdata.json - -Arguments: +]] +arguments = [[ h this helptext r raw t selftest @@ -88,9 +89,12 @@ local function help() print(author) print(version) print(desc) - print('Example usage') - print(example) + print(ansicolors.cyan..'Usage'..ansicolors.reset) print(usage) + print(ansicolors.cyan..'Arguments'..ansicolors.reset) + print(arguments) + print(ansicolors.cyan..'Example usage'..ansicolors.reset) + print(example) end --- -- diff --git a/client/luascripts/dumptoemul-mfu.lua b/client/luascripts/dumptoemul-mfu.lua index 672f05e8f..0bd11e297 100644 --- a/client/luascripts/dumptoemul-mfu.lua +++ b/client/luascripts/dumptoemul-mfu.lua @@ -2,10 +2,11 @@ -- Have a look there for further details getopt = require('getopt') bin = require('bin') +local ansicolors = require('ansicolors') copyright = '' author = "Martin Holst Swende \n @Marshmellow \n @iceman" -version = 'v1.0.1' +version = 'v1.0.2' desc =[[ This script takes a dumpfile from 'hf mfu dump' and converts it to a format that can be used by the emulator @@ -15,8 +16,8 @@ example = [[ ]] usage = [[ script run dumptoemul-mfu [-i ] [-o ] - -Arguments: +]] +arguments = [[ -h This help -i Specifies the dump-file (input). If omitted, 'dumpdata.bin' is used -o Specifies the output file. If omitted, .eml is used. @@ -53,9 +54,12 @@ local function help() print(author) print(version) print(desc) - print('Example usage') - print(example) + print(ansicolors.cyan..'Usage'..ansicolors.reset) print(usage) + print(ansicolors.cyan..'Arguments'..ansicolors.reset) + print(arguments) + print(ansicolors.cyan..'Example usage'..ansicolors.reset) + print(example) end local function convert_to_ascii(hexdata) diff --git a/client/luascripts/dumptoemul.lua b/client/luascripts/dumptoemul.lua index 80653a14a..88121f86d 100644 --- a/client/luascripts/dumptoemul.lua +++ b/client/luascripts/dumptoemul.lua @@ -2,10 +2,11 @@ -- Have a look there for further details getopt = require('getopt') bin = require('bin') +local ansicolors = require('ansicolors') copyright = '' author = 'Martin Holst Swende' -version = 'v1.0.1' +version = 'v1.0.2' desc = [[ This script takes a dumpfile from 'hf mf dump' and converts it to a format that can be used by the emulator @@ -14,9 +15,9 @@ example = [[ script run dumptoemul -i dumpdata-foobar.bin ]] usage = [[ -_script run dumptoemul [-i ] [-o ] - -Arguments: +script run dumptoemul [-i ] [-o ] +]] +arguments = [[ -h This help -i Specifies the dump-file (input). If omitted, 'dumpdata.bin' is used -o Specifies the output file. If omitted, .eml is used. @@ -56,9 +57,12 @@ function help() print(author) print(version) print(desc) - print('Example usage') - print(example) + print(ansicolors.cyan..'Usage'..ansicolors.reset) print(usage) + print(ansicolors.cyan..'Arguments'..ansicolors.reset) + print(arguments) + print(ansicolors.cyan..'Example usage'..ansicolors.reset) + print(example) end local function convert_to_ascii(hexdata) diff --git a/client/luascripts/e.lua b/client/luascripts/e.lua index 580e89a54..43e0ab407 100644 --- a/client/luascripts/e.lua +++ b/client/luascripts/e.lua @@ -1,9 +1,10 @@ local getopt = require('getopt') local utils = require('utils') +local ansicolors = require('ansicolors') copyright = '' author = 'Iceman' -version = 'v1.0.1' +version = 'v1.0.2' desc = [[ This script calculates many checksums (CRC) over the provided hex input. ]] @@ -12,7 +13,9 @@ example = [[ script run e -b 010203040506070809 -w 16 ]] usage = [[ -Arguments: +script run e [-b ] +]] +arguments = [[ -b data in hex -w bitwidth of the CRC family of algorithm. defaults to all known CRC presets. ]] @@ -44,9 +47,12 @@ local function help() print(author) print(version) print(desc) - print('Example usage') - print(example) + print(ansicolors.cyan..'Usage'..ansicolors.reset) print(usage) + print(ansicolors.cyan..'Arguments'..ansicolors.reset) + print(arguments) + print(ansicolors.cyan..'Example usage'..ansicolors.reset) + print(example) end --- -- The main entry point diff --git a/client/luascripts/emul2dump.lua b/client/luascripts/emul2dump.lua index e71366ce0..9249dd5c0 100644 --- a/client/luascripts/emul2dump.lua +++ b/client/luascripts/emul2dump.lua @@ -5,7 +5,7 @@ local ansicolors = require('ansicolors') copyright = '' author = 'Iceman' -version = 'v1.0.1' +version = 'v1.0.2' desc =[[ This script takes an dumpfile on EML (ASCII) format and converts it to the PM3 dumpbin file to be used with `hf mf restore` ]] @@ -17,7 +17,6 @@ example =[[ usage = [[ script run emul2dump [-i ] [-o ] ]] - arguments = [[ -h This help -i Specifies the dump-file (input). If omitted, 'dumpdata.eml' is used @@ -26,7 +25,7 @@ arguments = [[ ]] --- -- This is only meant to be used when errors occur -local function oops(err) +local function dbg(err) if not DEBUG then return end if type(args) == 'table' then local i = 1 @@ -39,6 +38,13 @@ local function oops(err) end end --- +-- This is only meant to be used when errors occur +local function oops(err) + print('ERROR:', err) + core.clearCommandBuffer() + return nil, err +end +--- -- Usage help local function help() print(copyright) diff --git a/client/luascripts/emul2html.lua b/client/luascripts/emul2html.lua index 879250077..533637669 100644 --- a/client/luascripts/emul2html.lua +++ b/client/luascripts/emul2html.lua @@ -3,10 +3,11 @@ getopt = require('getopt') bin = require('bin') dumplib = require('html_dumplib') +local ansicolors = require('ansicolors') copyright = '' author = 'Martin Holst Swende' -version = 'v1.0.1' +version = 'v1.0.2' desc = [[ This script takes a dumpfile on EML (ASCII) format and produces a html based dump, which is a bit more easily analyzed. @@ -16,8 +17,8 @@ example = [[ ]] usage = [[ script run htmldump [-i ] [-o ] - -Arguments: +]] +arguments = [[ -h This help -i Specifies the dump-file (input). If omitted, 'dumpdata.eml' is used -o Speciies the output file. If omitted, .html is used. @@ -54,9 +55,12 @@ local function help() print(author) print(version) print(desc) - print('Example usage') - print(example) + print(ansicolors.cyan..'Usage'..ansicolors.reset) print(usage) + print(ansicolors.cyan..'Arguments'..ansicolors.reset) + print(arguments) + print(ansicolors.cyan..'Example usage'..ansicolors.reset) + print(example) end local function main(args)