iceman1001
|
64d1b4efc9
|
Merge branch 'master' of https://github.com/Proxmark/proxmark3
Conflicts:
armsrc/Makefile
armsrc/appmain.c
armsrc/apps.h
armsrc/epa.c
armsrc/iclass.c
armsrc/iso14443a.c
armsrc/iso14443a.h
armsrc/iso15693.c
armsrc/lfops.c
armsrc/mifarecmd.c
armsrc/mifareutil.c
armsrc/mifareutil.h
armsrc/string.h
armsrc/util.h
bootrom/bootrom.c
client/Makefile
client/cmddata.c
client/cmddata.h
client/cmdhf.c
client/cmdhf14a.c
client/cmdhf14b.c
client/cmdhf15.c
client/cmdhficlass.c
client/cmdhfmf.c
client/cmdhfmfu.c
client/cmdlf.c
client/cmdlfem4x.c
client/cmdlfhid.c
client/cmdlfhitag.c
client/cmdlfio.c
client/cmdmain.c
client/data.h
client/flash.c
client/graph.c
client/graph.h
client/loclass/elite_crack.c
client/loclass/fileutils.c
client/lualibs/commands.lua
client/lualibs/html_dumplib.lua
client/lualibs/mf_default_keys.lua
client/lualibs/utils.lua
client/mifarehost.c
client/nonce2key/crapto1.c
client/proxmark3.c
client/scripting.c
client/scripts/tnp3dump.lua
client/scripts/tnp3sim.lua
client/scripts/tracetest.lua
common/Makefile.common
common/cmd.c
common/cmd.h
common/lfdemod.c
common/lfdemod.h
common/usb_cdc.c
common/usb_cdc.h
include/usb_cmd.h
|
2015-01-29 21:39:33 +01:00 |
|
Martin Holst Swende
|
31d1caa526
|
Reverted some minor things, altered other things to get it to compile cleanly
|
2015-01-08 17:51:52 +01:00 |
|
iceman1001
|
3af373f352
|
CHG: Added support for tnp3xx in lua scripts.
ADD: a save file function in lua.
|
2015-01-07 20:45:43 +01:00 |
|
iceman1001
|
f595de25e9
|
ADD: html_dumplib.lua, added the functionality to save text-files.
ADD: tnp3.lua, now will save the dumped data to BIN and EML
FIX: tnp3.lua, added some clearcommando buffer to help the pm3 not to be blocked
|
2014-11-10 21:46:21 +01:00 |
|
Martin Holst Swende
|
fdefed663f
|
Some more lua-scripts and library fixes from iceman, including more default keys
|
2014-08-29 09:11:36 +02:00 |
|
martin.holst@gmail.com
|
4c367827b5
|
Fixed issue with binary files in windows, http://www.lua.org/pil/21.2.2.html
|
2013-11-07 11:32:13 +00:00 |
|
martin.holst@gmail.com
|
c44241fdea
|
Fixed minor errors
|
2013-10-20 18:47:15 +00:00 |
|
martin.holst@gmail.com
|
6742c089b1
|
Changes to how dumping is performed, now utilises a library. This is in preparation for a more generic dumping of different types of cards. Also added functionality to html-dump .eml-files
|
2013-10-19 20:18:50 +00:00 |
|