RfidResearchGroup/proxmark3
1
1
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-02-14 03:03:14 +08:00
Code Issues Projects Releases Packages Wiki Activity
2025 commits 3 branches 15 tags 87 MiB
Commit graph

59 commits

Author SHA1 Message Date
iceman1001
4b3655e7f4 FIX: spelling misstakes. 
FIX: output of block number should be two digits for nicer layout
FIX: strange branching in the pyramid demod in cmddata.c,  it will now always print the unknown length message
FIX: another go at the coverity scan bug in proxmark3.c. (resource leak for cmd)
 2016-02-27 09:21:19 +01:00
iceman1001
95215e873f FIX: this free call still annoys Coverity Scan. 2016-02-19 22:31:35 +01:00
iceman1001
75cf8623d6 FIX: Undo one of my fixes.. *sigh* need to be more specific when / where to call free. 2016-02-18 20:48:24 +01:00
iceman1001
aacb96d7ed FIX: Coverity scan fixes, hard to keep track of stringlengths while reading and copying in C. 2016-02-17 10:46:08 +01:00
iceman1001
46a33c182d CHG: moved a call to "free" to outside of if-statement. 2016-02-09 14:48:42 +01:00
iceman1001
109def22c8 FIX: Moved a free() call. 2016-01-25 20:22:00 +01:00
iceman1001
87b28d31a1 CHG: Syntax suger 2016-01-20 17:45:42 +01:00
iceman1001
cc3c0a5148 ADD: @piwi's fixes to .history 2015-11-09 21:46:57 +01:00
iceman1001
9783989b40 ADD: pwpiwi 's FPGA compress 2015-06-25 12:22:34 +02: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
1d660bb993 Added Pm3-master changes from Holiman. 
REM: removed some old test code to cmdhf15 read.
 2015-01-07 23:52:33 +01:00
iceman1001
14edfd09c3 CHG: The input handling for "hf 14b write" is now correct. Thanks Asper for spotting the fault. 
Minor code clean up.
Added from Pm3-master which will make this fork one step closer to Pm3-master.
 2015-01-07 22:51:34 +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
iceman1001
10403a6a30 ADD: added a lot of ic ids to cmdhf15.c Thanks to Asper for the list. 
ADD: added a manufacturer list for hf 14a reader,  only viable when UID is double or triple size.  Thanks to Asper for the list.
ADD: Some changes from Holimans commits.
CHG: some more code clean up.
 2015-01-06 11:17:02 +01:00
iceman1001
3fe4ff4f03 CHG: generic code clean up. Removal of commented code. 
CHG: USB_CMD_DATA_SIZE is now used as maxsize for transfer of data between client and pm3device
CHG: suggested a fix for the underscore problem in ioclass\fileutils.c
ADD:  tnp3xx support
ADD:  nxp tag idents.
ADD:  identifiction of chinese backdoor commands to hf 14a reader.
 2015-01-05 15:51:27 +01:00
iceman1001
d3a22c7dfa ADD: Holimans new changes in master. 2015-01-05 02:01:24 +01:00
iceman1001
463ca973e7 FIX: hf mf eload - now supports specifying 0,1,2,4 in card memory for the file to be loaded. 
FIX: hf mf esave - now supports specifying  0,1,2,4 in card memory for the file to be saved.
ADD: data.h -  added FILE_PATH_SIZE constant
ADD: hf legic load - a command help and checks for FILE_PATH_SIZE
ADD: hf legis save - now checks for FILE_PATH_SIZE
ADD: lf hitag - now checks for FILE_PATH_SIZE
ADD: util.c - AddLogLine now checks for FILE_PATH_SIZE
ADD: data load / save  - now checks for FILE_PATH_SIZE
FIX: ui.c - added a case of closing a filehandle
FIX: hf mf cload / csave now checks for FILE_PATH_SIZE
FIX: armsrc/mifarecmd.c - adjusted the buffersize in MifareEMemget from 48 to USB_CMD_DATA_SIZE
 2014-11-16 11:22:06 +01:00
iceman1001
72e930ef32 FIXED: lf t55xx fsk now demods but only to binary. 
ADD:  holimans lf io / hid fskdemod  changes.
 2014-10-23 18:36:44 +02:00
