github/RRG-Proxmark3
1
0
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-08-19 21:03:48 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

FIX: 'script run mifare_autopwn' some print statements

Browse source 
FIX: 'script run mfkeys'  correct author,  added copyright
This commit is contained in:
iceman1001 2017-07-24 13:00:40 +02:00
commit b149fdc67b
2 changed files with 5 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

3
client/scripts/mfkeys.lua
View file

@ -20,7 +20,7 @@ local utils = require('utils')
example =[[ example =[[
script run mfkeys script run mfkeys
]] ]]
author = "Iceman" author = "Holiman"
usage = "script run mfkeys" usage = "script run mfkeys"
desc = ("This script implements Mifare check keys. It utilises a large list of default keys (currently %d keys).\ desc = ("This script implements Mifare check keys. It utilises a large list of default keys (currently %d keys).\
If you want to add more, just put them inside /lualibs/mf_default_keys.lua\n"):format(#keylist) .. If you want to add more, just put them inside /lualibs/mf_default_keys.lua\n"):format(#keylist) ..
@ -101,7 +101,6 @@ local function checkBlock(blockno, testkeys, keytype)
end end
-- A function to display the results -- A function to display the results
-- TODO: iceman 2016, still screws up output when a key is not found.
local function display_results(keys) local function display_results(keys)
local sector, keyA, keyB, succA, succB local sector, keyA, keyB, succA, succB
print('') print('')

8
client/scripts/mifare_autopwn.lua
View file

@ -6,7 +6,7 @@ example = "script run mifare_autopwn"
author = "Martin Holst Swende" author = "Martin Holst Swende"
desc = desc =
[[ [[
This is a which automates cracking and dumping mifare classic cards. It sets itself into This is a script which automates cracking and dumping mifare classic cards. It sets itself into
'listening'-mode, after which it cracks and dumps any mifare classic card that you 'listening'-mode, after which it cracks and dumps any mifare classic card that you
place by the device. place by the device.
@ -149,9 +149,9 @@ end
function nested(key,sak) function nested(key,sak)
local typ = 1 local typ = 1
if 0x18 == sak then --NXP MIFARE Classic 4k | Plus 4k if 0x18 == sak then --NXP MIFARE Classic 4k | Plus 4k | Ev1 4k
typ = 4 typ = 4
elseif 0x08 == sak then -- NXP MIFARE CLASSIC 1k | Plus 2k elseif 0x08 == sak then -- NXP MIFARE CLASSIC 1k | Plus 2k | Ev1 1K
typ= 1 typ= 1
elseif 0x09 == sak then -- NXP MIFARE Mini 0.3k elseif 0x09 == sak then -- NXP MIFARE Mini 0.3k
typ = 0 typ = 0
@ -186,7 +186,7 @@ end
-- The main entry point -- The main entry point
function main(args) function main(args)
local verbose, exit,res,uid,err,_,sak local verbose, exit, res, uid, err, _, sak
local seen_uids = {} local seen_uids = {}
local print_message = true local print_message = true
-- Read the parameters -- Read the parameters