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

5297 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
iceman1001 c4e3b1b6a2 Change in progress, the adjustments to use Marshmellow's new demod for T55XX commands. 2015-01-30 15:45:56 +01:00
iceman1001 e58c712c9e ADD: a switch to detect if Qt4 or Qt5 is used. 2015-01-30 15:23:01 +01:00
iceman1001 908536d161 Merge branch 'master' of https://github.com/Proxmark/proxmark3 
Conflicts:
	client/cmddata.c
 2015-01-30 15:22:01 +01:00
Martin Holst Swende 15491b2d73 Merge pull request #53 from iceman1001/feature 
bounds check for loop - printDemodBuff
 2015-01-30 15:18:18 +01:00
Iceman 0c5998c051 Update cmddata.c 
as suggested,  a bitwise bounds check in cmddata.
 2015-01-30 15:17:07 +01:00
iceman1001 21e06301b9 Call to GetClock had wrong number of inparameters 
Added missing functions to header file
 2015-01-30 09:26:03 +01:00
iceman1001 f4a694f998 ohps, forgot to multiply it up again. 2015-01-30 09:23:49 +01:00
iceman1001 33c7e2f3bc wrong letter in variable name 
Conflicts:
	client/cmddata.c
 2015-01-29 22:35:19 +01:00
iceman1001 7ea7465bbb wrong letter in variable name 2015-01-29 22:22:29 +01:00
iceman1001 b6bf652821 Minor bounds checks for setDemodBuf and printDemodBuff 2015-01-29 21:44:24 +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 92623113b4 Minor documentation on 'hf list' 2015-01-29 20:01:30 +01:00
Martin Holst Swende b3cc5f2987 Reverted erroneous commit from bigbuf-rework 2015-01-29 19:58:46 +01:00
Martin Holst Swende 63e420b572 Merge pull request #51 from marshmellow42/master 
fix hid prox standalone bug
 2015-01-29 01:11:10 +01:00
Martin Holst Swende f6d9fb173f Added client-side support for recording longer samples, fixed last (?) issues on device-side 2015-01-29 00:57:22 +01:00
marshmellow42 0892b968ce fix hid prox standalone bug 
Fixed standalone bug by re-making the function return the hi and lo
values. (used only by samyrun function in appmain.c)
 2015-01-28 12:55:04 -05:00
Martin Holst Swende 4c18913dd8 Merge pull request #50 from marshmellow42/master 
lf hid fskdemod bug
 2015-01-28 18:45:02 +01:00
marshmellow42 08ebca682c lf hid fskdemod bug 
re-introduced in last bigbuf changes
 2015-01-28 11:45:31 -05:00
pwpiwi f71f4deb8f BigBuf and tracing rework: allow much longer traces in in hf commands 
- provided a BigBuf_malloc() function to dynamically allocate parts of BigBuf
  e.g. for DMA-Buffers, Frame-Buffers, Emulator-Memory
- the whole rest of BigBuf is now available for traces (instead of a small fixed amount)
- send actual traceLen together with trace data
- changed client side to cope with varying traceLen
- changed small buffers to automatic variables instead of parts of BigBuf
 2015-01-28 07:18:51 +01:00
pwpiwi 117d9ec25c Refactoring of BigBuf handling in order to prepare for more efficient memory allocation and longer traces. 2015-01-27 22:25:55 +01:00
Martin Holst Swende 936e0729f9 Merge pull request #49 from marshmellow42/master 
LF Demod Bug Fix & new traces
 2015-01-27 22:14:39 +01:00
marshmellow42 88a3e9433d Revert "Revert "Traces"" 
This reverts commit 58f478696d.
 2015-01-27 16:08:15 -05:00
marshmellow42 003ac42c71 Revert "Revert "More Testing Traces"" 
This reverts commit eb0b5130f2.
 2015-01-27 16:08:08 -05:00
marshmellow42 eb0b5130f2 Revert "More Testing Traces" 
This reverts commit f4e739ed58.
 2015-01-27 16:05:10 -05:00
marshmellow42 58f478696d Revert "Traces" 
This reverts commit 7f9064c641.
 2015-01-27 16:05:05 -05:00
marshmellow42 7f9064c641 Traces 2015-01-27 15:56:03 -05:00
Martin Holst Swende 383608a63a Minor fixes to iso14443a annotations 2015-01-27 21:55:08 +01:00
marshmellow42 f4e739ed58 More Testing Traces 2015-01-27 15:09:45 -05:00
marshmellow42 a1d17964a2 lf demod bug fix & refactor 
fixed bug in lfops.c in hid fskdemod
refactored data fskXXXDemods for specific tags to use more common code.
 2015-01-27 14:51:12 -05:00
Martin Holst Swende 08e8317c21 More annotations to iso14443b protocol listings 2015-01-27 16:34:45 +01:00
Martin Holst Swende 16b75f27c3 Minor tweaks to iso14443b snoop tracing 2015-01-27 16:34:11 +01:00
Martin Holst Swende f50d457fa8 Merge pull request #48 from marshmellow42/master 
lf demod additions & bugfixes from marshmellow
 2015-01-27 10:21:22 +01:00
Martin Holst Swende 03dc174036 Minor refactoring 2015-01-27 09:06:01 +01:00
marshmellow42 8c65b650e8 clean up some comments 2015-01-26 17:49:30 -05:00
marshmellow42 04d2721b3c lf psk demods 
clarify existing as psk1
added psk2 demod
 2015-01-26 17:23:19 -05:00
marshmellow42 9c0f13d5dd Merge remote-tracking branch 'upstream/master' 2015-01-26 17:07:49 -05:00
Martin Holst Swende aeadbdb216 Generic tracing: Some fixes in iso14443b snooping, to how DMA access is performed, sizes and buffers. 2015-01-26 22:10:05 +01:00
Martin Holst Swende 7c676e7269 Some documentation 2015-01-26 21:15:28 +01:00
Martin Holst Swende 2595390c6d Merge pull request #46 from holiman/master 
Iceman's changes, part 2
 2015-01-26 20:59:36 +01:00
Martin Holst Swende dca558bf9e Removed last trace of crypto from makefile 2015-01-26 20:56:33 +01:00
Martin Holst Swende 7242efa07c bugfix 2015-01-22 23:04:59 +01:00
Martin Holst Swende cb366e9dbd Added a lf acquisition-mode which can do decimation and quantization, in order to be able to record longer transactions 2015-01-22 23:01:29 +01:00
Martin Holst Swende e629181f5a Fixed issue where -1 size_t was returned 2015-01-22 21:04:16 +01:00
Martin Holst Swende afceaf4018 Removed openssl from the mfu-stuff 2015-01-22 21:02:21 +01:00
marshmellow42 03e6bb4aed lf FSK demod tools/fixes 
added full ability to detect FSK clocks
applied autodetect of fsk clock to data fskrawdemod
this finished data fskfcdetect (now detects field clocks and bit clock)
 2015-01-22 14:24:03 -05:00
Martin Holst Swende 3fd26a683d 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
Martin Holst Swende 388c92bde5 Generic tracing pt.4: Deprecated old 'hf 14b list' command 2015-01-22 00:19:20 +01:00
Martin Holst Swende c54d1394c6 Fixed compiler error 2015-01-22 00:10:09 +01:00
Martin Holst Swende 9e8255d4e9 Generic tracing pt.3 : reworking how iso14443b-traces are stored in ARM-memory 2015-01-21 23:53:40 +01:00
iceman1001 df3e429d71 minor fix for a help in "hf 14a snoop" 2015-01-21 21:24:37 +01:00