dash/proxmark3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,573 Commits 7 Branches 1 Tag
a71c68bdf0d117609a1ffd0141d1d682e1ff8e15
Commit Graph

80 Commits

Author SHA1 Message Date
Gil Cohen
8fac5452b8 updated makefile, readme 2015-08-03 23:07:57 -05:00
iceman1001
db25599d7f ADD: @holiman's clearCommandBuffer in cmdlft55xx.c 
ADD: @VERTCraig's AVID commands.

TEST: testing some changes to iso14443 demod.
 2015-07-18 20:43:14 +02:00
iceman1001
9783989b40 ADD: pwpiwi 's FPGA compress 2015-06-25 12:22:34 +02:00
iceman1001
a71ece51e4 ADD: iso11784/85 FDX-B 
ADD: the source from RevEng 1.30, got into the PM3 client.
 2015-06-07 11:35:49 +02:00
iceman1001
ea75b30c81 ADD: SHA1 hashes calculations in sha1.c and LUA 2015-05-26 16:12:33 +02:00
iceman1001
9962091e29 ADD: experimantal test of adding "reveng 1.30" source code into the PM3 Client. 2015-05-16 15:36:40 +02:00
iceman1001
0ec548dc21 Merge branch 'master' of https://github.com/Proxmark/proxmark3 
Conflicts:
	armsrc/lfops.c
	client/cmddata.c
	client/cmdlf.c
	client/cmdlft55xx.c
	client/cmdlft55xx.h
	client/scripts/test_t55x7_bi.lua
 2015-03-24 11:45:31 +01:00
