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

19 commits

Author SHA1 Message Date
iceman1001
3ac59c7fed Merge branch 'master' of https://github.com/Proxmark/proxmark3 
Conflicts:
	armsrc/crapto1.c
	armsrc/iclass.c
	client/nonce2key/crapto1.c
 2015-03-06 09:02:15 +01:00
ikarus
9cefee6f42 Fixed issue #36 & improved file consistency. 2015-03-04 11:00:39 +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
9484ff3d6e ADD: tnp3xxx identification in luascripts. 
CHG: minor code clean up.
 2015-01-06 21:20:41 +01:00
iceman1001
a61b4976bd FIXED: Merged all Holimans code-review issues which should fix a lot of memoryleaks. 2014-10-30 00:09:01 +01:00
Martin Holst Swende
90e278d3da Fixed several issues found using a coverity-scan 2014-10-27 21:46:04 +01:00
roel@libnfc.org
b1231445c7 removed unused compiler directives, cleaned up some code 2013-10-09 09:59:14 +00:00
martin.holst@gmail.com
7d2313912c Fixed what may have been one cause of seg-faults in nonce2key... not sure, it still happens at times 2013-10-07 10:10:34 +00:00
roel@libnfc.org
78e7cf984c fixed some more compiler warnings 2013-10-03 14:52:21 +00:00
roel@libnfc.org
f66021cf48 fixed compiler warnings 2013-10-03 14:36:42 +00:00
douniwan5788@gmail.com
b19bd5d689 Add support in 'hf mf mifare' for some unlicensed/compatible mifare card which always answer NACK. 
Change the 'nttmp' start from nt distance 500 to 100 in mifarecmd.c to compatible some unlicensed/compatible mifare card.
 2013-09-29 11:44:07 +00:00
micki.held@gmx.de
9492e0b098 Major rework of hf mf nested: 
- PM: used GetCountMifare in MifareNested() for improved timing accuracy and to deliver better quality nonces
- PM: MifareNested now delivers exactly two different nonces to avoid time consuming multiple lfsr_recovery32() on client side
- Client: replaced quicksort by bucketsort in crapto1.c which is faster 
- Client: use multithreading (two parallel calls to lfsr_recovery32())
- Client: fixed a small bug in mfnested() (always showed trgkey=0)
- Client: introduced a mutex for PrintAndLog() to avoid interlaced printing
Minor rework of hf mf chk:
- Avoid time consuming off/on cycles. Send a "halt" instead.
 2013-09-15 09:33:17 +00:00
micki.held@gmx.de
1c611bbd26 2013-07-08 17:56:05 +00:00
roel@libnfc.org
125a98a110 fixed stupid 64-bit formatting for x86/amd64 and unix/windows 2013-02-28 22:22:24 +00:00
roel@libnfc.org
cb64309e4b compiling on windows again 2013-02-28 21:36:09 +00:00
Merlokbr@gmail.com
bfaecce6eb there was bug in hf mf mifare. and speed up this command. 2012-11-08 09:48:02 +00:00
roel@libnfc.org
db09cb3adb MAJOR update, added hitag2 reader, emulation and eavesdropping, lots of new code, including FPGA tweaks 2012-09-18 13:52:50 +00:00
Merlokbr@gmail.com
f397b5cc87 1. fixed hf 14a mifare. added functionality to ignore one Nt 
2. completed hf 14a nested
3. added hf 14a chk to check keys
5. added check keys to hf 14a mifare and hf 14a nested
6. added debug level to mifare commands
7. small bugs and improvements
 2011-06-07 12:35:52 +00:00
Merlokbr@gmail.com
f89c705002 improved version of "hf 14a mifare" command 
with merge with utility nonce2key
 2011-05-31 11:31:20 +00:00