proxmark3

Files

iceman1001 bcf61bd34a Merge branch 'master' of https://github.com/Proxmark/proxmark3

Conflicts:
	README.txt
	armsrc/appmain.c
	armsrc/apps.h
	armsrc/des.c
	armsrc/iclass.c
	armsrc/mifarecmd.c
	armsrc/mifareutil.c
	armsrc/mifareutil.h
	client/cmddata.c
	client/cmdhf.c
	client/cmdhf14a.c
	client/cmdhficlass.c
	client/cmdhfmfu.c
	client/cmdhfmfu.h
	client/cmdscript.c
	client/lualibs/commands.lua
	client/lualibs/html_dumplib.lua
	client/scripting.c
	client/util.c
	common/protocols.h
	include/usb_cmd.h

2015-05-23 08:16:40 +02:00

commands.lua

@Marshmellow42 's cleanup isn device-side "hf mfu" code. Looks nice. Dump uses bigbuffer now, and can dump NTAG216 :)

2015-05-18 20:58:33 +02:00

default_toys.lua

@iceman1001 's updated lualibs

2015-05-13 21:36:20 -04:00

getopt.lua

Moved script libraries into lualibs/folder, and added a patch to include the folder in the LUA_PATH (a.k.a package.path). See http://proxmark.org/forum/viewtopic.php?id=1750 for more details

2013-09-28 20:07:28 +00:00

hf_reader.lua

Some more tinkering with a generic 13.56MHz reader, still not finished