iceman1001
f38a152863 First check in. 2014-09-11 23:23:46 +02:00
Martin Holst Swende
07976a256d Refactoring low frequency operations, now 'lf hid fskdemod' is more stable. Also did changes to handling ioprox tags, this is yet untested, so until it's been tested it should be kept off 'stable' branch 2014-03-31 17:57:14 +02:00
Philippe Teuwen
dec8e8bd9f Provide option -m for markdown help dump, -h for text dump 2014-03-26 23:50:34 +01:00
Philippe Teuwen
6f5dd6010e Fix description in help dump 2014-03-26 22:44:25 +01:00
Martin Holst Swende
57c695563f Fixes to implement generation of markdown auto-generated documentation 2014-03-26 22:39:37 +01:00
Philippe Teuwen
ae7aa73dd5 Add option -h to dump complete set of supported commands 
Usage: ./proxmark3 -h
Display both offline & online commands, online commands are flagged.

git-svn-id: https://proxmark3.googlecode.com/svn/trunk@850 ef4ab9da-24cd-11de-8aaa-f3a34680c41f
 2014-03-26 22:33:11 +01:00
martin.holst@gmail.com
da9d456e9f Minor fix, sometimes when data is sent without the pm3 is connected, it causes a spin-loop condition to occur which blocks the processor. fixed 2013-11-06 18:32:11 +00:00
roel@libnfc.org
981bd4292e integrated MIFARE ultralight features, contributed by 'midnitesnake' 2013-10-11 08:43:23 +00:00
martin.holst@gmail.com
ed77aabe00 Patch from 'buzzy' to add automatic flushing of output, see http://www.proxmark.org/forum/viewtopic.php?id=1740 for more details. 2013-10-08 18:30:01 +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
martin.holst@gmail.com
c338502409 Applied patch from http://www.proxmark.org/forum/viewtopic.php?id=1637, where a compiler optimization resulted in hangs 2013-06-05 08:53:20 +00:00
martin.holst@gmail.com
5f91a683b7 Added some documentation regarding ports on linux 2013-05-11 12:33:04 +00:00
roel@libnfc.org
4890730a5f fixed crash, when proxmark was claimed by other process 2013-03-26 16:01:52 +00:00
roel@libnfc.org
2d7fc168a2 fixed missing header file 2013-03-21 11:38:48 +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
9d8f56e35d fixed stupid 64-bit formatting for x86/amd64 and unix/windows - part4 2013-02-28 22:49:34 +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
50d6e4abc1 douniwan5788: 2013-02-28 16:04:21 +00:00
roel@libnfc.org
ab4da50d99 added automatically saving the hitag2 memory content to file 2012-12-09 21:25:29 +00:00
roel@libnfc.org
fe7bfa7856 Windows7 working now! ugly fix for inaccurate Windows timer, quickfix for receiving multiple frames 2012-12-07 12:51:19 +00:00
roel@libnfc.org
f0ba634221 receiving/sending moved to one thread 2012-12-07 12:22:05 +00:00
roel@libnfc.org
1282b0e691 minor output change 2012-12-07 09:51:22 +00:00
roel@libnfc.org
af65f5f71d fixed read uart for windows 2012-12-07 07:21:00 +00:00
roel@libnfc.org
902cb3c00b major USB update 2012-12-04 23:39:18 +00:00
zveriu@gmail.com
1f947c4b09 - Added very basic scripting support to PM3 client-side (proxmark3 application) 
- Created several scripts to aid in EML/MFD file conversion
 - Created script which generates PM3-scripts for emulation based on MFD/EML input files
 2011-09-01 09:03:20 +00:00
Merlokbr@gmail.com
51969283ec 1. fixed (it seems) readline behavior. Now there is no proxmark3 prompts on the data. 
2. emulator goes into beta stage.
works:
- work with 4BUID and 7BUID dumps
- load/save/grab dumps
- emulate select
- emulate authentication (with nested)
- emulate read/write blocks
- emulate NACK-ACK ping-pong
 2011-06-23 16:49:39 +00:00
Merlokbr@gmail.com
ab8b654efa added functionality: dump card memory, save|load card memory. 
50% fixed problem with readline lib
 2011-06-22 01:25:16 +00:00
Merlokbr@gmail.com
8556b852ed 1. updated usb commands 
2. added abilities to: clear, get, set, load from card, load from nested card emulator dump
3. tried to fix proxmark promt have seen everywhere (not so good)
4. reorganized arm code
 2011-06-17 18:39:54 +00:00
adam@algroup.co.uk
23e5d20eed strip trailing space in a more strictly correct place 2010-03-08 14:20:05 +00:00
adam@algroup.co.uk
9cb00f305c move trailing space stripping to client/proxmark3.c (per discussion on r426) 2010-03-08 09:16:28 +00:00
izsh@fail0verflow.com
212ef3a04d Apply copyright patch from Michael Gernoth 2010-02-25 21:57:35 +00:00