Skip to content

Commit

Permalink
fix lau scripts renaming
Browse files Browse the repository at this point in the history
  • Loading branch information
doegox committed Sep 22, 2020
1 parent 6414e00 commit 610b456
Show file tree
Hide file tree
Showing 17 changed files with 35 additions and 35 deletions.
2 changes: 1 addition & 1 deletion armsrc/Standalone/hf_aveful.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
4 changes: 2 additions & 2 deletions armsrc/Standalone/hf_bog.c
Original file line number Diff line number Diff line change
Expand Up @@ -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.
*/

Expand Down Expand Up @@ -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");
}
4 changes: 2 additions & 2 deletions client/luascripts/data_example_parameters.lua
Original file line number Diff line number Diff line change
Expand Up @@ -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 = [[
Expand Down Expand Up @@ -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'
Expand Down
2 changes: 1 addition & 1 deletion client/luascripts/data_readpwdmem.lua
Original file line number Diff line number Diff line change
Expand Up @@ -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.
]]
Expand Down
4 changes: 2 additions & 2 deletions client/luascripts/hf_lf_multi_bruteforce.lua
Original file line number Diff line number Diff line change
Expand Up @@ -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 = [[
Expand Down Expand Up @@ -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 = {}
Expand Down
4 changes: 2 additions & 2 deletions client/luascripts/hf_mf_autopwn.lua
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions client/luascripts/hf_mf_dump-laundromat.lua
Original file line number Diff line number Diff line change
@@ -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')
Expand Down
4 changes: 2 additions & 2 deletions client/luascripts/hf_mf_keycheck.lua
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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)

Expand Down
2 changes: 1 addition & 1 deletion client/luascripts/hf_mf_magicrevive.lua
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions client/luascripts/hf_mfc_uidbruteforce.lua
Original file line number Diff line number Diff line change
@@ -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')
Expand Down
4 changes: 2 additions & 2 deletions client/luascripts/hf_ntag-3d.lua
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion client/luascripts/lf_hid_bulkclone.lua
Original file line number Diff line number Diff line change
@@ -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')
Expand Down
2 changes: 1 addition & 1 deletion client/luascripts/lf_t55xx_writetest.lua
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ example = [[
3. script run lf_t55xx_writetest -t PSK1
]]
usage = [[
script run test_t55x7 [-h] [-t <modulation type>
script run lf_t55xx_writetest [-h] [-t <modulation type>
]]
arguments = [[
-h this help
Expand Down
2 changes: 1 addition & 1 deletion client/src/cmdhfmfu.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 <file name w/o `.eml`> [numblocks]");
PrintAndLogEx(NORMAL, " Options:");
PrintAndLogEx(NORMAL, " h : this help");
Expand Down
2 changes: 1 addition & 1 deletion client/src/scripting.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
16 changes: 8 additions & 8 deletions doc/cheatsheet.md
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,7 @@ Options
---
i <file> : 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
Expand Down Expand Up @@ -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
```
Expand All @@ -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
Expand Down Expand Up @@ -563,7 +563,7 @@ Options
-i <file> Specifies the dump-file (input). If omitted, 'dumpdata.bin' is used
-o <filename> Specifies the output file. If omitted, <uid>.eml is used
pm3 --> script run dumptoemul -i xxxxxxxxxxxxxx.bin
pm3 --> script run hf_mf_dumptoemulator -i xxxxxxxxxxxxxx.bin
```

Convert .eml to .bin
Expand All @@ -573,7 +573,7 @@ Options
-i <filename> Specifies the dump-file (input). If omitted, 'dumpdata.eml' is used
-o <filename> Specifies the output file. If omitted, <currdate>.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
Expand All @@ -585,7 +585,7 @@ Options
-a <access> 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
Expand Down
8 changes: 4 additions & 4 deletions doc/magic_cards_notes.md
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ hf mf csetuid 11223344 0044 18
```

```
script run remagic
script run run hf_mf_magicrevive
```

To execute commands manually:
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 610b456

Please sign in to comment.