RfidResearchGroup/proxmark3
1
1
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2024-11-14 05:41:43 +08:00
Code Issues Projects Releases Packages Wiki Activity
1033 commits 3 branches 14 tags 87 MiB
Commit graph

33 commits

Author SHA1 Message Date
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
iceman1001
5149e37e66 Merge branch 'master' of https://github.com/Proxmark/proxmark3 
Conflicts:
	armsrc/appmain.c
	armsrc/apps.h
 2015-01-20 09:32:53 +01:00
Martin Holst Swende
f44a01235c Merge branch 'master' of https://github.com/iceman1001/ForPm3 2015-01-09 21:50:36 +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
03d7b60f2b ADD: default_toys.lua a script which identify tnp3xx tags 2015-01-08 17:36:01 +01:00
iceman1001
b915fda392 FIX: a solution for the issue "hf mf esave - always saves 4K" 
FIX: a solution for the issue "hf eload, esave, cload, save - filepath variable too short"
CHG: minor code clean up.
ADD: AES / CRC16 for lua. (and tnp3xx scripts.)
ADD: tnp3dump.lua  script to dump tnp3xx tags.
ADD: tnp3sim.lua script to let PM3 imitate an tnp3xx tag. Needs to be tested live
 2015-01-07 22:00:29 +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
b1329a0264 chg: updated the README.txt 
chg: updated the commands.lua so it is in sync with usb_cnd.c definitions.
 2015-01-02 00:09:59 +01:00
marshmellow42
66707a3b3c LF Demod bug fixes and add lf em em410xdemod 
fixed a few bugs in lf demod that the streamlining added.  added new lf
em em410xdemod command that loops until button pressed. (similar to lf
hid fskdemod
 2014-12-29 15:32:53 -05:00
iceman1001
95e635947b ADD: the option to simulate tnp3xxx inthe command "hf mf sim" 
ADD: found some new default keys
ADD: changed alot of memorys buffers to use constant values.  like usbbuffer sizes, tracelogs, etc etc
ADD: all changes Peter filmoore has in his pull request.
 2014-11-26 13:52:39 +01:00
iceman1001
f91f0ebb35 CHG - some lua functions in utils.lua 2014-11-13 20:14:14 +01:00
iceman1001
47cbb2d418 ADD: tnp3.lua can now validate the checkums in the dump 
ADD: added  CRC16 CCITT functionality to LUA
FIX: tnp3.lua is now correctly decryping data while dumping
 2014-11-12 23:18:46 +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
iceman1001
cd5767d43d FIX: I think the dumping of data is correct now in tnp3.lua. MD5 string vs bytearrays in lua are tricky 
ADD: utils.lua some functions to convert between ascii, bytes and strings.
 2014-11-09 19:29:47 +01:00
iceman1001
22f1c57786 Updated tnp3.lua 
added some possibilities to abort the "hf mf nested" command
added a rudimentary items identification for tnp3xxx
 2014-11-09 17:22:04 +01:00
iceman1001
9b989c45b9 FIX: minor parseing bug when loading dumpkeys.bin file. 
ADD:  added some useful helperfunctions to utils.lua
 2014-11-05 19:16:54 +01:00
iceman1001
c15d2bdc9b ADD: added identification for Mifare TNP3xxx tags. 
ADD: MD5-lua functionality
ADD: AES 128 decrypt lua functionality
ADD: test luc script for reading TNP3xxx tags
CHG: testing some changes for "hf 14b sim" / "lf em4x 410xsim"
 2014-11-03 13:49:19 +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 Swende
5b1311fba2 Various scripts from iceman 2014-08-29 09:09:23 +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
b11542a7f6 Minor fix in html skeleton 2013-10-31 18:24:03 +00:00
martin.holst@gmail.com
e26df8425a Some more tinkering with a generic 13.56MHz reader, still not finished 2013-10-31 10:35:03 +00:00
martin.holst@gmail.com
5198f2e23c First steps towards creating a generic HF reader/identifier. A coop with Asper. 2013-10-30 21:10:47 +00:00
martin.holst@gmail.com
62a95012e9 Changed html template, in order to make it more generic and be usable on other types of data than mifare, now supports different highlighters. Implemented are NDEF and Mifare 2013-10-30 18:21:42 +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
martin.holst@gmail.com
3c9ed0e180 Put manufacturer country within brackets 2013-10-18 07:36:20 +00:00
martin.holst@gmail.com
65e344df3e Some refactoring, also placed wait14443a here 2013-10-17 19:21:04 +00:00
martin.holst@gmail.com
5eab31c336 Manufacturer-info, to be used in upcoming script 2013-10-17 19:20:10 +00:00
martin.holst@gmail.com
57d384004d Changes to html-dump generateion, credits to en4rab http://www.proxmark.org/forum/viewtopic.php?pid=8576 2013-10-17 18:28:21 +00:00
martin.holst@gmail.com
e481bc3299 Removed double print-out 2013-10-07 10:02:25 +00:00
martin.holst@gmail.com
61caacda2b Added a utility which takes a mifare-dumpfile and creates a html-report visualising the data. The html-dump is self-sufficient and standalone .. part 2 2013-10-03 12:34:28 +00:00
martin.holst@gmail.com
686f0a1794 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