Commit graph

55 commits

Author SHA1 Message Date
iceman1001
a8d4906ba5 add: lots of new toytypes in default_toys.lua
fix: mixture between dec & hex numbers caused wrongly identifications of toytypes (default_toys.lua)
add: showing bytes for trap-types in tnp3dump.lua
2015-02-04 11:40:49 +01:00
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
81740aa519 STEP 3 - the actual new files for Ultralight.
ADD: script remagic.lua  --  a script to make a "dead" Mifare s50 generation 1 alive again.
ADD: tracetest.lua  - This script will load several traces files in ../traces/ folder and do
"data load"
"lf search"
ADD: test_t55x7_psk.lua   -  iterates thru a lot of calls to check the new psk demods.

all new scripts implements the  "-h"  for help text.
2015-01-20 21:29:55 +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
iceman1001
f004ba08d4 ADD: test_t55x7_psk.lua, a script which writes to block 0 (configation) of a T55x7 tag and tries do verify the psk demods. 12 different test configuration blocks is used. 2015-01-10 19:48:29 +01:00
iceman1001
86dab5168e FIX: arguments took too much.
FIX:  lf search didn't load from graphbuffer..
2015-01-10 15:59:05 +01:00
iceman1001
0a43c39617 ADD: scripts/tracetest.lua is a simple script that tries to load from traces folder files starting with EM* and MOD* and runs the following on them one-by-one. "Data load" ; "LF Search" 2015-01-10 15:50:10 +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
9484ff3d6e ADD: tnp3xxx identification in luascripts.
CHG: minor code clean up.
2015-01-06 21:20:41 +01: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
961658bba9 FIX: rewrote the help text, cleaned up the code 2014-11-14 13:32:11 +01:00
iceman1001
bd5d0f07e9 REN: renamed tnp3.lua to tnp3dump.lua since that name is more explainatory
ADD: added tnp3sim.lua  a script which loads a dump and sends it to the pm3 device memory.
2014-11-14 13:24:45 +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
1a5ff2c2a7 FIX: fixed the layout of data in tnp3.lua 2014-11-03 22:29:43 +01:00
iceman1001
8aa79dee20 FIX: added some tnp3xxx identification i formatMifare.lua
FIX: tnp3.lua is more or less finished. Needs testing.
2014-11-03 21:59:31 +01:00
iceman1001
c70cef9734 fixing scripts/tnp3.lua 2014-11-03 15:25: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
6cacefa48d Fixed issue with binary files in windows, http://www.lua.org/pil/21.2.2.html 2013-11-07 11:33:48 +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
412afdb87b Fixed linebreak error 2013-10-20 19:05:52 +00:00
martin.holst@gmail.com
b3123cf603 Added functionality to dump data into .eml-file 2013-10-20 18:51:21 +00:00
martin.holst@gmail.com
db132ea0e8 Script to convert emulator file (ASCII dump of data) into HTML 2013-10-20 18:48:04 +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
ba33066cef Minor change 2013-10-18 11:35:06 +00:00
martin.holst@gmail.com
1686e4d1db Added script to dump ndef-compliant tags. Written in collaboration with @asper 2013-10-18 11:14:23 +00:00
martin.holst@gmail.com
51defdd4a2 Fixed issue where the 'nested'-part of autopwn only used 16 sectors, not bothering with the rest 2013-10-09 19:37:55 +00:00
martin.holst@gmail.com
b969713989 Fixed error with mifare_autopwn where keys were reversed, see http://www.proxmark.org/forum/viewtopic.php?pid=8494#p8494 2013-10-09 19:08:17 +00:00
martin.holst@gmail.com
0dae56d81e Committed mifare_autopwn.lua. For more infromation, see http://martin.swende.se/blog/Proxmark_Scripting_1.html and http://martin.swende.se/blog/Proxmark_Scripting_2.html 2013-10-08 18:50:54 +00:00
martin.holst@gmail.com
2fca3ad92d Some documentation improvement 2013-10-03 13:58:14 +00:00
martin.holst@gmail.com
c9e2f7807e Added a utility script to convert a 'dumpdata.bin'-file into the 'eml'-format that the emulator uses. Did not find any built-in way to do this, perhaps such functionality already exists.. ? 2013-10-03 13:56:11 +00:00
martin.holst@gmail.com
acfdf9528b Fixed error in htmldumper 2013-10-03 13:26:17 +00:00
martin.holst@gmail.com
d78792f515 Added a utility which takes a mifare-dumpfile and creates a html-report visualising the data. The html-dump is self-sufficient and standalone 2013-10-03 12:33:58 +00:00
martin.holst@gmail.com
05ed5c496a Made script-based default key check a bit more intelligent, so it works not only on 4k cards. Also added option to save data to a dump-file 2013-10-01 19:58:42 +00:00
martin.holst@gmail.com
450d2e3a96 Minor changes, usage examples and selftests 2013-09-21 20:46:32 +00:00
martin.holst@gmail.com
70c8077c99 Changed the name of writeraw into 14araw 2013-09-21 20:40:32 +00:00
martin.holst@gmail.com
b61f426c2d Fixed the write raw 14a, now finally functional... at least let's hope so 2013-09-21 20:37:22 +00:00
martin.holst@gmail.com
24d48e60fc Fix two errors in writeraw (14a)-script that were found by jonor 2013-09-20 07:32:37 +00:00
martin.holst@gmail.com
30a5d35529 Implemented parameter passing into script, added a minimal getop-parser, added an example script which takes parameters 2013-09-19 19:21:12 +00:00
martin.holst@gmail.com
3e69b21148 Minor changes to writeraw.lua, still not working as it should 2013-08-27 06:50:00 +00:00
martin.holst@gmail.com
4df3eb3f73 Attempt to use raw writing capabilities via scripting engine. Not functional yet 2013-07-04 12:56:00 +00:00
martin.holst@gmail.com
c6e2bfcda1 Removed some crap-scripts for testing 2013-06-26 20:49:04 +00:00
martin.holst@gmail.com
a2d82b467a Added library to read card info, made use of it from within mfkeys.lua script 2013-06-07 13:23:32 +00:00
martin.holst@gmail.com
16b04cb291 mf check keys in lua-space 2013-06-07 09:26:56 +00:00