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

74 commits

Author SHA1 Message Date
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
marshmellow42
d730878d8c scripting updates from @iceman1001 
it compiles but i'm not sure how to fully test it...
:)
 2015-05-13 21:14:35 -04:00
marshmellow42
e6432f0579 @iceman1001 s coverity scan fixes 2015-05-13 11:14:17 -04:00
iceman1001
664bb5ae72 BUGS: more Coverity scan fixes. 2015-05-13 14:08:59 +02:00
marshmellow42
bdfb62b405 Iceman's script aes fix #93 
Thanks Iceman (note I did not have a tag to double test this one. :)
 2015-04-28 15:53:07 -04:00
iceman1001
d87779d6d1 FIX: fixed a minor bug introduced when changing from OpenSSL -> PolarSSL. 
ADD:  changed code to handle both  encrypt and decrypt AES 128.
 2015-04-09 20:34:34 +02:00
iceman1001
3ee8c808c4 ADD: added a CRC64_ECMA implementation 2015-03-11 22:06:23 +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
Martin Holst Swende
1f6417a9b2 Removed dependency on openssl, added AES implementation from polarssl instead 2015-01-12 21:47:36 +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
06b58a94f0 BUG: don't try to fix things that ain't broken.. or not. My try for a fix ended up making the PrintAndLog function stop working. Just by calling a fclose.. fixed. 2014-11-27 22:16:17 +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
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@gmail.com
77cd612f15 Added a lua bit manipulation library, added Lua-api to iso 15693 crc-calculation 2013-11-06 18:34:10 +00:00
roel@libnfc.org
05f23c593c with the declaration of 'uint8_t destination[8]', 'destination' is already a pointer, don't try to get the address of it by using '&destination', then you will get a pointer to a pointer. 2013-10-11 08:37:08 +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
2dcdf1a683 Added nonce2key-API to lua 2013-10-07 10:11:15 +00:00
martin.holst@gmail.com
0a85b72549 Reworked how to call 'standard' stuff from within lua scripts, so now it's much simpler both in lines of code and usage. A script can now call core.console('hf mf nested 1 0 a ffffffffffff') in order to execute anything via the old command line parser 2013-10-04 19:29:46 +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
martin.holst@gmail.com
42daa759c1 Only superficial changes, to get rid of compiler warnings 2013-09-19 19:53:09 +00:00
martin.holst@gmail.com
44fffc5451 Work on the scripting library 2013-06-07 09:24:25 +00:00
martin.holst@gmail.com
f057bddb70 Added binlib, to handle binary data from lua, based on lpack http://www.tecgraf.puc-rio.br/~lhf/ftp/lua/#lpack 2013-05-26 20:05:13 +00:00
martin.holst@gmail.com
96e7a3a50b Minor fixes, added some functionality to send data, but still some way to go 2013-05-24 21:39:08 +00:00
martin.holst@gmail.com
5b760b6cac 'core' library glue 2013-05-24 21:06:57 +00:00