From 2010f8db038f5841abce8265d246dd0151127869 Mon Sep 17 00:00:00 2001 From: iceman1001 Date: Sun, 5 Apr 2020 12:28:49 +0200 Subject: [PATCH] colors --- client/luascripts/Legic_clone.lua | 24 +++++----- client/luascripts/formatMifare.lua | 14 +++--- client/luascripts/hf_bruteforce.lua | 51 +++++++++++---------- client/luascripts/hf_read.lua | 60 +++++++++++++++++++++++++ client/luascripts/htmldump.lua | 14 +++--- client/luascripts/init_rdv4.lua | 15 ++++--- client/luascripts/iso15_magic.lua | 14 +++--- client/luascripts/legic_buffer2card.lua | 14 +++--- client/luascripts/lf_bulk.lua | 14 +++--- client/luascripts/lto_dump.lua | 14 +++--- 10 files changed, 164 insertions(+), 70 deletions(-) diff --git a/client/luascripts/Legic_clone.lua b/client/luascripts/Legic_clone.lua index 982b17aec..191f9f9e0 100644 --- a/client/luascripts/Legic_clone.lua +++ b/client/luascripts/Legic_clone.lua @@ -1,3 +1,6 @@ +local utils = require('utils') +local getopt = require('getopt') +local ansicolors = require('ansicolors') --[[ script to create a clone-dump with new crc Author: mosci @@ -86,7 +89,7 @@ copyright = '' author = 'Mosci' -version = 'v1.0.1' +version = 'v1.0.2' desc = [[ This is a script which creates a clone-dump of a dump from a Legic Prime Tag (MIM256 or MIM1024) (created with 'hf legic save my_dump.hex') @@ -97,11 +100,12 @@ example = [[ ]] usage = [[ script run legic_clone -h -i -o -c -d -s -w - -required arguments: +]] +arguments = [[ +required : -i (file to read data from) -optional arguments : +optional : -h - Help text -o - requires option -c to be given -c - requires option -o to be given @@ -112,8 +116,7 @@ optional arguments : e.g.: hint: using the CRC '00' will result in a plain dump ( -c 00 ) ]] -local utils = require('utils') -local getopt = require('getopt') + local bxor = bit32.bxor -- we need always 2 digits @@ -128,7 +131,6 @@ local function prepend_zero(s) end end end - --- -- This is only meant to be used when errors occur local function oops(err) @@ -136,7 +138,6 @@ local function oops(err) core.clearCommandBuffer() return nil, err end - --- -- Usage help local function help() @@ -144,9 +145,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 -- Check availability of file diff --git a/client/luascripts/formatMifare.lua b/client/luascripts/formatMifare.lua index 7c6fd92c0..30ab20535 100644 --- a/client/luascripts/formatMifare.lua +++ b/client/luascripts/formatMifare.lua @@ -3,10 +3,11 @@ local getopt = require('getopt') local bin = require('bin') 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 will generate 'hf mf wrbl' commands for each block to format a Mifare card. @@ -29,8 +30,8 @@ example = [[ ]] usage = [[ script run formatMifare -k -n -a -x - -Arguments: +]] +arguments = [[ -h - this help -k - the current six byte key with write access -n - the new key that will be written to the card @@ -71,9 +72,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/hf_bruteforce.lua b/client/luascripts/hf_bruteforce.lua index 485d72809..a1ba34fad 100644 --- a/client/luascripts/hf_bruteforce.lua +++ b/client/luascripts/hf_bruteforce.lua @@ -2,38 +2,38 @@ -- Run me like this (connected via Blueshark addon): ./client/proxmark3 /dev/rfcomm0 -l ./hf_bruteforce.lua local getopt = require('getopt') +local ansicolors = require('ansicolors') copyright = '' author = 'Daniel Underhay (updated), Keld Norman(original)' -version = 'v2.0.0' -usage = [[ - -pm3 --> script run hf_bruteforce -s start_id -e end_id -t timeout -x mifare_card_type - -Arguments: - -h this help - -s 0-0xFFFFFFFF start id - -e 0-0xFFFFFFFF end id - -t 0-99999, pause timeout (ms) between cards (use the word 'pause' to wait for user input) - -x mfc, mfu mifare type: mfc for Mifare Classic (default) or mfu for Mifare Ultralight EV1 - - -Example: - -pm3 --> script run hf_bruteforce -s 0x11223344 -e 0x11223346 -t 1000 -x mfc - +version = 'v2.0.1' +desc =[[ +This script bruteforces 4 or 7 byte UID Mifare classic card numbers. +]] +example =[[ Bruteforce a 4 byte UID Mifare classic card number, starting at 11223344, ending at 11223346. - - -pm3 --> script run hf_bruteforce -s 0x11223344556677 -e 0x11223344556679 -t 1000 -x mfu + + script run hf_bruteforce -s 0x11223344 -e 0x11223346 -t 1000 -x mfc Bruteforce a 7 byte UID Mifare Ultralight card number, starting at 11223344556677, ending at 11223344556679. + script run hf_bruteforce -s 0x11223344556677 -e 0x11223344556679 -t 1000 -x mfu +]] +usage = [[ +script run hf_bruteforce [-s ] [-e ] [-t ] [-x ] +]] +arguments = [[ + -h this help + -s 0-0xFFFFFFFF start id + -e 0-0xFFFFFFFF end id + -t 0-99999, pause timeout (ms) between cards + (use the word 'pause' to wait for user input) + -x mfc, mfu mifare type: + mfc for Mifare Classic (default) + mfu for Mifare Ultralight EV1 ]] - local DEBUG = true - --- -- Debug print function local function dbg(args) @@ -62,9 +62,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 --- --- Print user message diff --git a/client/luascripts/hf_read.lua b/client/luascripts/hf_read.lua index 00238a67c..e416cdd2e 100644 --- a/client/luascripts/hf_read.lua +++ b/client/luascripts/hf_read.lua @@ -1,6 +1,65 @@ local reader = require('hf_reader') +local getopt = require('getopt') +local ansicolors = require('ansicolors') +copyright = '' +author = '' +version = 'v1.0.1' +desc = [[ +This script tries to detect a HF card. Just like 'hf search' does but this is experimental +]] +example = [[ + 1. script run hf_read +]] +usage = [[ +script run hf_read +]] +arguments = [[ + -h - this help +]] +--- +-- This is only meant to be used when errors occur +local function dbg(err) + if not DEBUG then return end + if type(args) == 'table' then + local i = 1 + while args[i] do + dbg(args[i]) + i = i+1 + end + else + print('###', args) + 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) + print(author) + print(version) + print(desc) + 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) + -- Arguments for the script + for o, a in getopt.getopt(args, 'h') do + if o == 'h' then return help() end + end + print("WORK IN PROGRESS - not expected to be functional yet") info, err = reader.waitForTag() @@ -15,4 +74,5 @@ local function main(args) end return end + main(args) diff --git a/client/luascripts/htmldump.lua b/client/luascripts/htmldump.lua index 0101c14a8..2853d343b 100644 --- a/client/luascripts/htmldump.lua +++ b/client/luascripts/htmldump.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 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.bin' is used -o Speciies the output file. If omitted, .html is used. @@ -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 local function main(args) diff --git a/client/luascripts/init_rdv4.lua b/client/luascripts/init_rdv4.lua index d2dd03e24..bc18dc0a9 100644 --- a/client/luascripts/init_rdv4.lua +++ b/client/luascripts/init_rdv4.lua @@ -1,21 +1,21 @@ local getopt = require('getopt') +local ansicolors = require('ansicolors') copyright = 'Copyright (c) 2019 IceSQL AB. All rights reserved.' author = 'Christian Herrmann' -version = 'v1.0.0' +version = 'v1.0.1' desc = [[ This script initialize a Proxmark3 RDV4.0 with - uploading dictionary files to flashmem - configuring the LF T55X7 device settings ]] example = [[ - script run init_rdv4 ]] usage = [[ script run init_rdv4 -h - -Arguments: +]] +arguments = [[ -h : this help ]] @@ -48,9 +48,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/iso15_magic.lua b/client/luascripts/iso15_magic.lua index ba94465e4..94f1d8f97 100644 --- a/client/luascripts/iso15_magic.lua +++ b/client/luascripts/iso15_magic.lua @@ -2,10 +2,11 @@ local cmds = require('commands') local lib15 = require('read15') local getopt = require('getopt') local utils = require('utils') +local ansicolors = require('ansicolors') copyright = 'Copyright (c) 2018 IceSQL AB. All rights reserved.' author = 'Christian Herrmann' -version = 'v1.0.5' +version = 'v1.0.6' desc = [[ This script tries to set UID on a IS15693 SLIX magic card Remember the UID ->MUST<- start with 0xE0 @@ -20,8 +21,8 @@ example = [[ ]] usage = [[ script run iso15_magic -h -u - -Arguments: +]] +arguments = [[ -h : this help -u : UID (16 hexsymbols) -a : use offical pm3 repo ISO15 commands instead of iceman fork. @@ -56,9 +57,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 -- --- Set UID on magic command enabled on a ICEMAN based REPO diff --git a/client/luascripts/legic_buffer2card.lua b/client/luascripts/legic_buffer2card.lua index 462880ce5..d0a018d83 100644 --- a/client/luascripts/legic_buffer2card.lua +++ b/client/luascripts/legic_buffer2card.lua @@ -1,10 +1,11 @@ local utils = require('utils') local getopt = require('getopt') +local ansicolors = require('ansicolors') -- this script writes bytes 8 to 256 on the Legic MIM256 copyright = '' author = 'Mosci' -version = 'v1.0.1' +version = 'v1.0.2' desc = [[ This is a script which writes value 0x01 to bytes from position 0x07 until 0xFF on a Legic Prime Tag (MIM256 or MIM1024) -- (created with 'hf legic save my_dump.hex') -- @@ -14,8 +15,8 @@ example = [[ ]] usage = [[ script run legic_buffer2card -h - -Arguments +]] +arguments = [[ -h - Help text ]] @@ -33,9 +34,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 -- -- simple loop-write from 0x07 to 0xff diff --git a/client/luascripts/lf_bulk.lua b/client/luascripts/lf_bulk.lua index 54c60fb89..709c992a4 100644 --- a/client/luascripts/lf_bulk.lua +++ b/client/luascripts/lf_bulk.lua @@ -3,10 +3,11 @@ -- Updated 2017-04-18 -- Updated 2018-02-20 iceman local getopt = require('getopt') +local ansicolors = require('ansicolors') copyright = '' author = "Brian Redbeard" -version = 'v1.0.1' +version = 'v1.0.2' desc = [[ Perform bulk enrollment of 26 bit H10301 style RFID Tags For more info, check the comments in the code @@ -17,8 +18,8 @@ example = [[ ]] usage = [[ script run lf_bulk.lua -f facility -b base_id_num -c count - -Arguments: +]] +arguments = [[ -h : this help -f : facility id -b : starting card id @@ -56,9 +57,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/lto_dump.lua b/client/luascripts/lto_dump.lua index a384a4f9b..d2dd87762 100644 --- a/client/luascripts/lto_dump.lua +++ b/client/luascripts/lto_dump.lua @@ -2,10 +2,11 @@ local cmds = require('commands') local getopt = require('getopt') local lib14a = require('read14a') local utils = require('utils') +local ansicolors = require('ansicolors') copyright = '' author = 'Kevin' -version = 'v1.0.1' +version = 'v1.0.2' desc = [[ This is a script that reads LTO-CM ISO14443a tags. It starts from block 0 and ends at default block 254. @@ -19,8 +20,8 @@ example = [[ ]] usage = [[ script run lto_dump -h -s -e - -Arguments: +]] +arguments = [[ h this helptext s start block in decimal e end block in decimal @@ -58,9 +59,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 sendRaw(rawdata, options)