RfidResearchGroup/proxmark3
1
1
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2024-09-20 15:26:13 +08:00
Code Issues Packages Projects Releases Wiki Activity
Iceman Fork - Proxmark3
1546 commits 3 branches 14 tags 85 MiB
C 91.6%
Lua 4.1%
Python 0.9%
Verilog 0.8%
C++ 0.6%
Other 1.9%
Go to file
iceman1001 f53020e729 Merge branch 'master' of https://github.com/Proxmark/proxmark3 
Conflicts:
	armsrc/Makefile
	armsrc/iso14443b.c
	armsrc/lfops.c
	client/cmdhf14b.c
	client/cmdhfmfu.c
	fpga/fpga_hf.bit
	fpga/hi_read_rx_xcorr.v
2015-06-23 23:02:29 +02:00
armsrc Merge branch 'master' of https://github.com/Proxmark/proxmark3 2015-06-23 23:02:29 +02:00
bootrom Merge branch 'master' of https://github.com/Proxmark/proxmark3 2015-01-07 22:55:26 +01:00
client Merge branch 'master' of https://github.com/Proxmark/proxmark3 2015-06-23 23:02:29 +02:00
common ADD: @pwpiwi 's fix 50365fedcb 2015-06-18 13:51:00 +02:00
doc Added documentation. 2012-02-06 20:07:35 +00:00
driver On another note; a nice udev-rule to have pm3 appear as /dev/pm3-1 (or /dev/pm3-2 if you have multiple) 2015-01-22 00:33:49 +01:00
fpga fixing iso14443b (issue #103): 2015-06-22 22:03:43 +02:00
include ADD: PACE functionality ref: https://github.com/Proxmark/proxmark3/pull/121 2015-06-23 22:30:18 +02:00
liblua Removed lua binary which shouldn't be in version control 2013-09-01 19:08:40 +00:00
recovery changed version.c, compile time is now always present, even when svn is not working 2013-03-27 10:27:14 +00:00
tools minor code clean up 2015-05-13 09:18:37 +02:00
traces Revert "Revert "Traces"" 2015-01-27 16:08:15 -05:00
.gitattributes git housekeeping: 2014-06-27 19:23:42 +02:00
.gitignore add *.eml to .gitignore 2014-08-05 18:45:37 +02:00
CHANGELOG.md CHG: modified the CHANGELOG.md 2015-06-23 22:51:15 +02:00
COMPILING.txt Compiling manual for MAC OS X 2015-05-27 11:30:50 +03:00
HACKING.txt Ooops, we forgot a few details 2010-02-21 19:58:32 +00:00
iceman.txt chg: LF t55xx trace 2014-10-06 19:42:50 +02:00
LICENSE.txt setting svn:eol-style=native on files, part 1 2010-02-22 19:18:49 +00:00
Makefile Reclaim more than 19K of ARM flash memory. 2015-03-31 08:07:26 +02:00
README.txt Merge branch 'master' of https://github.com/Proxmark/proxmark3 2015-05-23 08:16:40 +02:00

README.txt

This file contains ambiguous Unicode characters

This file contains Unicode characters that might be confused with other characters. If you think that this is intentional, you can safely ignore this warning. Use the Escape button to reveal them.

The iceman fork.

NOTICE:

The official Proxmark repository is found here: https://github.com/Proxmark/proxmark3


NEWS:      

Whats in this fork?  I have scraped the web for different enhancements to the PM3 source code and not all of them ever found their way to the master branch. 
Among the stuff is

	* Jonor's hf 14a raw timing patch
	* Piwi's updates. (usually gets into the master)
	* Holiman's iclass, (usually gets into the master)
	* Marshmellow's LF fixes
	* Midnitesnake's Ultralight,  Ultralight-c enhancements
	* Izsh's lf peak modification / iir-filtering
	* Aspers's tips and tricks from inside the PM3-gui-tool, settings.xml and other stuff.
	* My own desfire, Ultralight extras, LF T55xx enhancements, bugs fixes (filelength, hf mf commands ), TNP3xxx lua scripts,  Awid26,  skidata scripts (will come)
	* other obscure patches like for the sammy-mode,  (offline you know), tagidentifications, defaultkeys. 
	
Give me a hint, and I'll see if I can't merge in the stuff you have. 

I don't actually know how to make small pull-request to github :( and that is the number one reason for me not pushing a lot of things back to the PM3 master.
	
PM3 GUI:

I do tend to rename and move stuff around, the official PM3-GUI from Gaucho will not work so well. *sorry*	

	  
DEVELOPMENT:

This fork is adjusted to compile on windows/mingw environment with Qt5.3.1 & GCC 4.8
For people with linux you will need to patch some source code and some small change to one makefile.  If you are lazy, you google the forum and find asper's or holimans makefile or you find your solution below.

Common errors linux/macOS finds
Error:
	* loclass/fileutils.c:15:2: warning: implicit declaration of function ‘_stat’ [-Wimplicit-function-declaration]
Solution:
	* Remove the "unscore" sign.   In linux you use without underscore, in windows you need a underscore. 
	
Error:  
	* \client\makefile  the parameter -lgdi32 
Solution:
	* Remove parameter.
	
Error:  
	* Using older Qt4.6 gives compilation errors.  
Solution
	* Upgrade to Qt5.3.1 
	OR 
	* Change these two line in  \client\makefile
		CXXFLAGS = -I$(QTDIR)/include -I$(QTDIR)/include/QtCore -I$(QTDIR)/include/QtGui -I$(QTDIR)/include/QtWidgets  -I/mingw/include
		QTLDLIBS = -L$(QTDIR)/lib  -lQt5Core -lQt5Gui -lQt5Widgets 
		
		TO
		
		CXXFLAGS = -I$(QTDIR)/include -I$(QTDIR)/include/QtCore -I$(QTDIR)/include/QtGui
		QTLDLIBS = -L$(QTDIR)/lib -lQtCore4 -lQtGui4
	

An old Qt4 version makefile is found here: http://www.icesql.se/proxmark3/code/linuxmakefile.txt  but this one doesn't have all new files in it. So I don't recommend it.

The Proxmark 3 is available for purchase (assembled and tested) from the
following locations:


January 2015, Sweden
iceman at host iuse.se