marshmellow42
9f7bbd24c9 data autocorr additions 2015-03-13 12:23:26 -04:00
iceman1001
108262a145 Merge branch 'master' of https://github.com/Proxmark/proxmark3 2015-03-13 09:22:12 +01:00
iceman1001
3d83b58b50 ADD: added a reference to a generic CRC-8 checksum algo in common/crc.c 2015-03-12 10:10:22 +01:00
iceman1001
3ee8c808c4 ADD: added a CRC64_ECMA implementation 2015-03-11 22:06:23 +01:00
pwpiwi
8c04722db6 (issue #47) use Qt5 includes and libraries, if present 2015-03-10 19:00:39 +01:00
iceman1001
f4a57e861d Merge branch 'master' of https://github.com/Proxmark/proxmark3 
Conflicts:
	armsrc/iclass.c
	client/loclass/cipher.c
	client/loclass/fileutils.h
 2015-02-19 11:32:11 +01:00
Martin Holst Swende
1defcf606f More work on iclass full simulation, and some work on iclass tag dump parsing 2015-02-19 10:48:33 +01:00
iceman1001
31b3689f0b Merge branch 'master' of https://github.com/Proxmark/proxmark3 
Conflicts:
	armsrc/epa.c
 2015-02-12 09:54:21 +01:00
iceman1001
2b61c24212 Merge branch 'master' of https://github.com/Proxmark/proxmark3 
Conflicts:
	armsrc/appmain.c
	armsrc/apps.h
	armsrc/lfops.c
 2015-02-10 08:58:14 +01:00
Jesse Hallio
e9281ae812 Add flasher from SVN r623 for HID bootprom and current Mac OS X kext 2015-02-03 23:22:39 +02:00
iceman1001
e58c712c9e ADD: a switch to detect if Qt4 or Qt5 is used. 2015-01-30 15:23:01 +01:00
Martin Holst Swende
dca558bf9e Removed last trace of crypto from makefile 2015-01-26 20:56:33 +01:00
Martin Holst Swende
afceaf4018 Removed openssl from the mfu-stuff 2015-01-22 21:02:21 +01:00
iceman1001
5ee701292f Step 2 - Ultralight / Ultralight-C 
With this the Pentura Labs / Midnitsnakes's original ultralight / ultralight-c implementation is enhanced and move to its own file. cmdhfmfu.c
 2015-01-20 21:23:04 +01:00
iceman1001
c8b6da2295 Merge branch 'master' of https://github.com/holiman/proxmark3 
Conflicts:
	armsrc/appmain.c
	armsrc/apps.h

Step 1 for the Ultralight / Ultralight-c
 2015-01-20 20:59:24 +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
002c1ce57a CHG: removed leftover debugging statements proxmark3.c 
CHG: hint from Marshmellow that the flag "-lcrypto" needs be also in CFLAGS.
 2015-01-07 11:10:46 +01:00
iceman1001
9484ff3d6e ADD: tnp3xxx identification in luascripts. 
CHG: minor code clean up.
 2015-01-06 21:20:41 +01:00
marshmellow42
eb191de615 LF Demod streamlining 
one shared location for demoding lf for arm and client.  also added a
few raw demod commands.
 2014-12-28 20:33:32 -05:00
Martin Holst Swende
3ad48540d4 Merge branch 'iclass-research' of https://github.com/PenturaLabs/proxmark3 into PenturaLabs-iclass-research 
Conflicts:
	README.txt
	armsrc/apps.h
	client/Makefile
	client/cmdhficlass.c
	client/cmdhficlass.h
 2014-06-28 20:52:37 +02:00
iZsh
7cc204bff8 THIS REQUIRES A BOOTROM UPDATE!! To save FPGA area, split the LF and HF bitstreams and load them on-demand. 2014-06-20 01:02:59 +02:00
Andrew Davies
a66fca86b9 Updated proxmark research with Holiman's loclass framework 2014-05-02 11:11:54 +01:00
penturalabs
a1f3bb120f Added Kantech ioProx Support 2014-03-18 20:52:48 +00: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
b1231445c7 removed unused compiler directives, cleaned up some code 2013-10-09 09:59:14 +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
martin.holst@gmail.com
427cdbe2cd Fixed error from r769 where I added -ldl switch for linux, but still forgot to remove it for others... 2013-09-20 10:11:17 +00:00
martin.holst@gmail.com
eaea9de900 Removed the -ldl switch from r763, so it only is added for Linux (it apparently caused errors on windows/mingw) 2013-09-19 19:33:56 +00:00
martin.holst@gmail.com
500c972914 Fixed some kind of of linking error 2013-09-01 20:22:22 +00:00
martin.holst@gmail.com
cda2a4c0a5 Merged latest trunk changes into scripting-branch 2013-09-01 20:00:56 +00:00
martin.holst@gmail.com
a763eb2126 Added a comment 2013-09-01 18:40:08 +00:00
martin.holst@gmail.com
3a4c72fe59 Added lua-mac building, added cleaning of lua files 2013-06-26 11:02:37 +00:00
martin.holst@gmail.com
30a46ed86a Attempt to make the makefile generic, so lua compilation works well also under windows 2013-06-25 20:25:18 +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
a0655c45bd Added 'core'-api, also added some error handling in scripts 2013-05-24 21:05:45 +00:00
martin.holst@gmail.com
806dc07542 First implementation of user scripts - very experimental - YMMV 2013-05-21 18:37:43 +00:00
roel@libnfc.org
759c16b31f client should compile without warnings on linux, mac, windows 2013-03-14 15:03:04 +00:00
roel@libnfc.org
829fb342b5 uploaded new mingw-proxmark.zip, QT working again, so re-enabled QUI under windows 2013-03-01 14:28:14 +00:00
roel@libnfc.org
54a942b05d merged all patches into CDC repository 2013-02-28 17:04:23 +00:00
roel@libnfc.org
28fdb04fd8 Finally, rewrote bootrom and flasher program, much faster now 2013-02-28 15:11:52 +00:00
roel@libnfc.org
985ef1c315 temporarely disabled QT for winows, no clue why it gives a failure 2012-12-07 11:01:55 +00:00
roel@libnfc.org
902cb3c00b major USB update 2012-12-04 23:39:18 +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