Proxmark/proxmark3
1
1
Fork 0
mirror of https://github.com/Proxmark/proxmark3.git synced 2024-09-21 07:16:24 +08:00
Code Issues Packages Projects Releases Wiki Activity
952 commits 3 branches 11 tags 34 MiB
Commit graph

952 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
pwpiwi 6d3e6c740b Merge pull request #60 from pwpiwi/master 
Bugfix hw tune, hf tune: voltage measures were VERY wrong
 2015-02-08 22:09:42 +01:00
pwpiwi 3b692427ac Bugfix hw tune, hf tune: voltage measures were VERY wrong 
Modified hw detectreader: display reader field strength in mV units and to be less phony
 2015-02-07 10:14:49 +01:00
Martin Holst Swende 146c201cbe Merge pull request #55 from jessegit/master 
Add flasher from SVN r623 for HID bootprom and current Mac OS X kext
 2015-02-05 19:43:46 +01:00
Martin Holst Swende b37235637f Merge pull request #57 from iceman1001/feature 
FIX:  LF TI WRITE inparameters didn't get copied by sscanf.
 2015-02-05 19:43:26 +01:00
Martin Holst Swende bb42a03ef1 Fix #1 for pm3 iclass simulation, remove erroneous extra bit after transmission 2015-02-05 19:40:47 +01:00
iceman1001 5c2b11eb3c FIX: LF TI WRITE inparameters didn't get copied by sscanf. This removes the "PRIu64" and uses the 012"llx" instead. 2015-02-05 15:46:23 +01:00
Martin Holst Swende 73a1c1bb97 Merge pull request #56 from iceman1001/feature 
add: lots of new toytypes  in default_toys.lua
 2015-02-05 15:28:18 +01:00
iceman1001 a6cfa75035 add: lots of new toytypes in default_toys.lua 
fix: mixture between dec & hex numbers caused wrongly identifications of toytypes (default_toys.lua)
add: showing bytes for trap-types in tnp3dump.lua
 2015-02-04 11:49:21 +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
Martin Holst Swende 1f78a4d305 Merge pull request #54 from Proxmark/lf_recorder 
LF: Ability to do longer traces/snoops
 2015-02-02 19:54:07 +01:00
Martin Holst Swende 0644d5e3a3 Merged with master 2015-01-31 18:21:38 +01:00
Martin Holst Swende c856ceae8a Fixed undecimation command 2015-01-31 12:42:40 +01:00
Martin Holst Swende 698b649e0e Added undec to un-decimate data on the client side, so we can use all those sweet demodders even if the data has been decimated on the ARM side 2015-01-31 00:05:04 +01:00
Martin Holst Swende 31abe49fd3 Some more fixes to longer lf recordings. Now also supports longer snoops, and an additional command 'lf config' has been defined, instead of having to specify all params for every call 2015-01-30 23:03:44 +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 33c7e2f3bc wrong letter in variable name 
Conflicts:
	client/cmddata.c
 2015-01-29 22:35:19 +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 f50d457fa8 Merge pull request #48 from marshmellow42/master 
lf demod additions & bugfixes from marshmellow
 2015-01-27 10:21:22 +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 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 c54d1394c6 Fixed compiler error 2015-01-22 00:10:09 +01:00
iceman1001 df3e429d71 minor fix for a help in "hf 14a snoop" 2015-01-21 21:24:37 +01:00
marshmellow42 ec75f5c10a lf Bug Fixes and lf demod additions 
added data fskparadoxdemod
added data setdebugmode (for demods)
added data shiftgraphzero (to help clean weak reads)
fixed a few bugs with the data detectaskclock
added data fskfcdetect to detect FSK clocks
adjusted most of my demods to put raw tag binary to demod buffer for
future sim and clone commands (psk still needs work)
 2015-01-20 17:28:51 -05:00